删掉page方法

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeCertificationConfigDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -83,4 +84,4 @@ public class BadgeCertificationConfigDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class BadgeDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GovStaffRoleDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -74,33 +75,33 @@ public class GovStaffRoleDTO implements Serializable {
     private Integer sort;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
     /**
-     * 
+     *
      */
 	private Integer revision;
 
     /**
-     * 
+     *
      */
 	private String createdBy;
 
     /**
-     * 
+     *
      */
 	private Date createdTime;
 
     /**
-     * 
+     *
      */
 	private String updatedBy;
 
     /**
-     * 
+     *
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridLatestDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class GridLatestDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridVisitedDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class GridVisitedDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEnsureHouseDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -128,4 +129,4 @@ public class IcEnsureHouseDTO implements Serializable {
      */
 	private String field5;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java

@@ -1,16 +1,14 @@
 package com.epmet.dto;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.Max;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -94,7 +92,7 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable {
     private String remark;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
@@ -134,4 +132,4 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable {
     @Length(max = 500,message = "通知内容限制500字以内",groups = {IcEpidemicSpecialAttentionAdd.class,IcEpidemicSpecialAttentionUpdate.class})
     private String content;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcMoveInRecordDTO.java

@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -171,4 +172,4 @@ public class IcMoveInRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatRelationDTO.java

@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -79,4 +80,4 @@ public class IcNatRelationDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcOldPeopleDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -108,4 +109,4 @@ public class IcOldPeopleDTO implements Serializable {
      */
 	private String field5;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiDemandDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -108,4 +109,4 @@ public class IcResiDemandDTO implements Serializable {
      */
 	private String field5;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiVaccineDTO.java

@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -106,4 +107,4 @@ public class IcResiVaccineDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcSpecialDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -108,4 +109,4 @@ public class IcSpecialDTO implements Serializable {
      */
 	private String field5;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcStatsResiWarnDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -108,4 +109,4 @@ public class IcStatsResiWarnDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java

@@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.HeadStyle;
 import com.alibaba.excel.enums.poi.FillPatternTypeEnum;
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnemployedDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -148,4 +149,4 @@ public class IcUnemployedDTO implements Serializable {
      */
 	private String field5;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnitedFrontDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -113,4 +114,4 @@ public class IcUnitedFrontDTO implements Serializable {
      */
 	private String field5;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeDetailedDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -139,4 +140,4 @@ public class IcUserChangeDetailedDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserTransferRecordDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -228,4 +229,4 @@ public class IcUserTransferRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java

@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -116,4 +117,4 @@ public class IcVaccineDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineRelationDTO.java

@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -79,4 +80,4 @@ public class IcVaccineRelationDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVolunteerDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -113,4 +114,4 @@ public class IcVolunteerDTO implements Serializable {
      */
 	private String field5;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/OperUserDTO.java

@@ -17,12 +17,12 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
-import lombok.Data;
-
 
 /**
  * 运营人员表

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class RegisterRelationDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ResiUserBadgeDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -104,4 +105,4 @@ public class ResiUserBadgeDTO implements Serializable {
         this.createdBy = "APP_USER";
         this.updatedBy = "APP_USER";
     }
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RoleDTO.java

@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 角色表 
+ * 角色表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-30
@@ -83,4 +84,4 @@ public class RoleDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffAgencyVisitedDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class StaffAgencyVisitedDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffGridVisitedDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -83,4 +84,4 @@ public class StaffGridVisitedDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class StaffRoleDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -54,32 +55,32 @@ public class StaffRoleDTO implements Serializable {
 	private String orgId;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
     /**
-     * 
+     *
      */
 	private Integer revision;
 
     /**
-     * 
+     *
      */
 	private String createdBy;
 
     /**
-     * 
+     *
      */
 	private Date createdTime;
 
     /**
-     * 
+     *
      */
 	private String updatedBy;
 
     /**
-     * 
+     *
      */
 	private Date updatedTime;
 
@@ -88,4 +89,4 @@ public class StaffRoleDTO implements Serializable {
      */
     private String customerId;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StatsStaffPatrolRecordDailyDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -153,4 +154,4 @@ public class StatsStaffPatrolRecordDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserAdviceDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserInvitationDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -103,4 +104,4 @@ public class UserInvitationDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiRegisterVisitDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class UserResiRegisterVisitDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserWechatDTO.java

@@ -1,7 +1,5 @@
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JacksonInject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddBadgeFormDTO.java

@@ -5,7 +5,6 @@ import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java

@@ -1,10 +1,8 @@
 package com.epmet.dto.form;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
 import javax.validation.constraints.Min;
-import java.util.Date;
 
 /**
  * @description:

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AttentionDetailFormDTO.java

@@ -3,7 +3,6 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CancelAttentionPackageFormDTO.java

@@ -2,8 +2,6 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CustomerAgencyUserRoleFormDTO.java

@@ -3,9 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Author zxc

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DemandUserFormDTO.java

@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditBadgeFormDTO.java

@@ -4,7 +4,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EnableStaffFormDTO.java

@@ -3,10 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @author sun

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GetRoleKeyListFormDTO.java

@@ -2,7 +2,6 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserWarnNoticeFormDTO.java

@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.dto.form.PageFormDTO;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import lombok.Data;
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/NatListFormDTO.java

@@ -3,7 +3,6 @@ package com.epmet.dto.form;
 import com.epmet.commons.tools.dto.form.PageFormDTO;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java

@@ -1,12 +1,9 @@
 package com.epmet.dto.form;
 
 import com.epmet.commons.tools.dto.form.PageFormDTO;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 @Data

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiInfoSubmitFormDTO.java

@@ -17,13 +17,11 @@
 
 package com.epmet.dto.form;
 
-import com.epmet.dto.UserResiInfoDTO;
 import lombok.Data;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java

@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 import lombok.NoArgsConstructor;

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffBasicInfoFormDTO.java

@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StatsResiWarnCountFormDTO.java

@@ -20,9 +20,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.List;
 
 
 /**
@@ -43,4 +41,4 @@ public class StatsResiWarnCountFormDTO implements Serializable {
 	private String userId;
 
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/TagCustomerFormDTO.java

@@ -2,7 +2,6 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 @Data

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ThirdCustomerStaffFormDTO.java

@@ -2,7 +2,6 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserBasicInfoFormDTO.java

@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserInvitationFormDTO.java

@@ -4,7 +4,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Description 记录用户邀请关系入参DTO

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserOperListFormDTO.java

@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.io.Serializable;

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java

@@ -3,7 +3,6 @@ package com.epmet.dto.form;
 import com.epmet.commons.tools.dto.form.PageFormDTO;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerCommonFormDTO.java

@@ -1,7 +1,6 @@
 package com.epmet.dto.form;
 
 import lombok.Data;
-import lombok.Value;
 
 import javax.validation.constraints.NotBlank;
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/WxUserInfoFormDTO.java

@@ -2,7 +2,6 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceListResultDTO.java

@@ -1,6 +1,5 @@
 package com.epmet.dto.result;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerStaffRoleListResultDTO.java

@@ -3,7 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description 根据客户Id staffId查询人员在客户下的角色列表-接口返参

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java

@@ -1,6 +1,5 @@
 package com.epmet.dto.result;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.io.Serializable;

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleResultDTO.java

@@ -21,7 +21,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
@@ -87,4 +86,4 @@ public class GovStaffRoleResultDTO implements Serializable {
      */
     @JsonIgnore
     private Integer sort;
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleTemplateDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto.result;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -69,33 +70,33 @@ public class GovStaffRoleTemplateDTO implements Serializable {
     private String sort;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
     /**
-     * 
+     *
      */
 	private Integer revision;
 
     /**
-     * 
+     *
      */
 	private String createdBy;
 
     /**
-     * 
+     *
      */
 	private Date createdTime;
 
     /**
-     * 
+     *
      */
 	private String updatedBy;
 
     /**
-     * 
+     *
      */
 	private Date updatedTime;
 
-}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java

@@ -1,13 +1,10 @@
 package com.epmet.dto.result;
 
-import com.epmet.commons.tools.validator.group.AddGroup;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 /**
  * @Description 【迁入管理】列表--接口返参

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java

@@ -3,7 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -15,9 +14,9 @@ import java.util.Map;
 @Data
 public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable {
     private String houseId;
-    
+
     private String gridId;
-    
+
     private String gridName;
 
     /**
@@ -76,5 +75,5 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable {
      * 同屋的其他人
      */
     private List<HouseUserDTO> houseUserList;
-    
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRecordDetailResultDTO.java

@@ -4,7 +4,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * @author zhaoqifeng

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/QueryOperUserResultDto.java

@@ -3,8 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
 
 /**
  * @author zhaoqifeng

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RoleResultDTO.java

@@ -1,7 +1,6 @@
 package com.epmet.dto.result;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import jdk.nashorn.internal.ir.annotations.Ignore;
 import lombok.Data;
 
 import java.io.Serializable;

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StatsdataResultDTO.java

@@ -1,11 +1,9 @@
 package com.epmet.dto.result;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Description 网格员例行工作数据统计

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBadgeListResultDTO.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Author zxc

epmet-user/epmet-user-client/src/main/java/com/epmet/enums/AttentionTypeEnum.java

@@ -1,7 +1,6 @@
 package com.epmet.enums;
 
 import com.epmet.commons.tools.constant.NumConstant;
-import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
 /**

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java

@@ -1,7 +1,6 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java

@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.GridLatestDTO;
 import com.epmet.dto.form.CustomerUserFormDTO;
 import com.epmet.dto.form.LatestGridInfoFormDTO;

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java

@@ -19,12 +19,10 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-import com.epmet.dto.IcBirthRecordDTO;
 import com.epmet.dto.IcMoveInRecordDTO;
 import com.epmet.dto.form.IcMoveInAddEditFormDTO;
 import com.epmet.dto.form.IcMoveInListFormDTO;
 import com.epmet.dto.result.IcMoveInListResultDTO;
-import com.epmet.excel.IcBirthRecordExcel;
 import com.epmet.excel.IcMoveInRecordExcel;
 import com.epmet.service.IcMoveInRecordService;
 import lombok.extern.slf4j.Slf4j;

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java

@@ -20,7 +20,10 @@ import com.epmet.dto.result.CollectListResultDTO;
 import com.epmet.dto.result.LatestCollectResDTO;
 import com.epmet.service.IcResiCollectService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcStatsResiWarnController.java

@@ -25,8 +25,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcStatsResiWarnDTO;
 import com.epmet.dto.result.PersonWarnLeftPieResultDTO;
 import com.epmet.excel.IcStatsResiWarnExcel;
@@ -48,7 +48,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("icstatsresiwarn")
 public class IcStatsResiWarnController {
-    
+
     @Autowired
     private IcStatsResiWarnService icStatsResiWarnService;
 
@@ -105,4 +105,4 @@ public class IcStatsResiWarnController {
         return new Result<PersonWarnLeftPieResultDTO>().ok(icStatsResiWarnService.personWarnLeftPie(tokenDto));
     }
 
-}
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineRelationController.java

@@ -6,8 +6,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcVaccineRelationDTO;
 import com.epmet.service.IcVaccineRelationService;
 import org.springframework.beans.factory.annotation.Autowired;

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LbTestController.java

@@ -7,8 +7,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-
 @RestController
 @RequestMapping("lbtest")
 public class LbTestController {

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java

@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.RegisterRelationDTO;
 import com.epmet.dto.form.EnterGridFormDTO;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
@@ -47,7 +47,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("registerrelation")
 public class RegisterRelationController {
-    
+
     @Autowired
     private RegisterRelationService registerRelationService;
 
@@ -107,4 +107,4 @@ public class RegisterRelationController {
 
         return registerRelationService.getUserInfoAndRoles(enterGridFormDTO);
     }
-}
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RoleController.java

@@ -17,16 +17,14 @@
 
 package com.epmet.controller;
 
-import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.RoleDTO;
 import com.epmet.dto.form.GetRoleKeyListFormDTO;
 import com.epmet.excel.RoleExcel;
@@ -40,7 +38,7 @@ import java.util.Map;
 
 
 /**
- * 角色表 
+ * 角色表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-30
@@ -105,4 +103,4 @@ public class RoleController {
         return new Result<List<String>>().ok(roleService.getUserRoleKeyList(formDTO));
     }
 
-}
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java

@@ -21,10 +21,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.StaffBasicInfoFormDTO;
 import com.epmet.dto.form.StaffLoginAgencyRecordFormDTO;
-import com.epmet.dto.form.WxMsgAuthInfoFormDTO;
 import com.epmet.dto.result.StaffBasicInfo;
 import com.epmet.dto.result.StaffLatestAgencyResultDTO;
-import com.epmet.dto.result.UserBasicInfo;
 import com.epmet.service.StaffAgencyVisitedService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -77,4 +75,4 @@ public class StaffAgencyVisitedController {
 		return new Result<StaffBasicInfo>().ok(staffAgencyVisitedService.getStaffBasicInfo(formDTO));
 	}
 
-}
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffGridVisitedController.java

@@ -20,9 +20,8 @@ package com.epmet.controller;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.LatestGridFormDTO;
-import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.StaffGridVisitedFormDTO;
+import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.service.StaffGridVisitedService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,8 +29,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-
 
 /**
  * 工作人员进入网格日志表
@@ -71,4 +68,4 @@ public class StaffGridVisitedController {
         ValidatorUtils.validateEntity(staffGridVisitedFormDTO);
         return staffGridVisitedService.saveStaffGridVisitedRecord(staffGridVisitedFormDTO);
     }
-}
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java

@@ -1,37 +1,24 @@
 package com.epmet.controller;
 
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder;
-import com.alibaba.excel.write.metadata.WriteSheet;
-import com.alibaba.excel.write.metadata.fill.FillWrapper;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.RequirePermission;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
-import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.*;
 import com.epmet.dto.form.patrol.PcworkRecordListFormDTO;
 import com.epmet.dto.result.*;
-import com.epmet.excel.StaffPatrolRecordExcel;
 import com.epmet.service.StaffPatrolDetailService;
 import com.epmet.service.StaffPatrolRecordService;
-import com.epmet.util.TestFileUtil;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.net.URLEncoder;
 import java.util.List;
 
 /**

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsStaffPatrolRecordDailyController.java

@@ -2,10 +2,10 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.result.PatrolYuShanResultDTO;
-import com.epmet.service.StatsStaffPatrolRecordDailyService;
 import com.epmet.dto.form.PatrolCountFormDTO;
 import com.epmet.dto.result.PatrolCountResultDTO;
+import com.epmet.dto.result.PatrolYuShanResultDTO;
+import com.epmet.service.StatsStaffPatrolRecordDailyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +21,7 @@ import java.util.List;
 @RestController
 @RequestMapping("statsstaffpatrolrecorddaily")
 public class StatsStaffPatrolRecordDailyController {
-    
+
     @Autowired
     private StatsStaffPatrolRecordDailyService statsStaffPatrolRecordDailyService;
 
@@ -47,4 +47,4 @@ public class StatsStaffPatrolRecordDailyController {
     public Result<List<PatrolYuShanResultDTO>> patrolInfo(@RequestParam("agencyId")String agencyId){
         return new Result<List<PatrolYuShanResultDTO>>().ok(statsStaffPatrolRecordDailyService.patrolInfo(agencyId));
     }
-}
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceImgController.java

@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserAdviceImgDTO;
 import com.epmet.excel.UserAdviceImgExcel;
 import com.epmet.service.UserAdviceImgService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("useradviceimg")
 public class UserAdviceImgController {
-    
+
     @Autowired
     private UserAdviceImgService userAdviceImgService;
 
@@ -91,4 +91,4 @@ public class UserAdviceImgController {
         ExcelUtils.exportExcelToTarget(response, null, list, UserAdviceImgExcel.class);
     }
 
-}
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserInvitationController.java

@@ -33,7 +33,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java

@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserResiRegisterVisitDTO;
 import com.epmet.dto.form.ResiRegisterFormDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
@@ -47,7 +47,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("userresiregistervisit")
 public class UserResiRegisterVisitController {
-    
+
     @Autowired
     private UserResiRegisterVisitService userResiRegisterVisitService;
 
@@ -97,4 +97,4 @@ public class UserResiRegisterVisitController {
     public Result<ResiRegisterResultDTO> init(@RequestBody ResiRegisterFormDTO resiRegisterFormDTO){
         return userResiRegisterVisitService.init(resiRegisterFormDTO);
     }
-}
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java

@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserRoleFormDTO;

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserWechatController.java

@@ -18,17 +18,19 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.UserHeadPhotoDTO;
 import com.epmet.dto.result.CertifiedResultDTO;
 import com.epmet.service.UserWechatService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
 
 /**
- * 用户微信端关系表 
+ * 用户微信端关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-04-26
@@ -36,7 +38,7 @@ import java.util.List;
 @RestController
 @RequestMapping("userwechat")
 public class UserWechatController {
-    
+
     @Autowired
     private UserWechatService userWechatService;
 
@@ -45,4 +47,4 @@ public class UserWechatController {
         return new Result<List<CertifiedResultDTO>>().ok(userWechatService.selectUserHeadPhotoByUserId(certifiedResultDTOS));
     }
 
-}
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/VolunteerController.java

@@ -2,10 +2,8 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dao.IcResiUserDao;
 import com.epmet.dto.form.VolunteerCommonFormDTO;
 import com.epmet.dto.result.VolunteerDistributionResultDTO;
-import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.VolunteerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java

@@ -21,7 +21,6 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.GovStaffRoleDTO;
 import com.epmet.dto.form.UpGovRoleFormDTO;
 import com.epmet.dto.result.GovStaffRoleResultDTO;
-import com.epmet.dto.result.RoleInfoResultDTO;
 import com.epmet.dto.result.RoleKeyValueResultDTO;
 import com.epmet.dto.result.RoleResultDTO;
 import com.epmet.entity.GovStaffRoleEntity;
@@ -104,4 +103,4 @@ public interface GovStaffRoleDao extends BaseDao<GovStaffRoleEntity> {
      * @Author sun
      **/
     int upNameOrDescription(UpGovRoleFormDTO formDTO);
-}
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java

@@ -18,9 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.GridLatestDTO;
 import com.epmet.dto.GridVisitedDTO;
-import com.epmet.entity.GridLatestEntity;
 import com.epmet.entity.GridVisitedEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -40,4 +38,4 @@ public interface GridVisitedDao extends BaseDao<GridVisitedEntity> {
     int updateByVisitedId(GridVisitedDTO dto);
     void deleteBatch(@Param("ids") List<String> ids);
 
-}
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java

@@ -6,7 +6,6 @@ import com.epmet.dto.form.MyNatListFormDTO;
 import com.epmet.dto.form.VaccineListFormDTO;
 import com.epmet.dto.result.IcVaccineListResultDTO;
 import com.epmet.dto.result.MyNatListResultDTO;
-import com.epmet.dto.result.NatListResultDTO;
 import com.epmet.entity.IcVaccineEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java

@@ -23,7 +23,6 @@ import com.epmet.entity.RegisterRelationEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-
 import java.util.List;
 
 /**
@@ -64,4 +63,4 @@ public interface RegisterRelationDao extends BaseDao<RegisterRelationEntity> {
      * @date 2021/12/30 3:14 下午
      */
     RegisterRelationDTO resiRelationInfo(@Param("userId")String userId);
-}
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java

@@ -18,11 +18,9 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.RoleDTO;
 import com.epmet.dto.result.ResiGovRoleResultDTO;
 import com.epmet.entity.RoleEntity;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -48,4 +46,4 @@ public interface RoleDao extends BaseDao<RoleEntity> {
 	 * @Description  获取居民端角色列表
 	 */
 	List<ResiGovRoleResultDTO> selectResiRoleList();
-}
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java

@@ -18,7 +18,6 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.StaffGridVisitedDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.entity.StaffGridVisitedEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -62,4 +61,4 @@ public interface StaffGridVisitedDao extends BaseDao<StaffGridVisitedEntity> {
     **/
     void updateRecordTime(String id, Date date);
 
-}
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java

@@ -18,8 +18,6 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.GetRoleKeyListFormDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
 import com.epmet.dto.result.PartyMemberUserIdsResultDTO;

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java

@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleEntity.java

@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 政府端角色表
  *