From f13582b5aafa91b4228752083db7b615cad61a21 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 10 May 2022 09:05:44 +0800 Subject: [PATCH 001/102] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=B8=80=E6=88=B7?= =?UTF-8?q?=E4=B8=80=E6=A1=A3=20=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/HouseMemberResultDTO.java | 39 ++++ .../dto/result/IcHouseMemberResultDTO.java | 48 +++++ .../com/epmet/controller/HouseController.java | 50 +++++ .../java/com/epmet/service/HouseService.java | 9 + .../epmet/service/impl/HouseServiceImpl.java | 17 +- .../epmet/dto/form/RentTenantDataFormDTO.java | 40 +++- .../dto/result/IcResiUserBaseResultDTO.java | 48 +++++ .../dto/result/IcResiUserPageResultDTO.java | 173 ------------------ .../epmet/feign/EpmetUserOpenFeignClient.java | 8 + .../EpmetUserOpenFeignClientFallback.java | 5 + .../controller/IcResiUserController.java | 21 +-- .../java/com/epmet/dao/IcResiUserDao.java | 10 +- .../com/epmet/service/IcResiUserService.java | 6 + .../service/impl/IcResiUserServiceImpl.java | 37 +++- .../main/resources/mapper/IcResiUserDao.xml | 16 +- 15 files changed, 303 insertions(+), 224 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseMemberResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBaseResultDTO.java delete mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserPageResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java new file mode 100644 index 0000000000..208353f318 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java @@ -0,0 +1,39 @@ +package com.epmet.dto.result; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.util.List; + +/** + * desc:房屋和房屋成员返回结果类 + * + * @author: LiuJanJun + * @date: 2022/5/9 1:58 下午 + * @version: 1.0 + */ +@Data +public class HouseMemberResultDTO extends PageFormDTO { + private static final long serialVersionUID = 4574743024782401136L; + + private String agencyName; + private String gridName; + private String neighborHoodName; + private String buildingName; + private String unitName; + /** + * 门牌号 + */ + private String doorName; + /** + * 房屋类型，1楼房，2平房，3别墅 + */ + private String houseType; + + /** + * 家庭成员 + */ + public static List memberList; + + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseMemberResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseMemberResultDTO.java new file mode 100644 index 0000000000..6879feb43d --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseMemberResultDTO.java @@ -0,0 +1,48 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 用户基础信息 + * @Author yinzuomei + * @Date 2021/11/1 10:34 上午 + */ +@Data +public class IcHouseMemberResultDTO implements Serializable { + private static final long serialVersionUID = 5621052927788129250L; + + /** + * 姓名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; + + /** + * 性别 + */ + private String gender; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 出生日期 + */ + private String birthday; + + /** + * 备注 + */ + private String remarks; + + +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 3e625e88c2..ae3fb5b413 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -18,6 +18,10 @@ package com.epmet.controller; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; @@ -28,7 +32,9 @@ import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.feign.ResultDataResolver; 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.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.form.*; @@ -45,6 +51,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.InputStream; +import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -306,4 +313,47 @@ public class HouseController implements ResultDataResolver { return new Result(); } + /** + * desc: 导出一户一档 + * + * @param tokenDto + * @param formDTO + * @param response + * @return void + * @author LiuJanJun + * @date 2022/5/9 1:42 下午 + */ + @NoRepeatSubmit + @RequestMapping(value = "/exportHouseUser") + public void exportHouseUser(@LoginUser TokenDto tokenDto, @RequestBody IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception { + //效验数据 + LoginUserDetailsResultDTO loginUserDetail = getLoginUserDetailsResultDTO(tokenDto, "【查询房屋】查询当前staff所在组织信息失败"); + formDTO.setAgencyId(loginUserDetail.getAgencyId()); + ValidatorUtils.validateEntity(formDTO); + + ExcelWriter excelWriter = null; + try { + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("一户一档信息.xlsx", response)) + .registerWriteHandler(new FreezeAndFilter()) + .build(); + + WriteSheet writeSheet = EasyExcel.writerSheet().build(); + List dataList = null; + do { + dataList = houseService.getHouseUser(tokenDto,formDTO); + + }while (dataList != null && dataList.size() == formDTO.getPageSize()); + //获取导出配置 + + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "text/htm1; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index 3ef5b4ca2a..506ac2e30b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -18,6 +18,7 @@ package com.epmet.service; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.*; import com.epmet.dto.result.*; @@ -94,4 +95,12 @@ public interface HouseService { * @date 2022/5/6 08:50 */ void updateSort(UpdateSortFormDTO formDTO); + + /** + * desc:条件获取房和家庭成员 + * @param tokenDto + * @param formDTO + * @return + */ + List getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 2c2101e5b3..b992ca9c00 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -16,6 +16,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.CustomerGridConstant; @@ -29,7 +30,6 @@ import com.epmet.enums.HousePurposeEnums; import com.epmet.enums.HouseTypeEnums; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; -import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.model.HouseInfoModel; import com.epmet.model.ImportHouseInfoListener; import com.epmet.redis.IcHouseRedis; @@ -70,12 +70,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { @Resource private IcBuildingDao icBuildingDao; @Resource - private IcBuildingUnitDao icBuildingUnitDao; - @Resource private IcHouseDao icHouseDao; @Autowired - private GovOrgOpenFeignClient govOrgOpenFeignClient; - @Autowired private IcHouseRedis icHouseRedis; @Autowired private AgencyService agencyservice; @@ -475,6 +471,17 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } } + @Override + public List getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO) { + PageData houseList = this.getHouseList(formDTO); + List memberResultDTOS = ConvertUtils.sourceToTarget(houseList.getList(), HouseMemberResultDTO.class); + memberResultDTOS.parallelStream().forEach(o ->{ + RentTenantDataFormDTO userResiInfoListFormDTO = new RentTenantDataFormDTO(); + epmetUserOpenFeignClient.getHouseMemberList(userResiInfoListFormDTO); + }); + return memberResultDTOS; + } + /** * @Author sun * @Description 【人房】房屋、居民统计列表数据 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantDataFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantDataFormDTO.java index c79bf3e596..ae6986765a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantDataFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantDataFormDTO.java @@ -1,24 +1,52 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.dto.form.PageFormDTO; import lombok.Data; import javax.validation.constraints.NotBlank; -import java.io.Serializable; /** - * 租客，房东信息 + * desc:居民信息查询条件 * * @author zhy * @date 2022/4/26 10:54 */ @Data -public class RentTenantDataFormDTO implements Serializable { - private static final long serialVersionUID = 9156247659994638103L; +public class RentTenantDataFormDTO extends PageFormDTO { - @NotBlank(message = "userId不能为空") + private static final long serialVersionUID = 803398545727377361L; + + public interface RentTenantDataForm{} + + @NotBlank(message = "userId不能为空", groups = RentTenantDataForm.class) private String userId; - @NotBlank(message = "tokenDto获取customerId不能为空") + @NotBlank(message = "tokenDto获取customerId不能为空", groups = RentTenantDataForm.class) private String customerId; + /** + * 组织Id + */ + private String agencyId; + + /** + * 网格Id + */ + private String gridId; + + /** + * 小区ID + */ + private String neighborHoodId; + + /** + * 楼栋ID + */ + private String buildingId; + + /** + * 房间ID + */ + private String houseId; + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBaseResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBaseResultDTO.java new file mode 100644 index 0000000000..f54ad0cfe4 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBaseResultDTO.java @@ -0,0 +1,48 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 用户基础信息 + * @Author yinzuomei + * @Date 2021/11/1 10:34 上午 + */ +@Data +public class IcResiUserBaseResultDTO implements Serializable { + private static final long serialVersionUID = 5621052927788129250L; + + /** + * 姓名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; + + /** + * 性别 + */ + private String gender; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 出生日期 + */ + private String birthday; + + /** + * 备注 + */ + private String remarks; + + +} + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserPageResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserPageResultDTO.java deleted file mode 100644 index 0c5f5ab0bf..0000000000 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserPageResultDTO.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.epmet.dto.result; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description TODO - * @Author yinzuomei - * @Date 2021/11/1 10:34 上午 - */ -@Data -public class IcResiUserPageResultDTO implements Serializable { - private static final long serialVersionUID = 5621052927788129250L; - private String icResiUserId; - private String gridId; - private String gridName; - /** - * 所属小区ID - */ - private String villageId; - private String vallageName; - - - /** - * 所属楼宇Id - */ - private String buildId; - private String buildName; - - /** - * 单元id - */ - private String unitId; - private String unitName; - - /** - * 所属家庭Id - */ - private String homeId; - private String homeName; - - /** - * 姓名 - */ - private String name; - - /** - * 手机号 - */ - private String mobile; - - /** - * 性别 - */ - private String gender; - - /** - * 身份证号 - */ - private String idCard; - - /** - * 出生日期 - */ - private String birthday; - - /** - * 备注 - */ - private String remarks; - - /** - * 是否党员 - */ - private Boolean isParty; - - /** - * 是否低保户 - */ - private Boolean isDbh; - - /** - * 是否保障房 - */ - private Boolean isEnsureHouse; - - /** - * 是否失业 - */ - private Boolean isUnemployed; - - /** - * 是否育龄妇女 - */ - private Boolean isYlfn; - - /** - * 是否退役军人 - */ - private Boolean isVeterans; - - /** - * 是否统战人员 - */ - private Boolean isUnitedFront; - - /** - * 是否信访人员 - */ - private Boolean isXfry; - - /** - * 是否志愿者 - */ - private Boolean isVolunteer; - - /** - * 是否老年人 - */ - private Boolean isOldPeople; - - /** - * 是否空巢 - */ - private Boolean isKc; - - /** - * 是否失独 - */ - private Boolean isSd; - - /** - * 是否失能 - */ - private Boolean isSn; - - /** - * 是否失智 - */ - private Boolean isSz; - - /** - * 是否残疾 - */ - private Boolean isCj; - - /** - * 是否大病 - */ - private Boolean isDb; - - /** - * 是否慢病 - */ - private Boolean isMb; - - /** - * 是否特殊人群 - */ - private Boolean isSpecial; - - - // 以下属性都需要单独处理，不是直接取数据库的字段 - private String demandCategoryIds; - - private String demandName; - - /** - * 房屋类型，1楼房，2平房，3别墅 - */ - private String houseType;} - diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 78aa5f8181..1bd57957c1 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -740,4 +740,12 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/icresiuser/userchartlist") Result> userChartList(@RequestBody UserChartFormDTO userDTO); + + /** + * desc:条件获取房屋成员信息 + * @param formDTO + * @return + */ + @PostMapping("/epmetuser/icresiuser/getHouseMemberList") + Result> getHouseMemberList(@RequestBody RentTenantDataFormDTO formDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index aa0cb1e7f9..0231dce7b5 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -543,4 +543,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "userChartList", userDTO); } + @Override + public Result> getHouseMemberList(RentTenantDataFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getHouseMemberList", formDTO); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 1b923f19d5..97b9ded9a1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -270,7 +270,7 @@ public class IcResiUserController implements ResultDataResolver { */ @PostMapping("rent/getrentresiuserinfo") public Result getRentResiUserInfo(@RequestBody RentTenantDataFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); + ValidatorUtils.validateEntity(formDTO, RentTenantDataFormDTO.RentTenantDataForm.class); return new Result().ok(icResiUserService.getRentResiUserInfo(formDTO)); } @@ -1001,19 +1001,8 @@ public class IcResiUserController implements ResultDataResolver { List r = icResiUserService.listHomeUserBrief(houseId, customerId); return new Result().ok(r); } -// @PostMapping("test-async") -// public Result testAsync(HttpServletRequest request) { -//// tl.set("wxz"); -// executorService.submit(() -> { -// try { -// Thread.sleep(500l); -// log.info("[我是子线程]:" + EpmetRequestHolder.getHeader("app")); -// System.out.println("---"); -// } catch (InterruptedException e) { -// log.error("method exception", e); -// } -// icResiUserImportService.testAsync(); -// }); -// return new Result(); -// } + @PostMapping("getHouseMemberList") + Result> getHouseMemberList(@RequestBody RentTenantDataFormDTO formDTO) { + return new Result().ok(icResiUserService.getHouseMemberList(formDTO)); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index 6de40fe9fa..32878e0bde 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -159,11 +159,11 @@ public interface IcResiUserDao extends BaseDao { @Param("tableName") String tableName, @Param("userId") String userId); /** - * @Author sun - * @Description 查询居民信息 - **/ - IcResiUserDTO getResiUser(IcResiUserDTO dto); - + * desc:根据身份证号获取居民信息 + * @param idCard + * @param customerId + * @return + */ IcResiUserDTO getResiUserByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId); /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 698156282f..51d71b72f0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -319,4 +319,10 @@ public interface IcResiUserService extends BaseService { */ String updateImage(TokenDto tokenDto, RentTenantFormDTO formDTO); + /** + * desc:条件获取居民基础信息 + * @param formDTO + * @return + */ + List getHouseMemberList(RentTenantDataFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 96793a6db8..f48398684e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -208,10 +208,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getHouseMemberList(RentTenantDataFormDTO formDTO) { + String pids = ""; + //根据pid 获取居民 信息 + if (StringUtils.isNotBlank(formDTO.getGridId())){ + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getGridId()); + if (gridInfo == null){ + log.warn("getHouseMemberList gridId:{} is not exist",formDTO.getGridId()); + return null; + } + pids = gridInfo.getPids().concat(StrConstant.COLON).concat(formDTO.getGridId()); + } + if (StringUtils.isNotBlank(formDTO.getAgencyId())){ + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getAgencyId()); + if (agencyInfo == null){ + log.warn("getHouseMemberList agencyId:{} is not exist",formDTO.getAgencyId()); + return null; + } + pids = agencyInfo.getPids().concat(StrConstant.COLON).concat(formDTO.getAgencyId()); + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(IcResiUserEntity::getCustomerId,formDTO.getCustomerId()) + .eq(StringUtils.isNotBlank(formDTO.getAgencyId()),IcResiUserEntity::getCustomerId,formDTO.getCustomerId()) + .eq(StringUtils.isNotBlank(formDTO.getCustomerId()),IcResiUserEntity::getCustomerId,formDTO.getCustomerId()) + ; + /*PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getIsPage()) + .doSelectPage(()->baseDao.getResiUser())*/ + return null; + } + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 1645f09bdf..8b35a19c85 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -363,19 +363,6 @@ AND IC_RESI_USER = #{userId} - + From 62e8656302e4f49acaabb429b3ec54e41f11ea37 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 10 May 2022 17:34:41 +0800 Subject: [PATCH 006/102] =?UTF-8?q?=E8=BF=81=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcUserTransferRecordServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java index c0aa8ae87d..af2f723bb6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java @@ -441,7 +441,9 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl getNewHouseInfo(IcResiUserTransferFormDTO formDTO) { Result result2 = new Result<>(); - if (IcResiUserConstant.OUT.equals(formDTO.getOrigin())) { + if (IcResiUserConstant.OUT.equals(formDTO.getOrigin()) + || IcResiUserConstant.IN.equals(formDTO.getOrigin()) + || IcResiUserConstant.DIED.equals(formDTO.getOrigin())) { IcResiUserOrgMsgFormDTO orgMsgFormDTO2 = new IcResiUserOrgMsgFormDTO(); orgMsgFormDTO2.setCustomerId(formDTO.getCustomerId()); orgMsgFormDTO2.setAgencyId(formDTO.getNewAgencyId()); From 6590a8bbaeb2488866edf47eb5d31257f0b10d01 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 10 May 2022 17:35:31 +0800 Subject: [PATCH 007/102] =?UTF-8?q?=E8=BF=81=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcUserTransferRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java index af2f723bb6..dcc36f9b38 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java @@ -443,7 +443,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl result2 = new Result<>(); if (IcResiUserConstant.OUT.equals(formDTO.getOrigin()) || IcResiUserConstant.IN.equals(formDTO.getOrigin()) - || IcResiUserConstant.DIED.equals(formDTO.getOrigin())) { + || IcResiUserConstant.BIRTH.equals(formDTO.getOrigin())) { IcResiUserOrgMsgFormDTO orgMsgFormDTO2 = new IcResiUserOrgMsgFormDTO(); orgMsgFormDTO2.setCustomerId(formDTO.getCustomerId()); orgMsgFormDTO2.setAgencyId(formDTO.getNewAgencyId()); From bd237e1d4c1ac0dd29c9a56424e0ac234c42e2da Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 10 May 2022 18:01:19 +0800 Subject: [PATCH 008/102] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/ChangeRelocationServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java index 2f59a1fa69..aeb6e9c1b9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java @@ -148,6 +148,7 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 07:41:05 +0800 Subject: [PATCH 009/102] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=B8=80=E6=88=B7?= =?UTF-8?q?=E4=B8=80=E6=A1=A3=20=E6=9A=82=E5=AD=983?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/ExcelFillCellMergeStrategy.java | 13 ++++++++++++- .../dto/result/HouseMemberResultDTO.java | 3 +++ .../com/epmet/controller/HouseController.java | 13 +++++++------ .../java/com/epmet/service/HouseService.java | 2 +- .../epmet/service/impl/HouseServiceImpl.java | 19 ++++++++++++------- 5 files changed, 35 insertions(+), 15 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java index 4d02d241c7..e8408478ea 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java @@ -28,6 +28,10 @@ public class ExcelFillCellMergeStrategy implements CellWriteHandler { * 从下标n行开始合并 */ private int mergeRowIndex; + /** + * 默认隐藏第一列 用于合并数据 + */ + private boolean hiddenFirst = true; public ExcelFillCellMergeStrategy() { } @@ -36,6 +40,11 @@ public class ExcelFillCellMergeStrategy implements CellWriteHandler { this.mergeRowIndex = mergeRowIndex; this.mergeColumnIndexArr = mergeColumnIndexArr; } + public ExcelFillCellMergeStrategy(int mergeRowIndex, int[] mergeColumnIndexArr,boolean hiddenFirst) { + this.mergeRowIndex = mergeRowIndex; + this.mergeColumnIndexArr = mergeColumnIndexArr; + this.hiddenFirst = hiddenFirst; + } @Override public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row, Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead) { @@ -45,7 +54,9 @@ public class ExcelFillCellMergeStrategy implements CellWriteHandler { @Override public void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) { // 隐藏id列 - writeSheetHolder.getSheet().setColumnHidden(0, true); + if (hiddenFirst ){ + writeSheetHolder.getSheet().setColumnHidden(0, true); + } } @Override diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java index 615b887d03..cdf2e7855f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java @@ -17,6 +17,9 @@ import java.io.Serializable; public class HouseMemberResultDTO implements Serializable { private static final long serialVersionUID = 1L; + @ExcelProperty(value = {"序号","序号"},index = 0) + private Integer num; + @ExcelProperty(value = {"房屋信息","所属组织"},index = 1) private String agencyName; @ExcelProperty(value = {"房屋信息","所属网格"},index = 2) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 438cc31abd..233aec7c13 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -346,7 +346,7 @@ public class HouseController implements ResultDataResolver { excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("一户一档信息.xlsx", response), HouseMemberResultDTO.class) .registerWriteHandler(new FreezeAndFilter()) .build(); - int[] mergeRowArr = new int[]{0,1,2,3,4,5,6,7,8,9,10}; + int[] mergeRowArr = new int[]{0,1,2,3,4,5,6,7,8,9,10,11,12}; // 头的策略 WriteCellStyle headWriteCellStyle = new WriteCellStyle(); @@ -356,19 +356,20 @@ public class HouseController implements ResultDataResolver { contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); FreezeAndFilter writeHandler = new FreezeAndFilter(); - ExcelFillCellMergeStrategy mergeStrategy = new ExcelFillCellMergeStrategy(2,mergeRowArr); - WriteSheet writeSheet = EasyExcel.writerSheet().registerWriteHandler(mergeStrategy) + writeHandler.rowSplit = 2; + ExcelFillCellMergeStrategy mergeStrategy = new ExcelFillCellMergeStrategy(2,mergeRowArr,false); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(mergeStrategy) .registerWriteHandler(horizontalCellStyleStrategy) .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) .registerWriteHandler(writeHandler) .build(); - List dataList = null; + PageData dataList = null; do { dataList = houseService.getHouseUser(tokenDto,formDTO); System.out.println("====:"+JSON.toJSONString(dataList)); - excelWriter.write(dataList,writeSheet); + excelWriter.write(dataList.getList(), writeSheet); formDTO.setPageSize(formDTO.getPageSize()+1); - }while (dataList != null && dataList.size() == formDTO.getPageSize()); + }while (dataList != null && dataList.getTotal() == formDTO.getPageSize()); //获取导出配置 } catch (EpmetException e) { diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index 506ac2e30b..48d88c38f3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -102,5 +102,5 @@ public interface HouseService { * @param formDTO * @return */ - List getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO); + PageData getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index e790fc07a9..25862ead97 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -190,7 +190,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { item.setPurpose(HousePurposeEnums.getTypeValue(item.getPurposeKey())); }); - return new PageData<>(records,pageInfo.getTotal()); + + return new PageData<>(records == null? new ArrayList<>():records,pageInfo.getTotal()); } public String getPids(String agencyId){ String pids = null; @@ -473,9 +474,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { icBuildingService.update(icBuildingDTO); } } - //Cache + Cache exportNumCacheMap = CacheBuilder.newBuilder().build(); @Override - public List getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO) { + public PageData getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO) { RentTenantDataFormDTO resiParam = new RentTenantDataFormDTO(); resiParam.setCustomerId(tokenDto.getCustomerId()); resiParam.setAgencyId(formDTO.getAgencyId()); @@ -494,11 +495,13 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { searchLevel = 2; } - PageData houseList = this.getHouseList(formDTO); - List resultDTOS = ConvertUtils.sourceToTarget(houseList.getList(), HouseMemberResultDTO.class); + PageData houseData = this.getHouseList(formDTO); + List resultDTOS = ConvertUtils.sourceToTarget(houseData.getList(), HouseMemberResultDTO.class); - List result = new ArrayList<>(); + List resultList = new ArrayList<>(); + PageData result = new PageData<>(resultList,houseData.getList().size()); int finalSearchLevel = searchLevel; + AtomicInteger num = new AtomicInteger((formDTO.getPageNo()-1) * formDTO.getPageSize()); Cache> memberMap = CacheBuilder.newBuilder().expireAfterAccess(1, TimeUnit.SECONDS).build(); resultDTOS.parallelStream().forEach(o ->{ resiParam.setNeighborHoodId(o.getNeighborHoodId()); @@ -513,8 +516,10 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { if (members == null){ return; } + int n = num.incrementAndGet(); members.forEach(m->{ HouseMemberResultDTO resultDTO = ConvertUtils.sourceToTarget(m, HouseMemberResultDTO.class); + resultDTO.setNum(n); resultDTO.setAgencyName(o.getAgencyName()); resultDTO.setGridName(o.getGridName()); resultDTO.setNeighborHoodName(o.getNeighborHoodName()); @@ -527,7 +532,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { resultDTO.setOwnerName(o.getOwnerName()); resultDTO.setOwnerPhone(o.getOwnerPhone()); resultDTO.setOwnerIdCard(o.getOwnerIdCard()); - result.add(resultDTO); + resultList.add(resultDTO); }); }); return result; From a27bdb44ebc82074a18287b777202b21a43e0757 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 11 May 2022 09:17:44 +0800 Subject: [PATCH 010/102] =?UTF-8?q?=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/feign/EpmetUserOpenFeignClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 3dfbe4b8fe..1d8a6f3c5a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -23,8 +23,8 @@ import java.util.Set; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:09 */ -@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087") -//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class) +//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087") +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class) public interface EpmetUserOpenFeignClient { /** From c810d23f5facab3a7cfbbcee98728f0af5c82026 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 11 May 2022 09:31:22 +0800 Subject: [PATCH 011/102] msg --- .../service/impl/IcUserTransferRecordServiceImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java index dcc36f9b38..38263d879d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java @@ -20,6 +20,7 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum; +import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; @@ -388,7 +389,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl> categoryListResult = operCustomizeOpenFeignClient.getCategoryList(dto); if (!categoryListResult.success()) { - throw new RenException("人员调动，获取客户居民类别预警配置表数据失败"); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取客户居民类别预警配置表数据失败", "获取客户居民类别预警配置异常"); } List columns = categoryListResult.getData().stream().map(IcResiCategoryStatsConfigDTO::getColumnName).collect(Collectors.toList()); Map map = icResiUserDao.getCategoryListMap(columns, formDTO.getIcUserId()); @@ -407,7 +408,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl result1 = govOrgOpenFeignClient.icResiUserOrgMsg(orgMsgFormDTO1); if (!result1.success() || null == result1.getData().getAgencyDTO() || null == result1.getData().getGridDTO() || null == result1.getData().getNeighborHoodDTO() || null == result1.getData().getBuildingDTO() || null == result1.getData().getBuildingUnitDTO() || null == result1.getData().getHouseDTO()) { - log.warn("查找被调动人调动前的组织、网格、小区、楼栋、单元、房屋信息失败"); - throw new RenException("9000", "获取被调动人基础信息失败"); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查找被调动人调动前的组织、网格、小区、楼栋、单元、房屋信息失败", "居民当前所住房屋信息异常"); } return result1.getData(); } @@ -455,8 +455,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 09:45:12 +0800 Subject: [PATCH 012/102] PIDS --- .../com/epmet/service/impl/IcUserTransferRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java index 38263d879d..00bfd52db3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java @@ -241,7 +241,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 09:47:31 +0800 Subject: [PATCH 013/102] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=96=B0=E5=A2=9Efeign?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/feign/GovOrgOpenFeignClient.java | 12 ++++++++++++ .../fallback/GovOrgOpenFeignClientFallback.java | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 87db3dd3e6..51d8ee7517 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -1,7 +1,9 @@ package com.epmet.feign; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.*; import com.epmet.dto.form.*; @@ -614,4 +616,14 @@ public interface GovOrgOpenFeignClient { */ @PostMapping("/gov/org/ichouse/houses-name") Result> getHousesNameByIdCards(@RequestBody List idCards); + + /** + * Desc: 房屋更新 + * @param tokenDTO + * @param formDTO + * @author zxc + * @date 2022/5/11 09:46 + */ + @PostMapping("/gov/org/house/houseupdate") + Result houseUpdate(@LoginUser TokenDto tokenDTO, @RequestBody IcHouseAddFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index 4e48ff1657..80f71ca674 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -2,6 +2,7 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.*; @@ -398,4 +399,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { public Result> getHousesNameByIdCards(List idCards) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getHousesNameByIdCards", idCards); } + + @Override + public Result houseUpdate(TokenDto tokenDTO, IcHouseAddFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "houseUpdate", tokenDTO,formDTO); + } } From 440718203cad89d808c81c0e4a62609b9ae04e77 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 11 May 2022 09:48:42 +0800 Subject: [PATCH 014/102] pids --- .../epmet/service/impl/IcUserTransferRecordServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java index 00bfd52db3..800c03ddec 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java @@ -238,7 +238,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 10:02:31 +0800 Subject: [PATCH 015/102] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=96=B0=E5=A2=9Efeign?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java | 2 +- .../epmet/feign/fallback/GovOrgOpenFeignClientFallback.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 51d8ee7517..496e8e64e7 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -625,5 +625,5 @@ public interface GovOrgOpenFeignClient { * @date 2022/5/11 09:46 */ @PostMapping("/gov/org/house/houseupdate") - Result houseUpdate(@LoginUser TokenDto tokenDTO, @RequestBody IcHouseAddFormDTO formDTO); + Result houseUpdate(@RequestBody IcHouseAddFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index 80f71ca674..c2a54fe84a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -401,7 +401,7 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { } @Override - public Result houseUpdate(TokenDto tokenDTO, IcHouseAddFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "houseUpdate", tokenDTO,formDTO); + public Result houseUpdate( IcHouseAddFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "houseUpdate",formDTO); } } From ee34c3cbb2209bfc3e57d1b7a9f836bbbfbfa89d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 11 May 2022 10:05:31 +0800 Subject: [PATCH 016/102] =?UTF-8?q?=E9=87=8D=E5=A4=8DcustomerId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/ChangeRelocationServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java index aeb6e9c1b9..c7508f9190 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java @@ -184,7 +184,6 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 10:10:40 +0800 Subject: [PATCH 017/102] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcMoveInRecordDTO.java | 7 +- .../dto/form/IcMoveInAddEditFormDTO.java | 136 +++++++++++ .../epmet/dto/form/IcMoveInListFormDTO.java | 77 ++++++ .../dto/result/IcMoveInListResultDTO.java | 154 ++++++++++++ .../controller/IcMoveInRecordController.java | 40 +++- .../java/com/epmet/dao/IcMoveInRecordDao.java | 11 +- .../epmet/entity/IcMoveInRecordEntity.java | 7 +- .../com/epmet/excel/IcMoveInRecordExcel.java | 73 ++---- .../epmet/service/IcMoveInRecordService.java | 14 +- .../impl/IcMoveInRecordServiceImpl.java | 222 +++++++++++++++++- .../resources/mapper/IcMoveInRecordDao.xml | 67 +++++- 11 files changed, 720 insertions(+), 88 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInListFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcMoveInRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcMoveInRecordDTO.java index f68c93d372..329c44314b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcMoveInRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcMoveInRecordDTO.java @@ -69,7 +69,12 @@ public class IcMoveInRecordDTO implements Serializable { /** * 是否享受福利【否:0 是:1】 */ - private String isWeifare; + private String isWelfare; + + /** + * 是否勾选补充居民信息0否 1是 + */ + private String isCheck; /** * 手机号 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java new file mode 100644 index 0000000000..4d0fc813dc --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java @@ -0,0 +1,136 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 迁入管理新增/修改 + * @Author sun + */ +@Data +public class IcMoveInAddEditFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 迁入Id + */ + @NotBlank(message = "姓名不能为空", groups = {UpdateGroup.class}) + private String moveInId; + /** + * 网格ID + */ + @NotBlank(message = "网格ID不能为空", groups = {AddGroup.class}) + private String gridId; + /** + * 所属小区ID + */ + @NotBlank(message = "所属小区ID不能为空", groups = {AddGroup.class}) + private String villageId; + /** + * 所属楼宇Id + */ + @NotBlank(message = "所属楼宇ID不能为空", groups = {AddGroup.class}) + private String buildId; + /** + * 单元id + */ + @NotBlank(message = "单元ID不能为空", groups = {AddGroup.class}) + private String unitId; + /** + * 所属家庭Id + */ + @NotBlank(message = "所属家庭ID不能为空", groups = {AddGroup.class}) + private String homeId; + /** + * 姓名 + */ + @NotBlank(message = "姓名不能为空", groups = {AddGroup.class}) + private String name; + /** + * 是否享受福利【否:0 是:1】 + */ + private String isWelfare; + /** + * 是否勾选补充居民信息0否 1是 + */ + private String isCheck; + /** + * 手机号 + */ + @Length(max = 11, message = "手机号位数不能超过11位", groups = AddGroup.class) + private String mobile; + /** + * 身份证号 + */ + @NotBlank(message = "身份证号不能为空", groups = {AddGroup.class}) + @Length(min = 15, max = 18, message = "身份证号位数不正确", groups = AddGroup.class) + private String idCard; + /** + * 性别（1男2女0未知） + */ + private String gender; + /** + * 年龄 + */ + private Integer age; + /** + * 迁入时间 + */ + @NotNull(message = "迁入时间不能为空", groups = {AddGroup.class}) + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date inTime; + /** + * 迁入原因 + */ + @NotBlank(message = "迁入原因不能为空", groups = {AddGroup.class}) + private String inReason; + /** + * 来源地区编码 + */ + //@NotBlank(message = "来源地区编码不能为空", groups = {AddGroup.class}) + private String sourceAddressCode; + /** + * 来源地区编码全路径 + */ + //@NotBlank(message = "来源地区编码全路径不能为空", groups = {AddGroup.class}) + private String sourceAddressPathCode; + /** + * 来源地区地址 + */ + @NotBlank(message = "来源地区地址不能为空", groups = {AddGroup.class}) + private String sourceAddress; + /** + * 详细地址 + */ + @NotBlank(message = "详细地址不能为空", groups = {AddGroup.class}) + private String address; + /** + * 迁移证号码 + */ + private String moveNumber; + /** + * 户主姓名 + */ + private String householderName; + /** + * 与户主关系[字典表] + */ + private String householderRelation; + /** + * 是否更新【0否 1是】 + */ + private String isReplace; + + private String customerId; + private String userId; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInListFormDTO.java new file mode 100644 index 0000000000..7dc30d24f1 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInListFormDTO.java @@ -0,0 +1,77 @@ +package com.epmet.dto.form; + +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 【迁入管理】列表--接口入参 + * @Author sun + */ +@Data +public class IcMoveInListFormDTO implements Serializable { + private static final long serialVersionUID = 9156247659994638103L; + + /** + * 网格ID + */ + private String gridId; + /** + * 所属小区ID + */ + private String villageId; + /** + * 所属楼宇Id + */ + private String buildId; + /** + * 单元id + */ + private String unitId; + /** + * 所属家庭Id + */ + private String homeId; + /** + * 姓名 + */ + private String name; + /** + * 是否享受福利【否:0 是:1】 + */ + private String isWeifare; + /** + * 手机号 + */ + private String mobile; + /** + * 身份证号 + */ + private String idCard; + /** + * 起始迁入时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date startTime; + /** + * 终止迁入时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endTime; + /** + * 页码 + */ + private Integer pageNo = 1; + /** + * 每页显示数量 + */ + private Integer pageSize = 20; + + private Boolean isPage = false; + private String customerId; + private String moveInId; + + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java new file mode 100644 index 0000000000..7795b50736 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java @@ -0,0 +1,154 @@ +package com.epmet.dto.result; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * @Description 【迁入管理】列表--接口返参 + * @Author sun + */ +@Data +public class IcMoveInListResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 议题总数 + */ + private Integer total; + + /** + * 议题列表 + */ + private List list; + + @Data + public static class IcMoveInList { + /** + * 迁入Id + */ + private String moveInId; + /** + * 网格ID + */ + private String gridId; + /** + * 网格名称 + */ + private String gridName; + /** + * 所属小区ID + */ + private String villageId; + /** + * 所属小区名称 + */ + private String villageName; + /** + * 所属楼宇Id + */ + private String buildId; + /** + * 所属楼宇名称 + */ + private String buildName; + /** + * 单元id + */ + private String unitId; + /** + * 单元名称 + */ + private String unitName; + /** + * 所属家庭Id + */ + private String homeId; + /** + * 所属家庭名称 + */ + private String homeName; + /** + * 所属家庭Id + */ + private String allName; + /** + * 姓名 + */ + private String name; + /** + * 是否享受福利【否:0 是:1】 + */ + private String isWeifare; + /** + * 是否勾选补充居民信息0否 1是 + */ + private String isCheck; + + /** + * 手机号 + */ + private String mobile; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 性别（1男2女0未知） + */ + private String gender; + + /** + * 性别（1男2女0未知） + */ + private String genderName; + + /** + * 年龄 + */ + private Integer age; + + /** + * 迁入时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private String inTime; + + /** + * 迁入原因 + */ + private String inReason; + + /** + * 来源地区地址 + */ + private String sourceAddress; + + + /** + * 迁移证号码 + */ + private String moveNumber; + + /** + * 户主姓名 + */ + private String householderName; + + /** + * 与户主关系[字典表] + */ + private String householderRelation; + + /** + * 与户主关系[字典表] + */ + private String householderRelationName; + + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java index bc30dc17ba..876a8bea45 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java @@ -1,7 +1,10 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; -import com.epmet.commons.tools.page.PageData; +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.AssertUtils; @@ -10,6 +13,9 @@ 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.IcMoveInRecordDTO; +import com.epmet.dto.form.IcMoveInAddEditFormDTO; +import com.epmet.dto.form.IcMoveInListFormDTO; +import com.epmet.dto.result.IcMoveInListResultDTO; import com.epmet.excel.IcMoveInRecordExcel; import com.epmet.service.IcMoveInRecordService; import org.springframework.beans.factory.annotation.Autowired; @@ -17,7 +23,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.List; -import java.util.Map; /** @@ -41,23 +46,24 @@ public class IcMoveInRecordController { } @RequestMapping("list") - public Result> page(@RequestParam Map params){ - PageData page = icMoveInRecordService.page(params); - return new Result>().ok(page); + @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) + public Result list(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result().ok(icMoveInRecordService.list(formDTO)); } @NoRepeatSubmit @PostMapping("add") - public Result save(@RequestBody IcMoveInRecordDTO dto){ - //效验数据 + public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInAddEditFormDTO dto){ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + dto.setCustomerId(tokenDto.getCustomerId()); + dto.setUserId(tokenDto.getUserId()); icMoveInRecordService.save(dto); return new Result(); } - @NoRepeatSubmit @PostMapping("edit") - public Result update(@RequestBody IcMoveInRecordDTO dto){ + public Result update(@RequestBody IcMoveInAddEditFormDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); icMoveInRecordService.update(dto); @@ -72,12 +78,22 @@ public class IcMoveInRecordController { return new Result(); } - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = icMoveInRecordService.list(params); + @PostMapping("export") + public void export(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO, HttpServletResponse response) throws Exception { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setIsPage(true); + IcMoveInListResultDTO resultDTO = icMoveInRecordService.list(formDTO); + List list = ConvertUtils.sourceToTarget(resultDTO.getList(), IcMoveInRecordExcel.class); ExcelUtils.exportExcelToTarget(response, null, list, IcMoveInRecordExcel.class); } + @RequestMapping("detail") + public Result detail(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result().ok(icMoveInRecordService.detail(formDTO)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcMoveInRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcMoveInRecordDao.java index 4910ea8882..9d568a8abd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcMoveInRecordDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcMoveInRecordDao.java @@ -1,9 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.IcMoveInListFormDTO; +import com.epmet.dto.result.IcMoveInListResultDTO; import com.epmet.entity.IcMoveInRecordEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 迁入管理记录 * @@ -12,5 +16,10 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcMoveInRecordDao extends BaseDao { - + + /** + * @Author sun + * @Description 【迁入管理】列表查询 + **/ + List selectMoveInList(IcMoveInListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcMoveInRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcMoveInRecordEntity.java index 9ee125a348..0e9f4e76f4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcMoveInRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcMoveInRecordEntity.java @@ -68,7 +68,12 @@ public class IcMoveInRecordEntity extends BaseEpmetEntity { /** * 是否享受福利【否:0 是:1】 */ - private String isWeifare; + private String isWelfare; + + /** + * 是否勾选补充居民信息0否 1是 + */ + private String isCheck; /** * 手机号 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java index d1ec627c17..5eff6171b7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java @@ -1,6 +1,7 @@ package com.epmet.excel; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; @@ -14,38 +15,14 @@ import java.util.Date; @Data public class IcMoveInRecordExcel { - @Excel(name = "唯一标识") - private String id; - - @Excel(name = "客户Id customer.id") - private String customerId; - - @Excel(name = "组织Id") - private String agencyId; - - @Excel(name = "组织的pids") - private String pids; - - @Excel(name = "网格ID") - private String gridId; - - @Excel(name = "所属小区ID") - private String villageId; - - @Excel(name = "所属楼宇Id") - private String buildId; - - @Excel(name = "单元id") - private String unitId; - - @Excel(name = "所属家庭Id") - private String homeId; - @Excel(name = "姓名") private String name; - @Excel(name = "是否享受福利【否:0 是:1】") - private String isWeifare; + @Excel(name = "所属网格") + private String gridName; + + @Excel(name = "所属房屋") + private String allName; @Excel(name = "手机号") private String mobile; @@ -53,50 +30,30 @@ public class IcMoveInRecordExcel { @Excel(name = "身份证号") private String idCard; - @Excel(name = "性别（1男2女0未知）") - private String gender; + @Excel(name = "性别") + private String genderName; @Excel(name = "年龄") private Integer age; @Excel(name = "迁入时间") - private Date inTime; + //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private String inTime; @Excel(name = "迁入原因") private String inReason; - @Excel(name = "来源地") - private String source; - - @Excel(name = "详细地址") - private String address; + @Excel(name = "由何地迁入") + private String sourceAddress; @Excel(name = "迁移证号码") private String moveNumber; @Excel(name = "户主姓名") - private String houseName; - - @Excel(name = "与户主关系[字典表]") - private String houseRelation; - - @Excel(name = "删除标识 0.未删除 1.已删除") - private Integer delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; + private String householderName; - @Excel(name = "更新时间") - private Date updatedTime; + @Excel(name = "与户主关系") + private String householderRelationName; } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java index 3df4e7a2fd..14704378b5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java @@ -3,9 +3,11 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; 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.entity.IcMoveInRecordEntity; -import java.util.List; import java.util.Map; /** @@ -29,12 +31,12 @@ public interface IcMoveInRecordService extends BaseService /** * 默认查询 * - * @param params + * @param formDTO * @return java.util.List * @author generator * @date 2022-05-09 */ - List list(Map params); + IcMoveInListResultDTO list(IcMoveInListFormDTO formDTO); /** * 单条查询 @@ -54,7 +56,7 @@ public interface IcMoveInRecordService extends BaseService * @author generator * @date 2022-05-09 */ - void save(IcMoveInRecordDTO dto); + void save(IcMoveInAddEditFormDTO dto); /** * 默认更新 @@ -64,7 +66,7 @@ public interface IcMoveInRecordService extends BaseService * @author generator * @date 2022-05-09 */ - void update(IcMoveInRecordDTO dto); + void update(IcMoveInAddEditFormDTO dto); /** * 批量删除 @@ -75,4 +77,6 @@ public interface IcMoveInRecordService extends BaseService * @date 2022-05-09 */ void delete(String[] ids); + + IcMoveInListResultDTO.IcMoveInList detail(IcMoveInListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java index c2501bfed0..f8935b07c4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java @@ -4,19 +4,47 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.DictTypeEnum; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcMoveInRecordDao; +import com.epmet.dto.ChangeWelfareDTO; import com.epmet.dto.IcMoveInRecordDTO; +import com.epmet.dto.form.IcMoveInAddEditFormDTO; +import com.epmet.dto.form.IcMoveInListFormDTO; +import com.epmet.dto.form.IcResiUserTransferFormDTO; +import com.epmet.dto.result.HouseInfoDTO; +import com.epmet.dto.result.IcMoveInListResultDTO; +import com.epmet.dto.result.SyncResiResDTO; import com.epmet.entity.IcMoveInRecordEntity; +import com.epmet.entity.IcResiUserEntity; +import com.epmet.feign.EpmetAdminOpenFeignClient; +import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.service.ChangeWelfareService; import com.epmet.service.IcMoveInRecordService; +import com.epmet.service.IcResiUserService; +import com.epmet.service.IcUserTransferRecordService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 迁入管理记录 @@ -25,7 +53,18 @@ import java.util.Map; * @since v1.0.0 2022-05-09 */ @Service +@Slf4j public class IcMoveInRecordServiceImpl extends BaseServiceImpl implements IcMoveInRecordService { + @Autowired + private GovOrgOpenFeignClient govOrgOpenFeignClient; + @Autowired + private IcResiUserService icResiUserService; + @Autowired + private IcUserTransferRecordService icUserTransferRecordService; + @Autowired + private EpmetAdminOpenFeignClient adminOpenFeignClient; + @Autowired + private ChangeWelfareService changeWelfareService; @Override @@ -38,10 +77,53 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public IcMoveInListResultDTO list(IcMoveInListFormDTO formDTO) { + IcMoveInListResultDTO resultDTO = new IcMoveInListResultDTO(); + //导出查询 + if (formDTO.getIsPage()) { + List list = baseDao.selectMoveInList(formDTO); + resultDTO.setList(list); + } else { + //列表查询 + PageInfo data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()) + .doSelectPageInfo(() -> baseDao.selectMoveInList(formDTO)); + resultDTO.setTotal((int) data.getTotal()); + resultDTO.setList(data.getList()); + } + //查询封装房屋信息 + if (!CollectionUtils.isEmpty(resultDTO.getList())) { + Map map = new HashMap<>(); + //查询房屋信息 + Set houseIds = resultDTO.getList().stream().filter(l -> StringUtils.isNotBlank(l.getHomeId())).map(m -> m.getHomeId()).collect(Collectors.toSet()); + Result> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(houseIds, formDTO.getCustomerId()); + List houseInfoDTOList = houseInfoRes.success() && !org.apache.commons.collections4.CollectionUtils.isEmpty(houseInfoRes.getData()) ? houseInfoRes.getData() : new ArrayList<>(); + Map houseInfoMap = houseInfoDTOList.stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity())); + //与户主关系字典表数据 + Result> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode()); + Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); - return ConvertUtils.sourceToTarget(entityList, IcMoveInRecordDTO.class); + //封装数据 + for (IcMoveInListResultDTO.IcMoveInList v : resultDTO.getList()) { + if (!map.containsKey(v.getGridId())) { + //获取网格缓存信息 + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(v.getGridId()); + map.put(v.getGridId(), (null == gridInfo || StringUtils.isEmpty(gridInfo.getGridName()) ? "" : gridInfo.getGridName())); + } + v.setGridName(map.get(v.getGridId())); + if (null != houseInfoMap && houseInfoMap.containsKey(v.getHomeId())) { + v.setVillageName(houseInfoMap.get(v.getHomeId()).getNeighborHoodName()); + v.setBuildName(houseInfoMap.get(v.getHomeId()).getBuildingName()); + v.setUnitName(houseInfoMap.get(v.getHomeId()).getUnitName()); + v.setHomeName(houseInfoMap.get(v.getHomeId()).getDoorName()); + v.setAllName(houseInfoMap.get(v.getHomeId()).getAllName()); + } + if (StringUtils.isNotBlank(v.getHouseholderRelation())) { + v.setHouseholderRelationName(statusMap.get(v.getHouseholderRelation())); + } + } + } + + return resultDTO; } private QueryWrapper getWrapper(Map params){ @@ -59,17 +141,108 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl%s", dto.getMoveInId())); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "信息修改失败,未查询到迁入记录"); + } IcMoveInRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcMoveInRecordEntity.class); + entity.setId(dto.getMoveInId()); updateById(entity); } @@ -80,4 +253,35 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl list = baseDao.selectMoveInList(formDTO); + //2.查询网格房屋信息 + if (!CollectionUtils.isEmpty(list)) { + resultDTO = list.get(NumConstant.ZERO); + //查询房屋信息 + Set houseIds = new HashSet<>(); + houseIds.add(resultDTO.getHomeId()); + Result> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(houseIds, formDTO.getCustomerId()); + List houseInfoDTOList = houseInfoRes.success() && !org.apache.commons.collections4.CollectionUtils.isEmpty(houseInfoRes.getData()) ? houseInfoRes.getData() : new ArrayList<>(); + Map houseInfoMap = houseInfoDTOList.stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity())); + if (null != houseInfoMap && houseInfoMap.containsKey(resultDTO.getHomeId())) { + resultDTO.setVillageName(houseInfoMap.get(resultDTO.getHomeId()).getNeighborHoodName()); + resultDTO.setBuildName(houseInfoMap.get(resultDTO.getHomeId()).getBuildingName()); + resultDTO.setUnitName(houseInfoMap.get(resultDTO.getHomeId()).getUnitName()); + resultDTO.setHomeName(houseInfoMap.get(resultDTO.getHomeId()).getDoorName()); + resultDTO.setAllName(houseInfoMap.get(resultDTO.getHomeId()).getAllName()); + } + //获取网格缓存信息 + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(resultDTO.getGridId()); + if (null != gridInfo) { + resultDTO.setGridName(gridInfo.getGridName()); + } + } + + return resultDTO; + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml index 9e8c575fdd..a4447ed6e5 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml @@ -3,6 +3,71 @@ - + \ No newline at end of file From fe99fb2b46f78aabbe722863649e662b6274b4d3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 11 May 2022 10:22:45 +0800 Subject: [PATCH 018/102] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcUserTransferRecordServiceImpl.java | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java index 800c03ddec..87845f425c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java @@ -441,9 +441,25 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl getNewHouseInfo(IcResiUserTransferFormDTO formDTO) { Result result2 = new Result<>(); - if (IcResiUserConstant.OUT.equals(formDTO.getOrigin()) - || IcResiUserConstant.IN.equals(formDTO.getOrigin()) + if (IcResiUserConstant.OUT.equals(formDTO.getOrigin()) && "in".equals(formDTO.getType())) { + //迁出且类型为 迁出到本客户内的，才会查询新的房屋信息；迁出到其他的不查询 + IcResiUserOrgMsgFormDTO orgMsgFormDTO2 = new IcResiUserOrgMsgFormDTO(); + orgMsgFormDTO2.setCustomerId(formDTO.getCustomerId()); + orgMsgFormDTO2.setAgencyId(formDTO.getNewAgencyId()); + orgMsgFormDTO2.setGridId(formDTO.getNewGridId()); + orgMsgFormDTO2.setNeighborHoodId(formDTO.getNewNeighborHoodId()); + orgMsgFormDTO2.setBuildingId(formDTO.getNewBuildingId()); + orgMsgFormDTO2.setBuildingUnitId(formDTO.getNewBuildingUnitId()); + orgMsgFormDTO2.setHouseId(formDTO.getNewHouseId()); + result2 = govOrgOpenFeignClient.icResiUserOrgMsg(orgMsgFormDTO2); + if (!result2.success() || null == result2.getData().getAgencyDTO() || null == result2.getData().getGridDTO() || null == result2.getData().getNeighborHoodDTO() + || null == result2.getData().getBuildingDTO() || null == result2.getData().getBuildingUnitDTO() || null == result2.getData().getHouseDTO()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查找迁入后的组织、网格、小区、楼栋、单元、房屋信息失败", "迁出至的房屋信息异常"); + } + } + if (IcResiUserConstant.IN.equals(formDTO.getOrigin()) || IcResiUserConstant.BIRTH.equals(formDTO.getOrigin())) { + //出生管理、迁入管理的查询当前选择的房屋信息 IcResiUserOrgMsgFormDTO orgMsgFormDTO2 = new IcResiUserOrgMsgFormDTO(); orgMsgFormDTO2.setCustomerId(formDTO.getCustomerId()); orgMsgFormDTO2.setAgencyId(formDTO.getNewAgencyId()); @@ -455,7 +471,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 10:31:36 +0800 Subject: [PATCH 019/102] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=AD=BB=E4=BA=A1?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=B0=83=E6=95=B4=EF=BC=8C=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=B9=B4=E9=BE=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../validator/IdCardNoValidatorUtils.java | 61 +++++++++++++++++-- .../java/com/epmet/dto/ChangeDeathDTO.java | 5 ++ .../com/epmet/entity/ChangeDeathEntity.java | 7 +++ .../service/impl/ChangeDeathServiceImpl.java | 4 +- 4 files changed, 71 insertions(+), 6 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java index 13e0239d96..0b0c3cbc8b 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java @@ -4,15 +4,17 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.util.Calendar; +import java.util.Date; import java.util.GregorianCalendar; import java.util.Hashtable; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static java.util.regex.Pattern.*; +import static java.util.regex.Pattern.compile; /** * 身份证号校验 @@ -24,6 +26,15 @@ public class IdCardNoValidatorUtils { private static Logger logger = LoggerFactory.getLogger(IdCardNoValidatorUtils.class); + /** + * 15位身份证号 + */ + private static final Integer FIFTEEN_ID_CARD = 15; + /** + * 18位身份证号 + */ + private static final Integer EIGHTEEN_ID_CARD = 18; + /** * 身份证验证 * @@ -216,15 +227,15 @@ public class IdCardNoValidatorUtils { int nowMonth = now.getMonthValue(); int cardYear = 0; int cardMonth = 0; - if (StringUtils.isNotBlank(IDCard) && checkIsIdCardNo(IDCard)) { - if (IDCard.length() == 15) { + if (StringUtils.isNotBlank(IDCard) && isValid(IDCard)) { + if (IDCard.length() == FIFTEEN_ID_CARD) { // 身份证上的年份(15位身份证为1980年前的) String uyear = "19" + IDCard.substring(6, 8); cardYear = Integer.parseInt(uyear); // 身份证上的月份 String uyue = IDCard.substring(8, 10); cardMonth = Integer.parseInt(uyue); - } else if (IDCard.length() == 18) { + } else if (IDCard.length() == EIGHTEEN_ID_CARD) { // 身份证上的年份 String year = IDCard.substring(6).substring(0, 4); cardYear = Integer.parseInt(year); @@ -243,5 +254,47 @@ public class IdCardNoValidatorUtils { return age; } + /** + * 身份证验证是否有效 + * + * @param id 号码内容 + * @return boolean + * @author + * @date + */ + public static boolean isValid(String id) { + Boolean validResult = true; + //校验长度只能为15或18 + int len = id.length(); + if (len != FIFTEEN_ID_CARD && len != EIGHTEEN_ID_CARD) { + validResult = false; + } + //校验生日 + if (!validDate(id)) { + validResult = false; + } + return validResult; + } + + /** + * 校验生日 + * + * @param id + * @return + */ + private static boolean validDate(String id) { + try { + String birth = id.length() == FIFTEEN_ID_CARD ? "19" + id.substring(6, 12) : id.substring(6, 14); + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); + Date birthDate = sdf.parse(birth); + if (!birth.equals(sdf.format(birthDate))) { + return false; + } + } catch (ParseException e) { + return false; + } + return true; + } + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java index 9f77373ab4..d26a37b23b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java @@ -64,6 +64,11 @@ public class ChangeDeathDTO implements Serializable { */ private String type; + /** + * 死亡时间 + */ + private Date deathDate; + /** * 加入时间 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ChangeDeathEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ChangeDeathEntity.java index 351c58e424..5f6d2600bf 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ChangeDeathEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ChangeDeathEntity.java @@ -5,6 +5,8 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; + /** * 死亡名单表 * @@ -53,6 +55,11 @@ public class ChangeDeathEntity extends BaseEpmetEntity { */ private String type; + /** + * 死亡时间 + */ + private Date deathDate; + /** * 加入时间 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java index 3fccd9b04d..8a8a0a9866 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java @@ -148,10 +148,10 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 10:32:04 +0800 Subject: [PATCH 020/102] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/result/SyncResiResDTO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java index 8c127ed403..3de480fced 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java @@ -2,6 +2,7 @@ package com.epmet.dto.result; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.AllArgsConstructor; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -10,6 +11,7 @@ import java.io.Serializable; /** * 迁入管理、出生管理,勾选了补充居民信息，输入身份证号后，调用接口校验是否可继续执行 */ +@AllArgsConstructor @Data public class SyncResiResDTO implements Serializable { private static final long serialVersionUID = 673439146165836938L; From aeb23049a7489a365476812e1fee9c038955e075 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 11 May 2022 10:42:00 +0800 Subject: [PATCH 021/102] checkuser --- .../src/main/java/com/epmet/dto/result/SyncResiResDTO.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java index 3de480fced..b93590bce9 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java @@ -66,4 +66,7 @@ public class SyncResiResDTO implements Serializable { this.status=StrConstant.EPMETY_STR; this.icResiUserId=StrConstant.EPMETY_STR; } + public SyncResiResDTO(){ + + } } From a2acce763b55a63c7e3255daa371c06cb73ba0dd Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 11 May 2022 10:53:05 +0800 Subject: [PATCH 022/102] =?UTF-8?q?=E5=87=BA=E7=94=9F=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcBirthRecordDTO.java | 179 +++++++++ .../epmet/dto/form/BirthRecordFormDTO.java | 77 ++++ .../controller/IcBirthRecordController.java | 122 ++++++ .../java/com/epmet/dao/IcBirthRecordDao.java | 16 + .../com/epmet/entity/IcBirthRecordEntity.java | 131 +++++++ .../com/epmet/excel/IcBirthRecordExcel.java | 75 ++++ .../epmet/service/IcBirthRecordService.java | 67 ++++ .../impl/IcBirthRecordServiceImpl.java | 370 ++++++++++++++++++ .../resources/mapper/IcBirthRecordDao.xml | 39 ++ 9 files changed, 1076 insertions(+) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordFormDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcBirthRecordEntity.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcBirthRecordService.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java create mode 100644 epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java new file mode 100644 index 0000000000..cbc99af76f --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java @@ -0,0 +1,179 @@ +package com.epmet.dto; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 出生管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-10 + */ +@Data +public class IcBirthRecordDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * 组织Id + */ + private String agencyId; + + /** + * 组织的pids + */ + private String pids; + + /** + * 网格ID + */ + private String gridId; + private String gridName; + + /** + * 所属小区ID + */ + private String villageId; + + /** + * 所属楼宇Id + */ + private String buildId; + + /** + * 单元id + */ + private String unitId; + + /** + * 所属家庭Id + */ + private String homeId; + private String home; + + /** + * 姓名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; + + /** + * 性别 + */ + private String gender; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 出生日期 + */ + private String birthday; + + /** + * 出生地 + */ + private String birthplace; + + /** + * 是否享受福利【否:0 是:1】 + */ + private String isWelfare; + + /** + * 父亲姓名 + */ + private String father; + + /** + * 母亲姓名 + */ + private String mother; + private String parentName; + /** + * 胎次 + */ + private Integer count; + + /** + * 申报日期 + */ + private String reportDate; + + /** + * 户主姓名 + */ + private String householderName; + + /** + * 与户主关系【字典表】 + */ + private String householderRelation; + + /** + * 是否勾选补充居民信息0否 1是 + */ + private String isCheck; + /** + * 是否更新居民信息0否 1是 + */ + @JsonIgnore + private String isReplace; + + /** + * 删除标识 0.未删除 1.已删除 + */ + @JsonIgnore + private Integer delFlag; + + /** + * 乐观锁 + */ + @JsonIgnore + private Integer revision; + + /** + * 创建人 + */ + @JsonIgnore + private String createdBy; + + /** + * 创建时间 + */ + @JsonIgnore + private Date createdTime; + + /** + * 更新人 + */ + @JsonIgnore + private String updatedBy; + + /** + * 更新时间 + */ + @JsonIgnore + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordFormDTO.java new file mode 100644 index 0000000000..adaff9111b --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordFormDTO.java @@ -0,0 +1,77 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/5/10 10:02 + */ +@NoArgsConstructor +@Data +public class BirthRecordFormDTO extends PageFormDTO implements Serializable { + + private static final long serialVersionUID = 5077167613040462646L; + /** + * 客户ID + */ + private String customerId; + private String staffId; + /** + * 网格ID + */ + private String gridId; + /** + * 小区ID + */ + private String villageId; + /** + * 楼栋ID + */ + private String buildId; + /** + * 单元ID + */ + private String unitId; + /** + * 房屋ID + */ + private String homeId; + /** + * 姓名 + */ + private String name; + /** + * 手机 + */ + private String mobile; + /** + * 身份证 + */ + private String idCard; + /** + * 性别 + */ + private String gender; + /** + * 出生日开始 + */ + private String startTime; + /** + * 出生日期结束 + */ + private String endTime; + /** + * 是否福利 + */ + private String isWelfare; + + /** + * 是否分页 + */ + private Boolean isPage; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java new file mode 100644 index 0000000000..3eed9c901a --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java @@ -0,0 +1,122 @@ +package com.epmet.controller; + +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.page.PageData; +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.utils.poi.excel.handler.FreezeAndFilter; +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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.IcBirthRecordDTO; +import com.epmet.dto.form.BirthRecordFormDTO; +import com.epmet.excel.IcBirthRecordExcel; +import com.epmet.service.IcBirthRecordService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; + + +/** + * 出生管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-10 + */ +@Slf4j +@RestController +@RequestMapping("icBirthRecord") +public class IcBirthRecordController { + + @Autowired + private IcBirthRecordService icBirthRecordService; + + @RequestMapping("page") + public Result> page(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + PageData page = icBirthRecordService.page(formDTO); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcBirthRecordDTO data = icBirthRecordService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcBirthRecordDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icBirthRecordService.save(tokenDto, dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@LoginUser TokenDto tokenDto, @RequestBody IcBirthRecordDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icBirthRecordService.update(tokenDto, dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icBirthRecordService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordFormDTO formDTO, HttpServletResponse response) throws Exception { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setIsPage(false); + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + int pageNo = formDTO.getPageNo(); + + ExcelWriter excelWriter = null; + AtomicInteger i = new AtomicInteger(1); + try { + String fileName = "出生管理.xlsx"; + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcBirthRecordExcel.class).build(); + PageData page = null; + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + do { + page = icBirthRecordService.page(formDTO); + List list = ConvertUtils.sourceToTarget(page.getList(), IcBirthRecordExcel.class); + list.forEach(item -> { + item.setIndex(i.getAndIncrement()); + }); + excelWriter.write(list, writeSheet); + } while (CollectionUtils.isNotEmpty(page.getList()) && page.getList().size() == formDTO.getPageSize()); + } catch (Exception e) { + log.error("export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java new file mode 100644 index 0000000000..f3cfc215ee --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcBirthRecordEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 出生管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-10 + */ +@Mapper +public interface IcBirthRecordDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcBirthRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcBirthRecordEntity.java new file mode 100644 index 0000000000..116f72e774 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcBirthRecordEntity.java @@ -0,0 +1,131 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 出生管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-10 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_birth_record") +public class IcBirthRecordEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * 组织Id + */ + private String agencyId; + + /** + * 组织的pids + */ + private String pids; + + /** + * 网格ID + */ + private String gridId; + + /** + * 所属小区ID + */ + private String villageId; + + /** + * 所属楼宇Id + */ + private String buildId; + + /** + * 单元id + */ + private String unitId; + + /** + * 所属家庭Id + */ + private String homeId; + + /** + * 姓名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; + + /** + * 性别 + */ + private String gender; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 出生日期 + */ + private String birthday; + + /** + * 出生地 + */ + private String birthplace; + + /** + * 是否享受福利【否:0 是:1】 + */ + private String isWelfare; + + /** + * 父亲姓名 + */ + private String father; + + /** + * 母亲姓名 + */ + private String mother; + + /** + * 胎次 + */ + private Integer count; + + /** + * 申报日期 + */ + private String reportDate; + + /** + * 户主姓名 + */ + private String householderName; + + /** + * 与户主关系【字典表】 + */ + private String householderRelation; + + /** + * 是否勾选补充居民信息0否 1是 + */ + private String isCheck; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java new file mode 100644 index 0000000000..92531f44f5 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java @@ -0,0 +1,75 @@ +package com.epmet.excel; + +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 lombok.Data; + +/** + * 出生管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-10 + */ +@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44) +@Data +public class IcBirthRecordExcel { + + @ColumnWidth(5) + @ExcelProperty(value = "序号",order = 1) + private Integer index; + + @ColumnWidth(20) + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @ColumnWidth(20) + @ExcelProperty(value = "所属网格",order = 1) + private String gridName; + + @ColumnWidth(30) + @ExcelProperty(value = "所属房屋",order = 1) + private String home; + + @ColumnWidth(20) + @ExcelProperty(value = "手机号",order = 1) + private String mobile; + + @ColumnWidth(20) + @ExcelProperty(value = "身份证号",order = 1) + private String idCard; + + @ColumnWidth(5) + @ExcelProperty(value = "性别",order = 1) + private String gender; + + @ColumnWidth(20) + @ExcelProperty(value = "出生日期",order = 1) + private String birthday; + + @ColumnWidth(30) + @ExcelProperty(value = "出生地",order = 1) + private String birthplace; + + @ColumnWidth(20) + @ExcelProperty(value = "出生人的父/母姓名",order = 1) + private String parentName; + + @ColumnWidth(5) + @ExcelProperty(value = "胎次",order = 1) + private Integer count; + + @ColumnWidth(20) + @ExcelProperty(value = "申报户口日期",order = 1) + private String reportDate; + + @ColumnWidth(20) + @ExcelProperty(value = "户主姓名",order = 1) + private String householderName; + + @ColumnWidth(20) + @ExcelProperty(value = "与户主关系",order = 1) + private String householderRelation; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcBirthRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcBirthRecordService.java new file mode 100644 index 0000000000..00ec474c00 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcBirthRecordService.java @@ -0,0 +1,67 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.dto.IcBirthRecordDTO; +import com.epmet.dto.form.BirthRecordFormDTO; +import com.epmet.entity.IcBirthRecordEntity; + +/** + * 出生管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-10 + */ +public interface IcBirthRecordService extends BaseService { + + /** + * 默认分页 + * + * @param formDTO + * @return PageData + * @author generator + * @date 2022-05-10 + */ + PageData page(BirthRecordFormDTO formDTO); + + /** + * 单条查询 + * + * @param id + * @return IcBirthRecordDTO + * @author generator + * @date 2022-05-10 + */ + IcBirthRecordDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-05-10 + */ + void save(TokenDto tokenDto, IcBirthRecordDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-05-10 + */ + void update(TokenDto tokenDto, IcBirthRecordDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-05-10 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java new file mode 100644 index 0000000000..60e4d2be60 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java @@ -0,0 +1,370 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.GenderEnum; +import com.epmet.commons.tools.enums.RelationshipEnum; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dao.IcBirthRecordDao; +import com.epmet.dao.IcResiUserDao; +import com.epmet.dto.ChangeWelfareDTO; +import com.epmet.dto.IcBirthRecordDTO; +import com.epmet.dto.form.BirthRecordFormDTO; +import com.epmet.dto.form.IcResiUserTransferFormDTO; +import com.epmet.dto.result.AllGridsByUserIdResultDTO; +import com.epmet.dto.result.HouseInfoDTO; +import com.epmet.dto.result.SyncResiResDTO; +import com.epmet.entity.IcBirthRecordEntity; +import com.epmet.entity.IcResiUserEntity; +import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.service.ChangeWelfareService; +import com.epmet.service.IcBirthRecordService; +import com.epmet.service.IcResiUserService; +import com.epmet.service.IcUserTransferRecordService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * 出生管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-10 + */ +@Service +public class IcBirthRecordServiceImpl extends BaseServiceImpl implements IcBirthRecordService { + @Resource + private GovOrgOpenFeignClient govOrgOpenFeignClient; + @Resource + private IcResiUserService icResiUserService; + @Resource + private IcUserTransferRecordService icUserTransferRecordService; + @Resource + private IcResiUserDao icResiUserDao; + @Resource + private ChangeWelfareService changeWelfareService; + + @Override + public PageData page(BirthRecordFormDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo) { + throw new EpmetException("获取工作人员信息失败"); + } + + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + LambdaQueryWrapper wrapper = getWrapper(formDTO, staffInfo); + List entityList = baseDao.selectList(wrapper); + PageInfo pageInfo = new PageInfo<>(entityList); + List list = ConvertUtils.sourceToTarget(entityList, IcBirthRecordDTO.class); + + if (CollectionUtils.isNotEmpty(list)) { + //查询网格名称 + List gridIds = list.stream().map(IcBirthRecordDTO::getGridId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); + Result> gridInfoRes = govOrgOpenFeignClient.getGridListByGridIds(gridIds); + List gridInfoList = gridInfoRes.success() && !CollectionUtils.isEmpty(gridInfoRes.getData()) ? gridInfoRes.getData() : new ArrayList<>(); + Map gridInfoMap = gridInfoList.stream().collect(Collectors.toMap(AllGridsByUserIdResultDTO::getGridId, AllGridsByUserIdResultDTO::getGridName, (key1, key2) -> key2)); + + //查询房子名称 + List houseIdList = list.stream().map(IcBirthRecordDTO::getHomeId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); + Set houseIds = new HashSet<>(houseIdList); + Result> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(houseIds, formDTO.getCustomerId()); + List houseInfoDTOList = houseInfoRes.success() && !CollectionUtils.isEmpty(houseInfoRes.getData()) ? houseInfoRes.getData() : new ArrayList<>(); + Map houseInfoMap = houseInfoDTOList.stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity())); + list.forEach(item -> { + item.setGridName(gridInfoMap.get(item.getGridId())); + if (houseInfoMap.containsKey(item.getHomeId()) && null != houseInfoMap.get(item.getHomeId())) { + HouseInfoDTO houseInfoDTO = houseInfoMap.get(item.getHomeId()); + item.setHome(houseInfoDTO.getAllName()); + } + if (StringUtils.isNotBlank(item.getFather()) && StringUtils.isNotBlank(item.getMother())) { + item.setParentName(item.getFather().concat(StrConstant.SEPARATOR).concat(item.getMother())); + } else { + String parentName = StringUtils.isBlank(item.getFather())?"":item.getFather() ; + parentName = parentName.concat(StringUtils.isBlank(item.getMother())?"":item.getMother()); + item.setParentName(parentName); + } + if (StringUtils.isNotBlank(item.getHouseholderRelation())) { + item.setHouseholderRelation(RelationshipEnum.getEnum(item.getHouseholderRelation()).getName()); + } + item.setGender(GenderEnum.getName(item.getGender())); + }); + } + + return new PageData<>(list, pageInfo.getTotal()); + } + + @Override + public IcBirthRecordDTO get(String id) { + IcBirthRecordEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcBirthRecordDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(TokenDto tokenDto, IcBirthRecordDTO dto) { + //获取工作人员信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo) { + throw new EpmetException("获取工作人员信息失败"); + } + // + SyncResiResDTO sync = icResiUserService.checkUser(tokenDto.getCustomerId(), dto.getIdCard(), staffInfo.getAgencyId()); + //是否补充居民信息 + if (NumConstant.ONE_STR.equals(dto.getIsCheck())) { + //判断是否可迁入 + if (!sync.getMoveInstatus()) { + throw new EpmetException("请联系" + sync.getResiAgencyName() + "迁出该居民后操作"); + } + + IcResiUserEntity userEntity = ConvertUtils.sourceToTarget(dto, IcResiUserEntity.class);; + + userEntity.setCustomerId(tokenDto.getCustomerId()); + userEntity.setAgencyId(staffInfo.getAgencyId()); + userEntity.setPids(staffInfo.getAgencyPIds()); + userEntity.setYhzgx(dto.getHouseholderRelation()); + userEntity.setStatus(NumConstant.ZERO_STR); + userEntity.setSubStatus("11"); + + //判断是否有所属组织，如果有，判断是否属于当前组织，没有的话则直接新增 + if (StringUtils.isNotEmpty(sync.getAgencyId())) { + userEntity.setId(sync.getIcResiUserId()); + if (staffInfo.getAgencyId().equals(sync.getAgencyId())) { + //组织相等的情况 + if (NumConstant.ZERO_STR.equals(sync.getStatus())) { + //正常状态 + if (!dto.getHomeId().equals(sync.getResiHomeId())) { + //房屋信息不一致 + //是否更新 为空，返回确认消息 + if (StringUtils.isBlank(dto.getIsReplace())) { + throw new EpmetException("居民信息中房屋信息与当前选择房屋不一致，是否更新？"); + } else if (NumConstant.ONE_STR.equals(dto.getIsReplace())) { + //更新居民信息 + icResiUserDao.updateById(userEntity); + } + } else { + //房屋信息一致 + //更新居民信息 + icResiUserDao.updateById(userEntity); + } + } else { + //迁出或注销状态， + //更新居民信息 + icResiUserDao.updateById(userEntity); + //迁入记录 + extracted(tokenDto, dto, staffInfo, sync); + } + } else { + //组织不相等的情况 + //更新居民信息 + icResiUserDao.updateById(userEntity); + //迁入记录 + extracted(tokenDto, dto, staffInfo, sync); + + } + } else { + //添加居民信息 + icResiUserDao.insert(userEntity); + //迁入记录 + extracted(tokenDto, dto, staffInfo, sync); + } + } + + //生成出生记录 + IcBirthRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcBirthRecordEntity.class); + entity.setCustomerId(tokenDto.getCustomerId()); + entity.setAgencyId(staffInfo.getAgencyId()); + entity.setPids(staffInfo.getAgencyPIds()); + insert(entity); + + //记录享受福利信息 + if (NumConstant.ONE_STR.equals(dto.getIsWelfare())) { + ChangeWelfareDTO welfare = new ChangeWelfareDTO(); + welfare.setCustomerId(tokenDto.getCustomerId()); + welfare.setGridId(dto.getGridId()); + welfare.setUserId(sync.getIcResiUserId()); + welfare.setIdCard(dto.getIdCard()); + welfare.setMobile(dto.getMobile()); + welfare.setName(dto.getName()); + welfare.setGender(dto.getGender()); + welfare.setJoinReason("出生登记选定"); + changeWelfareService.saveWelfareInfo(welfare); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(TokenDto tokenDto, IcBirthRecordDTO dto) { + + IcBirthRecordEntity record = baseDao.selectById(dto.getId()); + + //获取工作人员信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo) { + throw new EpmetException("获取工作人员信息失败"); + } + if (NumConstant.ONE_STR.equals(dto.getIsCheck()) && NumConstant.ONE_STR.equals(record.getIsCheck())) { + throw new EpmetException("已补充到居民信息"); + } + //是否补充居民信息 + SyncResiResDTO sync = icResiUserService.checkUser(tokenDto.getCustomerId(), dto.getIdCard(), staffInfo.getAgencyId()); + if (NumConstant.ONE_STR.equals(dto.getIsCheck())) { + //判断是否可迁入 + if (!sync.getMoveInstatus()) { + throw new EpmetException("请联系" + sync.getResiAgencyName() + "迁出该居民后操作"); + } + + IcResiUserEntity userEntity = ConvertUtils.sourceToTarget(record, IcResiUserEntity.class); + userEntity.setCustomerId(tokenDto.getCustomerId()); + userEntity.setAgencyId(staffInfo.getAgencyId()); + userEntity.setPids(staffInfo.getAgencyPIds()); + userEntity.setYhzgx(dto.getHouseholderRelation()); + userEntity.setStatus(NumConstant.ZERO_STR); + userEntity.setSubStatus("11"); + + //判断是否有所属组织，如果有，判断是否属于当前组织，没有的话则直接新增 + if (StringUtils.isNotEmpty(sync.getAgencyId())) { + userEntity.setId(sync.getIcResiUserId()); + if (staffInfo.getAgencyId().equals(sync.getAgencyId())) { + //组织相等的情况 + if (NumConstant.ZERO_STR.equals(sync.getStatus())) { + //正常状态 + if (!dto.getHomeId().equals(sync.getResiHomeId())) { + //房屋信息不一致 + //是否更新 为空，返回确认消息 + if (StringUtils.isBlank(dto.getIsReplace())) { + throw new EpmetException("居民信息中房屋信息与当前选择房屋不一致，是否更新？"); + } else if (NumConstant.ONE_STR.equals(dto.getIsReplace())) { + //更新居民信息 + icResiUserDao.updateById(userEntity); + } + } else { + //房屋信息一致 + //更新居民信息 + icResiUserDao.updateById(userEntity); + } + } else { + //迁出或注销状态， + //更新居民信息 + icResiUserDao.updateById(userEntity); + //迁入记录 + extracted(tokenDto, ConvertUtils.sourceToTarget(record, IcBirthRecordDTO.class), staffInfo, sync); + } + } else { + //组织不相等的情况 + //更新居民信息 + icResiUserDao.updateById(userEntity); + //迁入记录 + extracted(tokenDto, ConvertUtils.sourceToTarget(record, IcBirthRecordDTO.class), staffInfo, sync); + + } + } else { + //添加居民信息 + icResiUserDao.insert(userEntity); + //迁入记录 + extracted(tokenDto, dto, staffInfo, sync); + } + } + + IcBirthRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcBirthRecordEntity.class); + entity.setGridId(null); + entity.setBuildId(null); + entity.setUnitId(null); + entity.setHomeId(null); + entity.setName(null); + entity.setMobile(null); + entity.setIdCard(null); + if (NumConstant.ONE_STR.equals(record.getIsCheck())) { + entity.setIsCheck(null); + } + if (NumConstant.ONE_STR.equals(record.getIsWelfare())) { + entity.setIsWelfare(null); + } + updateById(entity); + + if (NumConstant.ZERO_STR.equals(record.getIsWelfare()) && NumConstant.ONE_STR.equals(dto.getIsWelfare())) { + ChangeWelfareDTO welfare = new ChangeWelfareDTO(); + welfare.setCustomerId(tokenDto.getCustomerId()); + welfare.setGridId(record.getGridId()); + welfare.setUserId(sync.getIcResiUserId()); + welfare.setIdCard(record.getIdCard()); + welfare.setMobile(record.getMobile()); + welfare.setName(record.getName()); + welfare.setGender(record.getGender()); + welfare.setJoinReason("出生登记选定"); + changeWelfareService.saveWelfareInfo(welfare); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @NotNull + private LambdaQueryWrapper getWrapper(BirthRecordFormDTO formDTO, CustomerStaffInfoCacheResult staffInfo) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcBirthRecordEntity::getCustomerId, formDTO.getCustomerId()); + wrapper.and(wq -> wq.eq(IcBirthRecordEntity::getAgencyId, staffInfo.getAgencyId()).or().like(IcBirthRecordEntity::getPids, staffInfo.getAgencyId())); + wrapper.eq(StringUtils.isNotBlank(formDTO.getGridId()), IcBirthRecordEntity::getGridId, formDTO.getGridId()); + wrapper.eq(StringUtils.isNotBlank(formDTO.getVillageId()), IcBirthRecordEntity::getVillageId, formDTO.getVillageId()); + wrapper.eq(StringUtils.isNotBlank(formDTO.getBuildId()), IcBirthRecordEntity::getBuildId, formDTO.getBuildId()); + wrapper.eq(StringUtils.isNotBlank(formDTO.getUnitId()), IcBirthRecordEntity::getUnitId, formDTO.getUnitId()); + wrapper.eq(StringUtils.isNotBlank(formDTO.getHomeId()), IcBirthRecordEntity::getHomeId, formDTO.getHomeId()); + wrapper.eq(StringUtils.isNotBlank(formDTO.getGender()), IcBirthRecordEntity::getGender, formDTO.getGender()); + wrapper.eq(StringUtils.isNotBlank(formDTO.getIsWelfare()), IcBirthRecordEntity::getIsWelfare, formDTO.getIsWelfare()); + wrapper.like(StringUtils.isNotBlank(formDTO.getName()), IcBirthRecordEntity::getName, formDTO.getName()); + wrapper.like(StringUtils.isNotBlank(formDTO.getMobile()), IcBirthRecordEntity::getMobile, formDTO.getMobile()); + wrapper.like(StringUtils.isNotBlank(formDTO.getIdCard()), IcBirthRecordEntity::getIdCard, formDTO.getIdCard()); + wrapper.ge(StringUtils.isNotBlank(formDTO.getStartTime()), IcBirthRecordEntity::getBirthday, formDTO.getStartTime()); + wrapper.le(StringUtils.isNotBlank(formDTO.getEndTime()), IcBirthRecordEntity::getBirthday, formDTO.getEndTime()); + return wrapper; + } + + /** + * 迁入记录 + * @Param tokenDto + * @Param dto + * @Param staffInfo + * @Param sync + * @Return + * @Author zhaoqifeng + * @Date 2022/5/11 9:15 + */ + private void extracted(TokenDto tokenDto, IcBirthRecordDTO dto, CustomerStaffInfoCacheResult staffInfo, SyncResiResDTO sync) { + IcResiUserTransferFormDTO transfer = new IcResiUserTransferFormDTO(); + transfer.setCustomerId(tokenDto.getCustomerId()); + transfer.setStaffId(tokenDto.getUserId()); + transfer.setIcUserId(sync.getIcResiUserId()); + transfer.setType("in"); + transfer.setNewAgencyId(staffInfo.getAgencyId()); + transfer.setNewGridId(dto.getGridId()); + transfer.setNewNeighborHoodId(dto.getVillageId()); + transfer.setNewBuildingId(dto.getBuildId()); + transfer.setNewBuildingUnitId(dto.getUnitId()); + transfer.setNewHouseId(dto.getHomeId()); + transfer.setTransferTime(new Date()); + transfer.setReason("出生登记"); + transfer.setOrigin("birth"); + icUserTransferRecordService.moveOutResi(transfer); + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml new file mode 100644 index 0000000000..52a3ce76eb --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From f51f214d097756c5d4b0b05e1aec870808bbc6ce Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 11 May 2022 10:56:21 +0800 Subject: [PATCH 023/102] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/IcMoveInListResultDTO.java | 2 +- .../controller/IcMoveInRecordController.java | 52 +++++++++++++++++-- .../com/epmet/excel/IcMoveInRecordExcel.java | 28 +++++++++- 3 files changed, 75 insertions(+), 7 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java index 7795b50736..8a9037847b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java @@ -116,7 +116,7 @@ public class IcMoveInListResultDTO implements Serializable { * 迁入时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private String inTime; + private Date inTime; /** * 迁入原因 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java index 876a8bea45..ce89eb6423 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java @@ -1,12 +1,18 @@ package com.epmet.controller; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; @@ -18,10 +24,13 @@ import com.epmet.dto.form.IcMoveInListFormDTO; import com.epmet.dto.result.IcMoveInListResultDTO; import com.epmet.excel.IcMoveInRecordExcel; import com.epmet.service.IcMoveInRecordService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.Date; import java.util.List; @@ -33,6 +42,7 @@ import java.util.List; */ @RestController @RequestMapping("icMoveIn") +@Slf4j public class IcMoveInRecordController { @Autowired @@ -79,12 +89,46 @@ public class IcMoveInRecordController { } @PostMapping("export") - public void export(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO, HttpServletResponse response) throws Exception { - formDTO.setCustomerId(tokenDto.getCustomerId()); - formDTO.setIsPage(true); + public void export(@RequestBody IcMoveInListFormDTO formDTO, HttpServletResponse response) throws Exception { + formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); + /* formDTO.setIsPage(true); IcMoveInListResultDTO resultDTO = icMoveInRecordService.list(formDTO); List list = ConvertUtils.sourceToTarget(resultDTO.getList(), IcMoveInRecordExcel.class); - ExcelUtils.exportExcelToTarget(response, null, list, IcMoveInRecordExcel.class); + ExcelUtils.exportExcelToTarget(response, null, list, IcMoveInRecordExcel.class);*/ + + + + + ExcelWriter excelWriter = null; + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + int pageNo = NumConstant.ONE; + try { + String fileName = "迁入管理"+DateUtils.format(new Date())+".xlsx"; + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcMoveInRecordExcel.class).build(); + + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + List list = null; + do { + IcMoveInListResultDTO data = icMoveInRecordService.list(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), IcMoveInRecordExcel.class); + formDTO.setPageNo(++pageNo); + excelWriter.write(list, writeSheet); + } while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); + }catch (Exception e){ + log.error("export exception", e); + }finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + + + + + + + + } @RequestMapping("detail") diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java index 5eff6171b7..d5488a34f9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java @@ -1,6 +1,8 @@ package com.epmet.excel; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -15,43 +17,65 @@ import java.util.Date; @Data public class IcMoveInRecordExcel { + @ExcelProperty(value = "姓名") @Excel(name = "姓名") private String name; + @ExcelProperty(value = "所属网格") + @ColumnWidth(20) @Excel(name = "所属网格") private String gridName; + @ExcelProperty(value = "所属房屋") + @ColumnWidth(25) @Excel(name = "所属房屋") private String allName; + @ExcelProperty(value = "手机号") @Excel(name = "手机号") private String mobile; + @ExcelProperty(value = "身份证号") + @ColumnWidth(20) @Excel(name = "身份证号") private String idCard; + @ExcelProperty(value = "性别") @Excel(name = "性别") private String genderName; + @ExcelProperty(value = "年龄") @Excel(name = "年龄") private Integer age; + @ExcelProperty(value = "迁入时间") + @ColumnWidth(20) @Excel(name = "迁入时间") - //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private String inTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date inTime; + @ExcelProperty(value = "迁入原因") + @ColumnWidth(25) @Excel(name = "迁入原因") private String inReason; + @ExcelProperty(value = "由何地迁入") + @ColumnWidth(25) @Excel(name = "由何地迁入") private String sourceAddress; + @ExcelProperty(value = "迁移证号码") + @ColumnWidth(20) @Excel(name = "迁移证号码") private String moveNumber; + @ExcelProperty(value = "户主姓名") + @ColumnWidth(20) @Excel(name = "户主姓名") private String householderName; + @ExcelProperty(value = "与户主关系") + @ColumnWidth(20) @Excel(name = "与户主关系") private String householderRelationName; From 0c6a90e47a927c7e39541048bd3d2ad5956baba3 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 11 May 2022 10:58:43 +0800 Subject: [PATCH 024/102] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcMoveInRecordController.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java index ce89eb6423..aef718c8c9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java @@ -89,23 +89,19 @@ public class IcMoveInRecordController { } @PostMapping("export") - public void export(@RequestBody IcMoveInListFormDTO formDTO, HttpServletResponse response) throws Exception { - formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); + public void export(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO, HttpServletResponse response) throws Exception { + formDTO.setCustomerId(tokenDto.getCustomerId()); /* formDTO.setIsPage(true); IcMoveInListResultDTO resultDTO = icMoveInRecordService.list(formDTO); List list = ConvertUtils.sourceToTarget(resultDTO.getList(), IcMoveInRecordExcel.class); ExcelUtils.exportExcelToTarget(response, null, list, IcMoveInRecordExcel.class);*/ - - - ExcelWriter excelWriter = null; formDTO.setPageSize(NumConstant.TEN_THOUSAND); int pageNo = NumConstant.ONE; try { String fileName = "迁入管理"+DateUtils.format(new Date())+".xlsx"; excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcMoveInRecordExcel.class).build(); - WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); List list = null; do { @@ -121,14 +117,6 @@ public class IcMoveInRecordController { excelWriter.finish(); } } - - - - - - - - } @RequestMapping("detail") From 9529831a87f6004246a5f808612514fd108db03a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 11 May 2022 11:02:28 +0800 Subject: [PATCH 025/102] moveOutResi=>moveResi --- .../java/com/epmet/service/IcUserTransferRecordService.java | 2 +- .../java/com/epmet/service/impl/ChangeDeathServiceImpl.java | 2 +- .../com/epmet/service/impl/ChangeRelocationServiceImpl.java | 2 +- .../com/epmet/service/impl/IcMoveInRecordServiceImpl.java | 4 ++-- .../epmet/service/impl/IcUserTransferRecordServiceImpl.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java index 63207ede16..4caf8570ba 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java @@ -41,5 +41,5 @@ public interface IcUserTransferRecordService extends BaseService Date: Wed, 11 May 2022 11:03:28 +0800 Subject: [PATCH 026/102] moveOutResi=>moveResi --- .../java/com/epmet/service/impl/IcBirthRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java index 60e4d2be60..f1ee29a810 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java @@ -364,7 +364,7 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 11:04:48 +0800 Subject: [PATCH 027/102] =?UTF-8?q?=E5=87=BA=E7=94=9F=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcBirthRecordServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java index f1ee29a810..91fbed483f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java @@ -336,6 +336,7 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 11:05:38 +0800 Subject: [PATCH 028/102] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java | 2 +- .../src/main/java/com/epmet/excel/IcMoveInRecordExcel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java index 4d0fc813dc..6846564901 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java @@ -86,7 +86,7 @@ public class IcMoveInAddEditFormDTO implements Serializable { * 迁入时间 */ @NotNull(message = "迁入时间不能为空", groups = {AddGroup.class}) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date inTime; /** * 迁入原因 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java index d5488a34f9..b3ee1398bd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java @@ -51,7 +51,7 @@ public class IcMoveInRecordExcel { @ExcelProperty(value = "迁入时间") @ColumnWidth(20) @Excel(name = "迁入时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date inTime; @ExcelProperty(value = "迁入原因") From 094ba15915fbb3100fada57080c98c74679f515b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 11 May 2022 11:08:49 +0800 Subject: [PATCH 029/102] =?UTF-8?q?=E5=87=BA=E7=94=9F=E6=98=AF04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcBirthRecordServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java index f1ee29a810..72da7aa904 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.GenderEnum; +import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum; import com.epmet.commons.tools.enums.RelationshipEnum; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; @@ -140,7 +141,7 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 11:46:49 +0800 Subject: [PATCH 030/102] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ChangeDeathServiceImpl.java | 16 +++++++++++----- .../impl/ChangeRelocationServiceImpl.java | 6 ++++-- .../impl/IcUserTransferRecordServiceImpl.java | 4 ++-- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java index 4b098f8ffb..15f9cfcbab 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; @@ -141,22 +143,26 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 13:07:08 +0800 Subject: [PATCH 031/102] checkUser --- .../java/com/epmet/dto/result/SyncResiResDTO.java | 3 +++ .../epmet/service/IcUserTransferRecordService.java | 12 +++++++++--- .../epmet/service/impl/IcResiUserServiceImpl.java | 9 ++++++--- .../impl/IcUserTransferRecordServiceImpl.java | 1 + 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java index b93590bce9..af515bf87e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java @@ -52,6 +52,9 @@ public class SyncResiResDTO implements Serializable { * 身份证号已存在的居民，返回其房屋id */ private String resiHomeId; + /** + * 用户状态【0:正常;1:迁出;2:注销】 + */ private String status; private String icResiUserId; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java index 4caf8570ba..2930a1f5e9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java @@ -35,10 +35,16 @@ public interface IcUserTransferRecordService extends BaseService Date: Wed, 11 May 2022 13:29:10 +0800 Subject: [PATCH 032/102] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=AD=BB=E4=BA=A1?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V0.0.44__add_death_date.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.44__add_death_date.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.44__add_death_date.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.44__add_death_date.sql new file mode 100644 index 0000000000..d7d60b7cd2 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.44__add_death_date.sql @@ -0,0 +1 @@ +alter table pli_change_relocation add COLUMN `DEATH_DATE` date DEFAULT NULL COMMENT '死亡时间'; From 39b25ec60977cdc2d893c73899b53f8fc797cdec Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 11 May 2022 13:42:37 +0800 Subject: [PATCH 033/102] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/IcMoveInListResultDTO.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java index 8a9037847b..f64d31b3e2 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java @@ -123,12 +123,19 @@ public class IcMoveInListResultDTO implements Serializable { */ private String inReason; + /** + * 来源地区编码 + */ + private String sourceAddressCode; + /** + * 来源地区编码全路径 + */ + private String sourceAddressPathCode; /** * 来源地区地址 */ private String sourceAddress; - /** * 迁移证号码 */ From 15c3837886ea7c6d51bad5b8b42dcab29e47320c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 11 May 2022 13:44:51 +0800 Subject: [PATCH 034/102] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java index 6846564901..bcb62d6b45 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java @@ -2,9 +2,9 @@ package com.epmet.dto.form; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.hibernate.validator.constraints.Length; -import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -86,7 +86,7 @@ public class IcMoveInAddEditFormDTO implements Serializable { * 迁入时间 */ @NotNull(message = "迁入时间不能为空", groups = {AddGroup.class}) - @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date inTime; /** * 迁入原因 From 362467c18469b0c5a858e884c84b658f8b75382b Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 11 May 2022 13:44:52 +0800 Subject: [PATCH 035/102] =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V0.0.44__add_death_date.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.44__add_death_date.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.44__add_death_date.sql index d7d60b7cd2..4db8d747fb 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.44__add_death_date.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.44__add_death_date.sql @@ -1 +1 @@ -alter table pli_change_relocation add COLUMN `DEATH_DATE` date DEFAULT NULL COMMENT '死亡时间'; +alter table pli_change_death add COLUMN `DEATH_DATE` date DEFAULT NULL COMMENT '死亡时间'; From b7ff4d20f070bf2a30e3cbae5ddeba4cc2ed1803 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 11 May 2022 13:46:49 +0800 Subject: [PATCH 036/102] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcBuildingDao.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 7387a73354..41332642a7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -169,7 +169,11 @@ AND a.DEL_FLAG = #{building.delFlag} - order by a.CREATED_TIME, a.BUILDING_NAME + a.sort, + a.sort, + a.sort DESC, + CAST(b.NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(b.NEIGHBOR_HOOD_NAME using gbk), + CAST(a.BUILDING_NAME AS SIGNED),CONVERT(a.BUILDING_NAME USING gbk) From 4c06f7182cb904378874bb871cf7d29fc26a4dc1 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 11 May 2022 14:07:12 +0800 Subject: [PATCH 038/102] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/exception/EpmetErrorCode.java | 1 + .../java/com/epmet/dto/result/IcMoveInListResultDTO.java | 6 ++++++ .../com/epmet/service/impl/IcMoveInRecordServiceImpl.java | 5 +++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 3b1ed3c0c4..8140096f7d 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -254,6 +254,7 @@ public enum EpmetErrorCode { IC_NAT_IDCARD_NATTIME(8923,"已存在相同记录"), IC_NAT(8924,"平台已存在记录，请去修改原有记录"), RESI_IC_NAT(8925,"已存在记录，请联系社区工作人员修改"), + IC_MOVE_IN(8926,"居民信息中房屋信息与当前选择房屋不一致，是否更新？"), //通用错误码 start diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java index f64d31b3e2..3c9e8ee5fa 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java @@ -1,8 +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; @@ -135,6 +137,10 @@ public class IcMoveInListResultDTO implements Serializable { * 来源地区地址 */ private String sourceAddress; + /** + * 详细地址 + */ + private String address; /** * 迁移证号码 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java index df78445f0a..90db2141bc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java @@ -165,9 +165,10 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 14:17:58 +0800 Subject: [PATCH 039/102] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=84=B1=E6=95=8F=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/ChangeDeathController.java | 2 ++ .../java/com/epmet/controller/ChangeRelocationController.java | 2 ++ .../main/java/com/epmet/controller/ChangeWelfareController.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java index ddbcbbb88d..51bd23bd72 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java @@ -1,6 +1,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; @@ -36,6 +37,7 @@ public class ChangeDeathController { private ChangeDeathService changeDeathService; @RequestMapping("page") + @MaskResponse(fieldNames = {"MOBILE", "ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) public Result> page(@RequestParam Map params){ PageData page = changeDeathService.page(params); return new Result>().ok(page); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java index 99d25eaf03..fd05c24da2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java @@ -1,6 +1,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; @@ -36,6 +37,7 @@ public class ChangeRelocationController { private ChangeRelocationService changeRelocationService; @RequestMapping("page") + @MaskResponse(fieldNames = {"MOBILE", "ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) public Result> page(@RequestParam Map params){ PageData page = changeRelocationService.page(params); return new Result>().ok(page); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java index 4b1fee6010..865a7bd3a6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java @@ -1,5 +1,6 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ExcelUtils; @@ -35,6 +36,7 @@ public class ChangeWelfareController { private ChangeWelfareService changeWelfareService; @RequestMapping("page") + @MaskResponse(fieldNames = {"MOBILE", "ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) public Result> page(@RequestParam Map params){ PageData page = changeWelfareService.page(params); return new Result>().ok(page); From 50e61c4110491fb613267334577071693b19ac06 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 11 May 2022 14:35:07 +0800 Subject: [PATCH 040/102] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=84=B1=E6=95=8F=E5=A4=84=E7=90=86-=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/ChangeDeathController.java | 2 +- .../java/com/epmet/controller/ChangeRelocationController.java | 2 +- .../main/java/com/epmet/controller/ChangeWelfareController.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java index 51bd23bd72..5d3703b326 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java @@ -37,7 +37,7 @@ public class ChangeDeathController { private ChangeDeathService changeDeathService; @RequestMapping("page") - @MaskResponse(fieldNames = {"MOBILE", "ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) public Result> page(@RequestParam Map params){ PageData page = changeDeathService.page(params); return new Result>().ok(page); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java index fd05c24da2..f29f38464a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java @@ -37,7 +37,7 @@ public class ChangeRelocationController { private ChangeRelocationService changeRelocationService; @RequestMapping("page") - @MaskResponse(fieldNames = {"MOBILE", "ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) public Result> page(@RequestParam Map params){ PageData page = changeRelocationService.page(params); return new Result>().ok(page); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java index 865a7bd3a6..824fe55591 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java @@ -36,7 +36,7 @@ public class ChangeWelfareController { private ChangeWelfareService changeWelfareService; @RequestMapping("page") - @MaskResponse(fieldNames = {"MOBILE", "ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) public Result> page(@RequestParam Map params){ PageData page = changeWelfareService.page(params); return new Result>().ok(page); From 57c5a02fb648cbbc1a00d62c48d6c96150908aa0 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 11 May 2022 14:47:15 +0800 Subject: [PATCH 041/102] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/ChangeDeathDTO.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java index d26a37b23b..879732a1b4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java @@ -1,5 +1,7 @@ package com.epmet.dto; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -67,6 +69,8 @@ public class ChangeDeathDTO implements Serializable { /** * 死亡时间 */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JSONField(format = "yyyy-MM-dd") private Date deathDate; /** From c30d869f5e5effb3d3136734a2a6bde0d1fb2447 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 11 May 2022 15:02:49 +0800 Subject: [PATCH 042/102] =?UTF-8?q?=E4=BF=AE=E6=94=B9moveResi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/constant/IcResiUserConstant.java | 4 ++-- .../dto/form/IcResiUserTransferFormDTO.java | 3 ++- .../service/impl/IcResiUserServiceImpl.java | 2 +- .../impl/IcUserTransferRecordServiceImpl.java | 20 ++++++++++++------- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/IcResiUserConstant.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/IcResiUserConstant.java index e5817de8cf..95a4b56fa5 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/IcResiUserConstant.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/IcResiUserConstant.java @@ -17,11 +17,11 @@ public interface IcResiUserConstant { String USER_TYPE_IMPORT="import"; - // origin:变动：change; 迁出：out; 死亡：died; 出生birth; 迁入：in + // origin:变动：change; 迁出：out; 死亡：died; 出生birth; 迁入：in; 新增：add String CHANGE = "change"; String OUT = "out"; String DIED = "died"; String BIRTH = "birth"; String IN = "in"; - + String ADD ="add"; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserTransferFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserTransferFormDTO.java index 5eb03853ff..b3733abce3 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserTransferFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserTransferFormDTO.java @@ -86,8 +86,9 @@ public class IcResiUserTransferFormDTO implements Serializable { * 变动：change; * 迁出：out; * 死亡：died; - * 出生birth; + * //出生:birth;废弃 * 迁入：in + * 新增：add */ private String origin; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 99a68899bb..54a418d2de 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -1835,7 +1835,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 15:15:24 +0800 Subject: [PATCH 043/102] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcMoveInRecordServiceImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java index 90db2141bc..7dfba6301d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java @@ -161,7 +161,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 15:24:35 +0800 Subject: [PATCH 044/102] =?UTF-8?q?=E5=87=BA=E7=94=9F=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/enums/GenderEnum.java | 4 ++- .../java/com/epmet/dto/IcBirthRecordDTO.java | 1 - .../controller/IcBirthRecordController.java | 2 +- .../com/epmet/excel/IcBirthRecordExcel.java | 8 +++--- .../impl/IcBirthRecordServiceImpl.java | 28 +++++++++++-------- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.java index 5604377ed5..de004b3481 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.java @@ -2,6 +2,8 @@ package com.epmet.commons.tools.enums; import com.epmet.commons.tools.exception.EpmetErrorCode; +import java.util.Objects; + public enum GenderEnum { MAN("1", "男"), WOMAN("2", "女"), @@ -19,7 +21,7 @@ public enum GenderEnum { public static String getName(String code) { GenderEnum[] genderEnums = values(); for (GenderEnum genderEnum : genderEnums) { - if (genderEnum.getCode() == code) { + if (Objects.equals(genderEnum.getCode(), code)) { return genderEnum.getName(); } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java index cbc99af76f..40932ba693 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java @@ -137,7 +137,6 @@ public class IcBirthRecordDTO implements Serializable { /** * 是否更新居民信息0否 1是 */ - @JsonIgnore private String isReplace; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java index 3eed9c901a..252a0db5b8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java @@ -85,7 +85,7 @@ public class IcBirthRecordController { return new Result(); } - @GetMapping("export") + @PostMapping("export") public void export(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordFormDTO formDTO, HttpServletResponse response) throws Exception { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java index 92531f44f5..fc20ac93ef 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java @@ -16,7 +16,7 @@ import lombok.Data; @Data public class IcBirthRecordExcel { - @ColumnWidth(5) + @ColumnWidth(10) @ExcelProperty(value = "序号",order = 1) private Integer index; @@ -40,7 +40,7 @@ public class IcBirthRecordExcel { @ExcelProperty(value = "身份证号",order = 1) private String idCard; - @ColumnWidth(5) + @ColumnWidth(10) @ExcelProperty(value = "性别",order = 1) private String gender; @@ -52,11 +52,11 @@ public class IcBirthRecordExcel { @ExcelProperty(value = "出生地",order = 1) private String birthplace; - @ColumnWidth(20) + @ColumnWidth(30) @ExcelProperty(value = "出生人的父/母姓名",order = 1) private String parentName; - @ColumnWidth(5) + @ColumnWidth(10) @ExcelProperty(value = "胎次",order = 1) private Integer count; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java index c3a05207c8..bf69082e73 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java @@ -144,7 +144,7 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 15:31:02 +0800 Subject: [PATCH 045/102] change --- .../service/impl/IcUserTransferRecordServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java index 904b4eccff..fe0165a261 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java @@ -343,8 +343,8 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 15:47:42 +0800 Subject: [PATCH 046/102] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=B8=80=E6=88=BF?= =?UTF-8?q?=E4=B8=80=E6=A1=A3=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/enums/GenderEnum.java | 2 +- .../feign/EpmetBaseRequestInterceptor.java | 4 +- .../dto/result/HouseMemberResultDTO.java | 38 ++++++----- .../com/epmet/controller/HouseController.java | 36 ++++++---- .../java/com/epmet/service/HouseService.java | 5 +- .../epmet/service/impl/HouseServiceImpl.java | 68 +++++++++++++------ .../src/main/resources/mapper/IcHouseDao.xml | 9 +++ .../dto/form/IcFormOptionsQueryFormDTO.java | 16 +++-- .../IcFormItemOptionsController.java | 13 ++-- .../service/IcFormItemOptionsService.java | 7 +- .../impl/IcFormItemOptionsServiceImpl.java | 15 ++-- .../dto/result/HouseIcResiUserResultDTO.java | 6 ++ .../service/impl/IcResiUserServiceImpl.java | 67 +++++++++++++++++- .../service/impl/VolunteerServiceImpl.java | 2 +- .../main/resources/mapper/IcResiUserDao.xml | 31 +++++++++ 15 files changed, 241 insertions(+), 78 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.java index 5604377ed5..0ebbe0c3e3 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.java @@ -19,7 +19,7 @@ public enum GenderEnum { public static String getName(String code) { GenderEnum[] genderEnums = values(); for (GenderEnum genderEnum : genderEnums) { - if (genderEnum.getCode() == code) { + if (genderEnum.getCode().equals(code)) { return genderEnum.getName(); } } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java index 2cfa8ea3ad..f7eb3a778d 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java @@ -25,7 +25,7 @@ public class EpmetBaseRequestInterceptor implements RequestInterceptor { // Map requestHeaders = getHeadersFromRequest(); - log.info("EpmetBaseRequestInterceptor#apply#inheritableAdditionalHeaders:" + requestHeaders); + log.debug("EpmetBaseRequestInterceptor#apply#inheritableAdditionalHeaders:" + requestHeaders); if (requestHeaders != null && requestHeaders.size() > 0) { for (Map.Entry kv : requestHeaders.entrySet()) { @@ -59,4 +59,4 @@ public class EpmetBaseRequestInterceptor implements RequestInterceptor { return headers; } -} \ No newline at end of file +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java index cdf2e7855f..66bfdfa4ad 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java @@ -2,6 +2,7 @@ package com.epmet.dto.result; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; import java.io.Serializable; @@ -17,7 +18,8 @@ import java.io.Serializable; public class HouseMemberResultDTO implements Serializable { private static final long serialVersionUID = 1L; - @ExcelProperty(value = {"序号","序号"},index = 0) + @ColumnWidth(value = 7) + @ExcelProperty(value = "序号",index = 0) private Integer num; @ExcelProperty(value = {"房屋信息","所属组织"},index = 1) @@ -85,103 +87,103 @@ public class HouseMemberResultDTO implements Serializable { /** * 姓名 */ - @ExcelProperty(value = {"实际居住人息","姓名"},index = 13) + @ExcelProperty(value = {"实际居住人信息","姓名"},index = 13) private String name; /** * 性别 */ - @ExcelProperty(value = {"实际居住人息","性别"},index = 14) + @ExcelProperty(value = {"实际居住人信息","性别"},index = 14) private String gender; /** * 手机号 */ - @ExcelProperty(value = {"实际居住人息","手机号"},index = 15) + @ExcelProperty(value = {"实际居住人信息","手机号"},index = 15) private String mobile; /** * 身份证号 */ - @ExcelProperty(value = {"实际居住人息","身份证号"},index = 16) + @ExcelProperty(value = {"实际居住人信息","身份证号"},index = 16) private String idCard; /** * 出生日期 */ - @ExcelProperty(value = {"实际居住人息","出生日期"},index = 17) + @ExcelProperty(value = {"实际居住人信息","出生日期"},index = 17) private String birthday; /** * 户籍所在地 */ - @ExcelProperty(value = {"实际居住人息","户籍所在地"},index = 18) + @ExcelProperty(value = {"实际居住人信息","户籍所在地"},index = 18) private String hjszd; /** * 与户主关系【字典表】 */ - @ExcelProperty(value = {"实际居住人息","与户主关系"},index = 19) + @ExcelProperty(value = {"实际居住人信息","与户主关系"},index = 19) private String yhzgx; /** * 是否党员 */ - @ExcelProperty(value = {"实际居住人息","是否党员"},index = 20) + @ExcelProperty(value = {"实际居住人信息","是否党员"},index = 20) private String isParty; /** * 是否租户 */ - @ExcelProperty(value = {"实际居住人息","是否租户"},index = 21) + @ExcelProperty(value = {"实际居住人信息","是否租户"},index = 21) private String isTenant; /** * 是否流动人口 */ - @ExcelProperty(value = {"实际居住人息","是否流动人口"},index = 22) + @ExcelProperty(value = {"实际居住人信息","是否流动人口"},index = 22) private String isFloating; /** * 工作单位 */ - @ExcelProperty(value = {"实际居住人息","工作单位"},index = 23) + @ExcelProperty(value = {"实际居住人信息","工作单位"},index = 23) private String gzdw; /** * 民族【字典表】 */ - @ExcelProperty(value = {"实际居住人息","民族"},index = 24) + @ExcelProperty(value = {"实际居住人信息","民族"},index = 24) private String mz; /** * 籍贯 */ - @ExcelProperty(value = {"实际居住人息","籍贯"},index = 25) + @ExcelProperty(value = {"实际居住人信息","籍贯"},index = 25) private String jg; /** * 婚姻状况【字典表】 */ - @ExcelProperty(value = {"实际居住人息","婚姻状况"},index = 26) + @ExcelProperty(value = {"实际居住人信息","婚姻状况"},index = 26) private String hyzk; /** * 文化程度【字典表】 */ - @ExcelProperty(value = {"实际居住人息","文化程度"},index = 27) + @ExcelProperty(value = {"实际居住人信息","文化程度"},index = 27) private String culture; /** * 宗教信仰 */ - @ExcelProperty(value = {"实际居住人息","宗教信仰"},index = 28) + @ExcelProperty(value = {"实际居住人信息","宗教信仰"},index = 28) private String faith; /** * 备注 */ - @ExcelProperty(value = {"实际居住人息","备注"},index = 29) + @ExcelProperty(value = {"实际居住人信息","备注"},index = 29) private String remarks; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 233aec7c13..1a5fcdb3fb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -47,11 +47,14 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.HouseService; import com.epmet.util.ExcelPoiUtils; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.IndexedColors; import org.apache.poi.ss.usermodel.VerticalAlignment; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -62,6 +65,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Set; +import java.util.concurrent.TimeUnit; /** @@ -343,11 +347,6 @@ public class HouseController implements ResultDataResolver { ExcelWriter excelWriter = null; try { - excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("一户一档信息.xlsx", response), HouseMemberResultDTO.class) - .registerWriteHandler(new FreezeAndFilter()) - .build(); - int[] mergeRowArr = new int[]{0,1,2,3,4,5,6,7,8,9,10,11,12}; - // 头的策略 WriteCellStyle headWriteCellStyle = new WriteCellStyle(); // 背景设置为红色 @@ -355,21 +354,32 @@ public class HouseController implements ResultDataResolver { WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); + + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("一户一档信息.xlsx", response)) + .registerWriteHandler(horizontalCellStyleStrategy) + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + .build(); + int[] mergeRowArr = new int[]{0,1,2,3,4,5,6,7,8,9,10,11,12}; + FreezeAndFilter writeHandler = new FreezeAndFilter(); writeHandler.rowSplit = 2; ExcelFillCellMergeStrategy mergeStrategy = new ExcelFillCellMergeStrategy(2,mergeRowArr,false); - WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(mergeStrategy) - .registerWriteHandler(horizontalCellStyleStrategy) - .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1") + .head(HouseMemberResultDTO.class) + .registerWriteHandler(mergeStrategy) .registerWriteHandler(writeHandler) .build(); PageData dataList = null; + Cache haveSearchCache = CacheBuilder.newBuilder().maximumSize(NumConstant.ONE_HUNDRED).expireAfterWrite(NumConstant.THIRTY, TimeUnit.MINUTES).build(); do { - dataList = houseService.getHouseUser(tokenDto,formDTO); - System.out.println("====:"+JSON.toJSONString(dataList)); + dataList = houseService.getHouseUser(tokenDto,formDTO,haveSearchCache); + + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); excelWriter.write(dataList.getList(), writeSheet); - formDTO.setPageSize(formDTO.getPageSize()+1); - }while (dataList != null && dataList.getTotal() == formDTO.getPageSize()); + if (CollectionUtils.isEmpty(dataList.getList())){ + break; + } + }while (dataList.getTotal() == formDTO.getPageSize()); //获取导出配置 } catch (EpmetException e) { @@ -380,7 +390,7 @@ public class HouseController implements ResultDataResolver { Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg()); printWriter.write(JSON.toJSONString(result)); printWriter.close(); - }finally { + } finally { if (excelWriter != null){ excelWriter.finish(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index 48d88c38f3..39d3ec1b24 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -22,6 +22,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.google.common.cache.Cache; import javax.servlet.http.HttpServletResponse; import java.io.InputStream; @@ -36,6 +37,7 @@ import java.util.Set; */ public interface HouseService { + void addHouse(String customerId, IcHouseAddFormDTO formDTO); @@ -100,7 +102,8 @@ public interface HouseService { * desc:条件获取房和家庭成员 * @param tokenDto * @param formDTO + * @param haveSearchCache * @return */ - PageData getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO); + PageData getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO, Cache haveSearchCache); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 25862ead97..c4bd04db15 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelReader; import com.alibaba.excel.read.metadata.ReadSheet; +import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -175,14 +176,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { pids = getPids(formDTO.getAgencyId()); } formDTO.setPids(pids); - PageInfo pageInfo = null; - if (formDTO.getIsPage()){ - pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()) + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()) .doSelectPageInfo(() -> icHouseDao.searchHouseByPage(formDTO)); - }else{ - List resultDTOS = icHouseDao.searchHouseByPage(formDTO); - pageInfo = new PageInfo<>(resultDTOS,resultDTOS.size()); - } + List records = pageInfo.getList(); records.forEach(item->{ @@ -214,10 +210,17 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { public void exportBuildinginfo(IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception { //如果类型是house 查房屋 //导出房屋 - PageData icHouseExcels = getHouseList(formDTO); + List list = new ArrayList<>(); + do { + PageData icHouseExcels = getHouseList(formDTO); + if (CollectionUtils.isEmpty(icHouseExcels.getList())){ + break; + } + list.addAll(icHouseExcels.getList()); + }while (list.size() == formDTO.getPageSize()); TemplateExportParams templatePath = new TemplateExportParams("excel/house_export.xlsx"); Map map = new HashMap<>(); - map.put("maplist",icHouseExcels.getList()); + map.put("maplist", list); ExcelPoiUtils.exportExcel(templatePath ,map,"房屋信息录入表",response); } @@ -474,14 +477,15 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { icBuildingService.update(icBuildingDTO); } } - Cache exportNumCacheMap = CacheBuilder.newBuilder().build(); + Cache> memberMap = CacheBuilder.newBuilder().expireAfterAccess(1, TimeUnit.SECONDS).build(); @Override - public PageData getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO) { + public PageData getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO, Cache haveSearchCache) { RentTenantDataFormDTO resiParam = new RentTenantDataFormDTO(); resiParam.setCustomerId(tokenDto.getCustomerId()); resiParam.setAgencyId(formDTO.getAgencyId()); resiParam.setGridId(formDTO.getGridId()); resiParam.setPageSize(NumConstant.ONE_THOUSAND); + resiParam.setIsPage(false); //查询级别 默认按照小区去查 int searchLevel = 0; @@ -502,8 +506,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { PageData result = new PageData<>(resultList,houseData.getList().size()); int finalSearchLevel = searchLevel; AtomicInteger num = new AtomicInteger((formDTO.getPageNo()-1) * formDTO.getPageSize()); - Cache> memberMap = CacheBuilder.newBuilder().expireAfterAccess(1, TimeUnit.SECONDS).build(); - resultDTOS.parallelStream().forEach(o ->{ + + resultDTOS.stream().forEach(o ->{ + resiParam.setNeighborHoodId(o.getNeighborHoodId()); if (finalSearchLevel == 1){ resiParam.setBuildingId(o.getBuildingId()); @@ -511,12 +516,19 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { if (finalSearchLevel == 2){ resiParam.setHouseId(o.getHouseId()); } - getHouseMembers(resiParam, memberMap); + this.getHouseMembers(resiParam, memberMap,haveSearchCache); List members = memberMap.getIfPresent(o.getHouseId()); - if (members == null){ + + int n = num.incrementAndGet(); + + //没有住户 则直接写房屋 + if (CollectionUtils.isEmpty(members)){ + HouseMemberResultDTO resultDTO = ConvertUtils.sourceToTarget(o, HouseMemberResultDTO.class); + resultDTO.setNum(n); + resultList.add(resultDTO); return; } - int n = num.incrementAndGet(); + //有住户 房屋信息是重复的 members.forEach(m->{ HouseMemberResultDTO resultDTO = ConvertUtils.sourceToTarget(m, HouseMemberResultDTO.class); resultDTO.setNum(n); @@ -538,20 +550,36 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { return result; } - public void getHouseMembers(RentTenantDataFormDTO resiParam, Cache> memberMap) { + /** + * desc:分情况获取 房屋内居民 + * @param resiParam + * @param memberMap + * @param haveSearchCache + */ + public void getHouseMembers(RentTenantDataFormDTO resiParam, Cache> memberMap, Cache haveSearchCache) { + String searchKey = resiParam.getHouseId()+resiParam.getBuildingId()+resiParam.getNeighborHoodId()+resiParam.getAgencyId(); + Boolean haveSearch = haveSearchCache.getIfPresent(searchKey); + if (haveSearch!= null && haveSearch){ + return; + } + haveSearchCache.put(searchKey,true); List memberListTemp = null; + resiParam.setPageNo(NumConstant.ONE); do { Result> memberResult = epmetUserOpenFeignClient.getHouseMemberList(resiParam); + log.debug("=======查询居民:"+ resiParam.getPageNo()+",size:"+resiParam.getPageSize()+",result:"+memberResult.getData().size()); if (!memberResult.success()) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "调用user服务失败"); } memberListTemp = memberResult.getData(); + log.debug("=======查询居民结果:"+ JSON.toJSONString(memberListTemp)); if (CollectionUtils.isEmpty(memberListTemp)) { - continue; + break; } - resiParam.setPageSize(resiParam.getPageSize()+1); + resiParam.setPageNo(resiParam.getPageNo()+1); memberListTemp.parallelStream().forEach(h -> memberMap.put(h.getHomeId(), h.getHouseMemberList())); - } while (memberListTemp != null && memberListTemp.size() == resiParam.getPageSize()); + + } while (memberListTemp.size() == resiParam.getPageSize()); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 14ad186898..a32acff97f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -131,12 +131,21 @@ AND c.GRID_ID = #{id} + + AND c.GRID_ID = #{gridId} + AND c.id = #{id} + + AND a.NEIGHBOR_HOOD_ID = #{neighborHoodId} + AND b.id = #{id} + + AND a.BUILDING_ID = #{buildingId} + AND a.RENT_FLAG = #{rentFlag} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormOptionsQueryFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormOptionsQueryFormDTO.java index f7fa5bb1da..8ec7ed10c2 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormOptionsQueryFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormOptionsQueryFormDTO.java @@ -12,16 +12,24 @@ import javax.validation.constraints.NotBlank; */ @Data public class IcFormOptionsQueryFormDTO { - + public interface QueryByLabelAndCustomerIdForForm {} - + @NotBlank(message = "客户ID必填", groups = { QueryByLabelAndCustomerIdForForm.class }) private String customerId; @NotBlank(message = "FormCode必填", groups = { QueryByLabelAndCustomerIdForForm.class }) private String formCode; + /** + * 列名单纯的列名，如果是扩展字段则 需要给columnNum赋值 + */ @NotBlank(message = "OptionsLabel必填", groups = { QueryByLabelAndCustomerIdForForm.class }) - private String label; - + private String columnName; + + /** + * 列名数字 + */ + private Integer columnNum; + } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java index ed22604272..d794955eef 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java @@ -31,12 +31,10 @@ import com.epmet.excel.IcFormItemOptionsExcel; import com.epmet.service.IcFormItemOptionsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.tags.form.InputTag; import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; -import java.util.function.IntUnaryOperator; /** @@ -48,7 +46,7 @@ import java.util.function.IntUnaryOperator; @RestController @RequestMapping("icformitemoptions") public class IcFormItemOptionsController { - + @Autowired private IcFormItemOptionsService icFormItemOptionsService; @@ -115,11 +113,12 @@ public class IcFormItemOptionsController { ValidatorUtils.validateEntity(input, IcFormOptionsQueryFormDTO.QueryByLabelAndCustomerIdForForm.class); String customerId = input.getCustomerId(); String formCode = input.getFormCode(); - String label = input.getLabel(); + String columnName = input.getColumnName(); + Integer columnNum = input.getColumnNum(); - List r = icFormItemOptionsService.getOptionsByItemConditions(customerId, formCode, label); + List r = icFormItemOptionsService.getOptionsByItemConditions(customerId, formCode, columnName, columnNum); return new Result>().ok(r); } - -} \ No newline at end of file + +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java index 7423f85289..8dd3193e6d 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java @@ -105,8 +105,9 @@ public interface IcFormItemOptionsService extends BaseService getOptionsByItemConditions(String customerId, String formCode, String label); -} \ No newline at end of file + List getOptionsByItemConditions(String customerId, String formCode, String columnName, Integer columnNum); +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java index 970845cbee..f176182cf9 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java @@ -53,7 +53,7 @@ public class IcFormItemOptionsServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -118,19 +118,20 @@ public class IcFormItemOptionsServiceImpl extends BaseServiceImpl getOptionsByItemConditions(String customerId, String formCode, String label) { + public List getOptionsByItemConditions(String customerId, String formCode, String columnName, Integer columnNum) { // 查询item LambdaQueryWrapper formItemQuery = new LambdaQueryWrapper<>(); - formItemQuery.eq(IcFormItemEntity::getCustomerId, customerId); - formItemQuery.eq(IcFormItemEntity::getFormCode, formCode); - formItemQuery.eq(IcFormItemEntity::getLabel, label); + formItemQuery.eq(IcFormItemEntity::getCustomerId, customerId) + .eq(IcFormItemEntity::getFormCode, formCode) + .eq(IcFormItemEntity::getColumnName, columnName) + .eq(columnNum != null,IcFormItemEntity::getColumnNum,columnNum); IcFormItemEntity item = icFormItemDao.selectOne(formItemQuery); if (item == null) { return new ArrayList<>(); } - + // 通过item查询options LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcFormItemOptionsEntity::getItemId, item.getId()); @@ -143,4 +144,4 @@ public class IcFormItemOptionsServiceImpl extends BaseServiceImpl houseMemberList; + /** + * 屋内的居民 + */ + private LinkedHashMap houseMemberList2; + @Data public static class HouseMemberResultDTO implements Serializable { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 4a40748907..8f169aa7e5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -1486,7 +1486,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl categorieDtos = getResultDataOrThrowsException(operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsQuery), ServiceConstant.OPER_CUSTOMIZE_SERVER, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), @@ -1819,7 +1819,72 @@ public class IcResiUserServiceImpl extends BaseServiceImpl listPage = PageHelper .startPage(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getIsPage()) .doSelectPage(()->baseDao.getResiUser(formDTO)); + //Result> relationshipResult = epmetAdminOpenFeignClient.getRelationshipOption(); + //Result> educationResult = epmetAdminOpenFeignClient.getEducationOption(); + //Result> nationResult = epmetAdminOpenFeignClient.getNationOption(); + List dictTypeList = Arrays.asList(DictTypeEnum.EDUCATION.getCode(), DictTypeEnum.RELATIONSHIP.getCode(), DictTypeEnum.NATION.getCode()); + Map> dictResult = new HashMap<>(); + dictTypeList.forEach(dict->{ + Result> mapResult = epmetAdminOpenFeignClient.dictMap(dict); + if (mapResult!=null && mapResult.success()){ + dictResult.put(dict,mapResult.getData()); + } + }); + + Map hyzkMap = getOptionMap(formDTO.getCustomerId(),"HYZK"); + + listPage.getResult().forEach(e->{ + e.getHouseMemberList().parallelStream().forEach(o->{ + if (StringUtils.isNotBlank(o.getIsParty())){ + o.setIsParty(NumConstant.ZERO_STR.equals(o.getIsParty())?StrConstant.NO:StrConstant.YES); + } + if (StringUtils.isNotBlank(o.getGender())){ + o.setGender(GenderEnum.getName(o.getGender())); + } + if (StringUtils.isNotBlank(o.getIsTenant())){ + o.setIsTenant(NumConstant.ZERO_STR.equals(o.getIsTenant())?StrConstant.NO:StrConstant.YES); + } + if (StringUtils.isNotBlank(o.getIsFloating())){ + o.setIsFloating(NumConstant.ZERO_STR.equals(o.getIsFloating())?StrConstant.NO:StrConstant.YES); + } + Map mzMap = dictResult.get(DictTypeEnum.NATION.getCode()); + Map whcdMap = dictResult.get(DictTypeEnum.EDUCATION.getCode()); + Map yhzgxMap = dictResult.get(DictTypeEnum.RELATIONSHIP.getCode()); + if (StringUtils.isNotBlank(o.getMz())) { + o.setMz(mzMap.get(o.getMz())); + } + if (StringUtils.isNotBlank(o.getCulture())) { + o.setCulture(whcdMap.get(o.getCulture())); + } + if (StringUtils.isNotBlank(o.getYhzgx())) { + o.setYhzgx(yhzgxMap.get(o.getYhzgx())); + } + if (StringUtils.isNotBlank(o.getHyzk())) { + o.setHyzk(hyzkMap.get(o.getHyzk())); + } + + }); + }); return listPage.getResult(); } + /** + * desc:根据字段值获取 options + * @param customerId + * @param columnName + * @return + */ + private Map getOptionMap(String customerId,String columnName) { + IcFormOptionsQueryFormDTO optionsForm = new IcFormOptionsQueryFormDTO(); + optionsForm.setCustomerId(customerId); + optionsForm.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode()); + optionsForm.setColumnName(columnName); + Result> listResult = operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsForm); + if (!listResult.success()){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取item失败,"+listResult.getInternalMsg()); + } + return listResult.getData().stream() + .collect(Collectors.toMap(IcFormItemOptionsDTO::getOptionValue, IcFormItemOptionsDTO::getOptionLabel, (o1, o2) -> o1)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java index 1272b57629..99a4817aa7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java @@ -69,7 +69,7 @@ public class VolunteerServiceImpl implements VolunteerService, ResultDataResolve IcFormOptionsQueryFormDTO optionsForm = new IcFormOptionsQueryFormDTO(); optionsForm.setCustomerId(customerId); optionsForm.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode()); - optionsForm.setLabel("志愿者类别"); + optionsForm.setColumnName("VOLUNTEER_CATEGORY"); String errorMsg = "【志愿者分布】查询志愿者图例失败"; List options = getResultDataOrThrowsException(operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsForm), diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 4378ed3c3e..4e35245c8d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -32,6 +32,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into ${tableName} ( From 21ceea94d18f3af3a302e78a5a2f2edbaf78f21d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 11 May 2022 16:12:56 +0800 Subject: [PATCH 047/102] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcMoveInRecordServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java index 7dfba6301d..92903c5bc4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java @@ -172,7 +172,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 16:13:55 +0800 Subject: [PATCH 048/102] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java index 92903c5bc4..59dfc73bb2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java @@ -171,7 +171,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 16:20:13 +0800 Subject: [PATCH 049/102] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcMoveInRecordDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml index a4447ed6e5..663aa09060 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml @@ -68,6 +68,7 @@ AND id = #{moveInId} + ORDER BY created_time DESC \ No newline at end of file From d283f41c0761ef29fe0e276ade7805ce557eac97 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 11 May 2022 16:21:00 +0800 Subject: [PATCH 050/102] =?UTF-8?q?=E6=94=B9=E4=B8=AA=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/HouseController.java | 3 ++- .../main/java/com/epmet/service/impl/HouseServiceImpl.java | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 1a5fcdb3fb..99404a5d89 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -361,6 +361,7 @@ public class HouseController implements ResultDataResolver { .build(); int[] mergeRowArr = new int[]{0,1,2,3,4,5,6,7,8,9,10,11,12}; + //冻结表头 2行 FreezeAndFilter writeHandler = new FreezeAndFilter(); writeHandler.rowSplit = 2; ExcelFillCellMergeStrategy mergeStrategy = new ExcelFillCellMergeStrategy(2,mergeRowArr,false); @@ -381,7 +382,7 @@ public class HouseController implements ResultDataResolver { } }while (dataList.getTotal() == formDTO.getPageSize()); //获取导出配置 - + haveSearchCache.invalidateAll(); } catch (EpmetException e) { response.reset(); response.setCharacterEncoding("UTF-8"); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index c4bd04db15..7cacfb2513 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -477,7 +477,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { icBuildingService.update(icBuildingDTO); } } - Cache> memberMap = CacheBuilder.newBuilder().expireAfterAccess(1, TimeUnit.SECONDS).build(); + Cache> memberCacheMap = CacheBuilder.newBuilder().expireAfterAccess(10, TimeUnit.SECONDS).expireAfterWrite(30,TimeUnit.MINUTES).build(); @Override public PageData getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO, Cache haveSearchCache) { RentTenantDataFormDTO resiParam = new RentTenantDataFormDTO(); @@ -516,9 +516,10 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { if (finalSearchLevel == 2){ resiParam.setHouseId(o.getHouseId()); } - this.getHouseMembers(resiParam, memberMap,haveSearchCache); - List members = memberMap.getIfPresent(o.getHouseId()); + this.getHouseMembers(resiParam, memberCacheMap,haveSearchCache); + List members = memberCacheMap.getIfPresent(o.getHouseId()); + //序号 一个houseId为一个序号 int n = num.incrementAndGet(); //没有住户 则直接写房屋 From 6fd50f46f32652ebfafe1b29900119ae2f639c0c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 11 May 2022 16:45:10 +0800 Subject: [PATCH 051/102] =?UTF-8?q?=E5=87=BA=E7=94=9F=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcBirthRecordDTO.java | 9 ++ .../epmet/dto/form/BirthRecordUpdateDTO.java | 30 ++++++ .../controller/IcBirthRecordController.java | 3 +- .../epmet/service/IcBirthRecordService.java | 3 +- .../impl/IcBirthRecordServiceImpl.java | 96 +------------------ 5 files changed, 46 insertions(+), 95 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordUpdateDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java index 40932ba693..9215512142 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java @@ -1,8 +1,10 @@ package com.epmet.dto; +import com.epmet.commons.tools.validator.group.AddGroup; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Date; @@ -41,33 +43,39 @@ public class IcBirthRecordDTO implements Serializable { /** * 网格ID */ + @NotBlank(message = "所属网格不能为空", groups = {AddGroup.class}) private String gridId; private String gridName; /** * 所属小区ID */ + @NotBlank(message = "所属小区不能为空", groups = {AddGroup.class}) private String villageId; /** * 所属楼宇Id */ + @NotBlank(message = "所属楼宇不能为空", groups = {AddGroup.class}) private String buildId; /** * 单元id */ + @NotBlank(message = "所属单元不能为空", groups = {AddGroup.class}) private String unitId; /** * 所属家庭Id */ + @NotBlank(message = "所属家庭不能为空", groups = {AddGroup.class}) private String homeId; private String home; /** * 姓名 */ + @NotBlank(message = "姓名不能为空", groups = {AddGroup.class}) private String name; /** @@ -83,6 +91,7 @@ public class IcBirthRecordDTO implements Serializable { /** * 身份证号 */ + @NotBlank(message = "身份证号不能为空", groups = {AddGroup.class}) private String idCard; /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordUpdateDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordUpdateDTO.java new file mode 100644 index 0000000000..5756e76bac --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordUpdateDTO.java @@ -0,0 +1,30 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.UpdateGroup; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/5/11 16:23 + */ +@NoArgsConstructor +@Data +public class BirthRecordUpdateDTO implements Serializable { + + private static final long serialVersionUID = -1847965724862077861L; + @NotBlank(message = "id不能为空", groups = {UpdateGroup.class}) + private String id; + @NotBlank(message = "出生地不能为空", groups = {UpdateGroup.class}) + private String birthplace; + private String father; + private String mother; + private Integer count; + private String reportDate; + private String householderName; + private String householderRelation; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java index 252a0db5b8..57e385d343 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java @@ -19,6 +19,7 @@ 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.form.BirthRecordFormDTO; +import com.epmet.dto.form.BirthRecordUpdateDTO; import com.epmet.excel.IcBirthRecordExcel; import com.epmet.service.IcBirthRecordService; import lombok.extern.slf4j.Slf4j; @@ -70,7 +71,7 @@ public class IcBirthRecordController { @NoRepeatSubmit @PostMapping("update") - public Result update(@LoginUser TokenDto tokenDto, @RequestBody IcBirthRecordDTO dto){ + public Result update(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordUpdateDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); icBirthRecordService.update(tokenDto, dto); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcBirthRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcBirthRecordService.java index 00ec474c00..3c4ea335d0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcBirthRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcBirthRecordService.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcBirthRecordDTO; import com.epmet.dto.form.BirthRecordFormDTO; +import com.epmet.dto.form.BirthRecordUpdateDTO; import com.epmet.entity.IcBirthRecordEntity; /** @@ -53,7 +54,7 @@ public interface IcBirthRecordService extends BaseService { * @author generator * @date 2022-05-10 */ - void update(TokenDto tokenDto, IcBirthRecordDTO dto); + void update(TokenDto tokenDto, BirthRecordUpdateDTO dto); /** * 批量删除 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java index bf69082e73..800f4b7829 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java @@ -19,6 +19,7 @@ import com.epmet.dao.IcResiUserDao; import com.epmet.dto.ChangeWelfareDTO; import com.epmet.dto.IcBirthRecordDTO; import com.epmet.dto.form.BirthRecordFormDTO; +import com.epmet.dto.form.BirthRecordUpdateDTO; import com.epmet.dto.form.IcResiUserTransferFormDTO; import com.epmet.dto.result.AllGridsByUserIdResultDTO; import com.epmet.dto.result.HouseInfoDTO; @@ -146,7 +147,7 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 16:47:05 +0800 Subject: [PATCH 052/102] =?UTF-8?q?=E5=87=BA=E7=94=9F=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcBirthRecordController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java index 57e385d343..177bbc42be 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java @@ -4,6 +4,7 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; @@ -47,6 +48,7 @@ public class IcBirthRecordController { private IcBirthRecordService icBirthRecordService; @RequestMapping("page") + @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) public Result> page(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); From 74dc46184d41fad6c16bb390fd84c5eabd439b60 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 11 May 2022 17:12:57 +0800 Subject: [PATCH 053/102] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/HouseIcResiUserResultDTO.java | 6 ---- .../epmet/feign/EpmetUserOpenFeignClient.java | 2 +- .../controller/IcResiUserController.java | 6 ++-- .../java/com/epmet/dao/IcResiUserDao.java | 2 +- .../com/epmet/service/IcResiUserService.java | 2 +- .../service/impl/IcResiUserServiceImpl.java | 12 +++---- .../main/resources/mapper/IcResiUserDao.xml | 35 ++----------------- 7 files changed, 15 insertions(+), 50 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseIcResiUserResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseIcResiUserResultDTO.java index b1708cbd3b..d640951290 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseIcResiUserResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseIcResiUserResultDTO.java @@ -20,7 +20,6 @@ package com.epmet.dto.result; import lombok.Data; import java.io.Serializable; -import java.util.LinkedHashMap; import java.util.List; @@ -76,11 +75,6 @@ public class HouseIcResiUserResultDTO implements Serializable { */ private List houseMemberList; - /** - * 屋内的居民 - */ - private LinkedHashMap houseMemberList2; - @Data public static class HouseMemberResultDTO implements Serializable { diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 1d8a6f3c5a..f97eb6f53d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -746,6 +746,6 @@ public interface EpmetUserOpenFeignClient { * @param formDTO * @return */ - @PostMapping("/epmetuser/icresiuser/getHouseMemberList") + @PostMapping("/epmetuser/icresiuser/getResiUserGroupHomeId") Result> getHouseMemberList(@RequestBody RentTenantDataFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 121dd8c24a..8b9cc15db3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1001,8 +1001,8 @@ public class IcResiUserController implements ResultDataResolver { List r = icResiUserService.listHomeUserBrief(houseId, customerId); return new Result().ok(r); } - @PostMapping("getHouseMemberList") - Result> getHouseMemberList(@RequestBody RentTenantDataFormDTO formDTO) { - return new Result().ok(icResiUserService.getHouseMemberList(formDTO)); + @PostMapping("getResiUserGroupHomeId") + Result> getResiUserGroupHomeId(@RequestBody RentTenantDataFormDTO formDTO) { + return new Result().ok(icResiUserService.getResiUserGroupHomeId(formDTO)); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index 8edf4cd3af..b978922d52 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -308,5 +308,5 @@ public interface IcResiUserDao extends BaseDao { * @param formDTO * @return */ - List getResiUser(RentTenantDataFormDTO formDTO); + List getResiUserGroupHomeId(RentTenantDataFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 6bbcdf1b8b..d633c0b7f9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -324,5 +324,5 @@ public interface IcResiUserService extends BaseService { * @param formDTO * @return */ - List getHouseMemberList(RentTenantDataFormDTO formDTO); + List getResiUserGroupHomeId(RentTenantDataFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 8f169aa7e5..f7af0b6815 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -1802,12 +1802,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getHouseMemberList(RentTenantDataFormDTO formDTO) { + public List getResiUserGroupHomeId(RentTenantDataFormDTO formDTO) { //如果是组织 且非顶级组织 则利用pids 查询 本级及下级 if (StringUtils.isNotBlank(formDTO.getAgencyId())){ AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getAgencyId()); if (agencyInfo == null){ - log.warn("getHouseMemberList agencyId:{} is not exist",formDTO.getAgencyId()); + log.warn("getResiUserGroupHomeId agencyId:{} is not exist",formDTO.getAgencyId()); return null; } if (!NumConstant.ZERO_STR.equals(agencyInfo.getPid())) { @@ -1818,10 +1818,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl listPage = PageHelper .startPage(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getIsPage()) - .doSelectPage(()->baseDao.getResiUser(formDTO)); - //Result> relationshipResult = epmetAdminOpenFeignClient.getRelationshipOption(); - //Result> educationResult = epmetAdminOpenFeignClient.getEducationOption(); - //Result> nationResult = epmetAdminOpenFeignClient.getNationOption(); + .doSelectPage(()->baseDao.getResiUserGroupHomeId(formDTO)); + List dictTypeList = Arrays.asList(DictTypeEnum.EDUCATION.getCode(), DictTypeEnum.RELATIONSHIP.getCode(), DictTypeEnum.NATION.getCode()); Map> dictResult = new HashMap<>(); dictTypeList.forEach(dict->{ @@ -1831,8 +1829,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl hyzkMap = getOptionMap(formDTO.getCustomerId(),"HYZK"); + //遍历数据 转换为中文 listPage.getResult().forEach(e->{ e.getHouseMemberList().parallelStream().forEach(o->{ if (StringUtils.isNotBlank(o.getIsParty())){ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 4e35245c8d..bf66123f01 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -33,36 +33,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into ${tableName} ( @@ -971,9 +941,10 @@ GROUP BY is_floating - SELECT - * + HOME_ID, + ID,NAME,GENDER,MOBILE,ID_CARD,BIRTHDAY,HJSZD,YHZGX,IS_PARTY,IS_TENANT,IS_FLOATING,GZDW,MZ,JG,HYZK,CULTURE,FAITH,REMARKS FROM ic_resi_user WHERE CUSTOMER_ID = #{customerId} From 3a8caddabc6477efb51fef91932489a9ba169843 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 11 May 2022 17:13:28 +0800 Subject: [PATCH 054/102] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E5=AD=97=E6=AE=B52?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/HouseIcResiUserResultDTO.java | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseIcResiUserResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseIcResiUserResultDTO.java index d640951290..4d509f4762 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseIcResiUserResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseIcResiUserResultDTO.java @@ -35,35 +35,35 @@ public class HouseIcResiUserResultDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 客户Id customer.id - */ - private String customerId; - - /** - * - */ - private String agencyId; - - /** - * 网格ID - */ - private String gridId; - - /** - * 所属小区ID - */ - private String villageId; - - /** - * 所属楼宇Id - */ - private String buildId; - - /** - * 单元id - */ - private String unitId; +// /** +// * 客户Id customer.id +// */ +// private String customerId; +// +// /** +// * +// */ +// private String agencyId; +// +// /** +// * 网格ID +// */ +// private String gridId; +// +// /** +// * 所属小区ID +// */ +// private String villageId; +// +// /** +// * 所属楼宇Id +// */ +// private String buildId; +// +// /** +// * 单元id +// */ +// private String unitId; /** * 所属家庭Id From 6b5527945a6661a441607c34902c1c48bfea40da Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 11 May 2022 17:22:24 +0800 Subject: [PATCH 055/102] =?UTF-8?q?=E5=90=88=E5=B9=B6=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/IcResiUserController.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index e23f183fa9..894dd8d006 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1001,9 +1001,6 @@ public class IcResiUserController implements ResultDataResolver { List r = icResiUserService.listHomeUserBrief(houseId, customerId); return new Result().ok(r); } - @PostMapping("getResiUserGroupHomeId") - Result> getResiUserGroupHomeId(@RequestBody RentTenantDataFormDTO formDTO) { - return new Result().ok(icResiUserService.getResiUserGroupHomeId(formDTO)); /** * 根据房屋id,查询居民信息表中-家庭信息-本人 的居民。如果有多个，返回最近一个 @@ -1031,8 +1028,13 @@ public class IcResiUserController implements ResultDataResolver { return new Result().ok(icResiUserService.checkUser(tokenDto.getCustomerId(), formDto.getIdCard(), formDto.getAgencyId())); } - @PostMapping("getHouseMemberList") - Result> getHouseMemberList(@RequestBody RentTenantDataFormDTO formDTO) { - return new Result().ok(icResiUserService.getHouseMemberList(formDTO)); + /** + * desc:条件获取房屋内的居民 按房屋分组 + * @param formDTO + * @return + */ + @PostMapping("getResiUserGroupHomeId") + Result> getResiUserGroupHomeId(@RequestBody RentTenantDataFormDTO formDTO) { + return new Result().ok(icResiUserService.getResiUserGroupHomeId(formDTO)); } } From f2ef904d6862a83204eaf09116e061b1c594d9f8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 11 May 2022 17:26:08 +0800 Subject: [PATCH 056/102] change --- .../epmet/service/impl/IcMoveInRecordServiceImpl.java | 2 ++ .../service/impl/IcUserTransferRecordServiceImpl.java | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java index 59dfc73bb2..504c022534 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java @@ -193,6 +193,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl getNewHouseInfo(IcResiUserTransferFormDTO formDTO) { Result result2 = new Result<>(); - if (IcResiUserConstant.OUT.equals(formDTO.getOrigin()) && "in".equals(formDTO.getType())) { - //迁出且类型为 迁出到本客户内的，才会查询新的房屋信息；迁出到其他的不查询 + if ((IcResiUserConstant.OUT.equals(formDTO.getOrigin()) || IcResiUserConstant.CHANGE.equals(formDTO.getOrigin())) + && "in".equals(formDTO.getType())) { + //迁出/变动且类型为 迁出到本客户内的，才会查询新的房屋信息；迁出到其他的不查询 IcResiUserOrgMsgFormDTO orgMsgFormDTO2 = new IcResiUserOrgMsgFormDTO(); orgMsgFormDTO2.setCustomerId(formDTO.getCustomerId()); orgMsgFormDTO2.setAgencyId(formDTO.getNewAgencyId()); From 6c9e59c77010a7541e47b4aaabb7a9a1fc061c64 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 11 May 2022 17:27:55 +0800 Subject: [PATCH 057/102] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/IcMoveInListResultDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java index 3c9e8ee5fa..bcc6d70f55 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java @@ -117,7 +117,7 @@ public class IcMoveInListResultDTO implements Serializable { /** * 迁入时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date inTime; /** From babe014d1bf3a21ea746f94be8fde771c75f85c1 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 11 May 2022 17:37:25 +0800 Subject: [PATCH 058/102] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?sql=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.45__move_and_birth.sql | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.45__move_and_birth.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.45__move_and_birth.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.45__move_and_birth.sql new file mode 100644 index 0000000000..e3dcc95e77 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.45__move_and_birth.sql @@ -0,0 +1,70 @@ +CREATE TABLE `ic_birth_record` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id customer.id', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织Id', + `PIDS` varchar(255) NOT NULL COMMENT '组织的pids', + `GRID_ID` varchar(64) NOT NULL COMMENT '网格ID', + `VILLAGE_ID` varchar(64) NOT NULL COMMENT '所属小区ID', + `BUILD_ID` varchar(64) NOT NULL COMMENT '所属楼宇Id', + `UNIT_ID` varchar(64) NOT NULL COMMENT '单元id', + `HOME_ID` varchar(64) NOT NULL COMMENT '所属家庭Id', + `NAME` varchar(64) NOT NULL COMMENT '姓名', + `MOBILE` varchar(15) DEFAULT NULL COMMENT '手机号', + `GENDER` char(2) DEFAULT NULL COMMENT '性别', + `ID_CARD` varchar(18) NOT NULL COMMENT '身份证号', + `BIRTHDAY` varchar(64) DEFAULT NULL COMMENT '出生日期', + `BIRTHPLACE` varchar(255) NOT NULL COMMENT '出生地', + `IS_WELFARE` char(1) DEFAULT NULL COMMENT '是否享受福利【否:0 是:1】', + `FATHER` varchar(64) DEFAULT NULL COMMENT '父亲姓名', + `MOTHER` varchar(64) DEFAULT NULL COMMENT '母亲姓名', + `COUNT` int(2) DEFAULT NULL COMMENT '胎次', + `REPORT_DATE` varchar(64) DEFAULT NULL COMMENT '申报日期', + `HOUSEHOLDER_NAME` varchar(64) DEFAULT NULL COMMENT '户主姓名', + `HOUSEHOLDER_RELATION` char(1) DEFAULT NULL COMMENT '与户主关系【字典表】', + `IS_CHECK` char(1) DEFAULT '0' COMMENT '是否勾选补充居民信息0否 1是', + `DEL_FLAG` int(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='出生管理'; + +-- ---------------------------- +-- Table structure for ic_move_in_record +-- ---------------------------- +CREATE TABLE `ic_move_in_record` ( + `ID` varchar(64) NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id customer.id', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织Id', + `PIDS` varchar(255) NOT NULL COMMENT '组织的pids', + `GRID_ID` varchar(64) NOT NULL COMMENT '网格ID', + `VILLAGE_ID` varchar(64) NOT NULL COMMENT '所属小区ID', + `BUILD_ID` varchar(64) NOT NULL COMMENT '所属楼宇Id', + `UNIT_ID` varchar(64) NOT NULL COMMENT '单元id', + `HOME_ID` varchar(64) NOT NULL COMMENT '所属家庭Id', + `NAME` varchar(64) NOT NULL COMMENT '姓名', + `IS_WELFARE` char(1) DEFAULT NULL COMMENT '是否享受福利【否:0 是:1】', + `IS_CHECK` char(1) DEFAULT '0' COMMENT '是否勾选补充居民信息0否 1是', + `MOBILE` varchar(11) DEFAULT NULL COMMENT '手机号', + `ID_CARD` varchar(18) NOT NULL COMMENT '身份证号', + `GENDER` char(2) DEFAULT NULL COMMENT '性别（1男2女0未知）', + `AGE` int(3) DEFAULT NULL COMMENT '年龄', + `IN_TIME` datetime NOT NULL COMMENT '迁入时间', + `IN_REASON` varchar(512) NOT NULL COMMENT '迁入原因', + `SOURCE_ADDRESS_CODE` varchar(32) DEFAULT NULL COMMENT '来源地区编码', + `SOURCE_ADDRESS_PATH_CODE` varchar(64) DEFAULT NULL COMMENT '来源地区编码全路径', + `SOURCE_ADDRESS` varchar(255) NOT NULL COMMENT '来源地区地址', + `ADDRESS` varchar(128) NOT NULL COMMENT '详细地址', + `MOVE_NUMBER` varchar(64) DEFAULT NULL COMMENT '迁移证号码', + `HOUSEHOLDER_NAME` varchar(64) DEFAULT NULL COMMENT '户主姓名', + `HOUSEHOLDER_RELATION` varchar(64) DEFAULT NULL COMMENT '与户主关系[字典表]', + `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='迁入管理记录'; From 4aff375dbc76649fdbd601d9ff02572c38ecae07 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 11 May 2022 17:39:11 +0800 Subject: [PATCH 059/102] =?UTF-8?q?=E6=8D=A2=E4=B8=8B=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcMoveInRecordServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java index 504c022534..30a66373c3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java @@ -191,26 +191,27 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 17:45:42 +0800 Subject: [PATCH 060/102] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/utils/ExcelUtils.java | 63 +++++++++++++++++++ .../com/epmet/dto/ChangeDeathExportDTO.java | 44 +++++++++++++ .../service/impl/ChangeDeathServiceImpl.java | 4 +- .../impl/ChangeRelocationServiceImpl.java | 2 +- 4 files changed, 110 insertions(+), 3 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathExportDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java index bd5c5597c0..3d6324f4fa 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java @@ -64,6 +64,36 @@ public class ExcelUtils { out.close(); } + /** + * Excel导出 + * + * @param response response + * @param fileName 文件名 + * @param list 数据List + * @param pojoClass 对象Class + */ + public static void exportExcelEpmet(HttpServletResponse response, String fileName, Collection list, + Class pojoClass) throws IOException { + if(StringUtils.isBlank(fileName)){ + //当前日期 + fileName = DateUtils.format(new Date()); + } + + ExportParams exportParams = new ExportParams(); + //设置导出的样式 + exportParams.setStyle(EasyPoiExcelExportStylerImpl.class); + //设置sheet名称 + exportParams.setSheetName("Sheet1"); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, pojoClass, list); + Sheet sheet1 = workbook.getSheetAt(0); + sheet1.setDefaultColumnWidth(50*256); + //sheet1.setDefaultRowHeight((short)(2*256)); + ServletOutputStream out = ExcelUtils.getOutputStreamForExcelEpmet(fileName,response); + workbook.write(out); + out.flush(); + out.close(); + } + /** * Excel导出，先sourceList转换成List，再导出 * @@ -84,6 +114,26 @@ public class ExcelUtils { exportExcel(response, fileName, targetList, targetClass); } + /** + * Excel导出，先sourceList转换成List，再导出 + * + * @param response response + * @param fileName 文件名 + * @param sourceList 原数据List + * @param targetClass 目标对象Class + */ + public static void exportEpmetExcel(HttpServletResponse response, String fileName, Collection sourceList, + Class targetClass) throws Exception { + List targetList = new ArrayList<>(sourceList.size()); + for(Object source : sourceList){ + Object target = targetClass.newInstance(); + BeanUtils.copyProperties(source, target); + targetList.add(target); + } + + exportExcelEpmet(response, fileName, targetList, targetClass); + } + public static ServletOutputStream getOutputStreamForExcel(String fileName, HttpServletResponse response) throws IOException { fileName = URLEncoder.encode(fileName, "UTF-8"); if (!fileName.endsWith(".xls") && !fileName.endsWith(".xlsx")){ @@ -97,6 +147,19 @@ public class ExcelUtils { return response.getOutputStream(); } + public static ServletOutputStream getOutputStreamForExcelEpmet(String fileName, HttpServletResponse response) throws IOException { + fileName = URLEncoder.encode(fileName, "UTF-8"); + if (!fileName.endsWith(".xls") && !fileName.endsWith(".xlsx")){ + fileName = fileName + ".xls"; + } + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf8"); + response.setHeader("Content-Disposition", "attachment;filename=" + fileName); + response.addHeader("Access-Control-Expose-Headers", "Content-disposition"); + + return response.getOutputStream(); + } + /** * desc:easypoi导出多个sheet * @param fileName diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathExportDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathExportDTO.java new file mode 100644 index 0000000000..f57b8fb2be --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathExportDTO.java @@ -0,0 +1,44 @@ +package com.epmet.dto; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 死亡名单表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-05 + */ +@Data +public class ChangeDeathExportDTO { + + + @Excel(name = "姓名") + private String name; + + @Excel(name = "身份证") + private String idCard; + + @Excel(name = "手机号") + private String mobile; + + @Excel(name = "性别",replace = { "男_1", "女_0"} ) + private String gender; + + @Excel(name = "类型",replace = { "房东_1", "租客_0"} ) + private String type; + + @Excel(name = "加入时间") + private String joinDate; + + @Excel(name = "加入原因") + private String joinReason; + + @Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss") + private Date createdTime; + + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java index 15f9cfcbab..df9ffd382e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java @@ -92,8 +92,8 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - wrapper.eq(StringUtils.isNotBlank(name), "NAME", name); + wrapper.like(StringUtils.isNotBlank(name), "NAME", name); wrapper.eq(StringUtils.isNotBlank(idCard), "ID_CARD", idCard); wrapper.eq(StringUtils.isNotBlank(mobile), "MOBILE", mobile); wrapper.ge(StringUtils.isNotBlank(startTime), "OUT_OF_TIME", startTime); From 7e7c1a8be5fe55fd8a263a7fe671d1908281ff03 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 11 May 2022 18:00:05 +0800 Subject: [PATCH 061/102] =?UTF-8?q?=E8=BF=81=E5=85=A5=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=B0=86=E7=94=A8=E6=88=B7=E7=8A=B6=E6=80=81=E7=BD=AE=E4=B8=BA?= =?UTF-8?q?-=E6=AD=A3=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcMoveInRecordServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java index 30a66373c3..02f0ea2fb0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java @@ -7,6 +7,7 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.DictTypeEnum; +import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; @@ -186,6 +187,8 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 18:02:40 +0800 Subject: [PATCH 062/102] =?UTF-8?q?ss=E5=85=88=E6=94=BE=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java index 10b926ba35..e7effcd6f7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java @@ -93,7 +93,7 @@ public class IcUserChangeRecordDTO implements Serializable { /** * 变更时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date changeTime; /** @@ -125,7 +125,7 @@ public class IcUserChangeRecordDTO implements Serializable { * 创建时间 * 调整时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createdTime; /** From 74ea5e11f4192eefa703c9abac2e73a815f989f7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 11 May 2022 18:03:19 +0800 Subject: [PATCH 063/102] =?UTF-8?q?=E5=87=BA=E7=94=9F=E5=92=8C=E8=BF=81?= =?UTF-8?q?=E5=85=A5=E7=9A=84=E5=AF=BC=E5=87=BA=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcBirthRecordController.java | 1 + .../com/epmet/excel/IcMoveInRecordExcel.java | 9 +++++++-- .../impl/IcBirthRecordServiceImpl.java | 4 ++-- .../impl/IcMoveInRecordServiceImpl.java | 19 +++++++------------ 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java index 177bbc42be..8983e1f8c6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java @@ -110,6 +110,7 @@ public class IcBirthRecordController { item.setIndex(i.getAndIncrement()); }); excelWriter.write(list, writeSheet); + formDTO.setPageNo(pageNo++); } while (CollectionUtils.isNotEmpty(page.getList()) && page.getList().size() == formDTO.getPageSize()); } catch (Exception e) { log.error("export exception", e); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java index b3ee1398bd..192ce17cd3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java @@ -3,9 +3,12 @@ package com.epmet.excel; import cn.afterturn.easypoi.excel.annotation.Excel; 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.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import java.io.Serializable; import java.util.Date; /** @@ -14,9 +17,11 @@ import java.util.Date; * @author generator generator@elink-cn.com * @since v1.0.0 2022-05-09 */ +@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44) @Data -public class IcMoveInRecordExcel { +public class IcMoveInRecordExcel implements Serializable { + private static final long serialVersionUID = -12110233388005838L; @ExcelProperty(value = "姓名") @Excel(name = "姓名") private String name; @@ -80,4 +85,4 @@ public class IcMoveInRecordExcel { private String householderRelationName; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java index 800f4b7829..c3225149ad 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java @@ -70,7 +70,7 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl wrapper = getWrapper(formDTO, staffInfo); List entityList = baseDao.selectList(wrapper); PageInfo pageInfo = new PageInfo<>(entityList); @@ -283,4 +283,4 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl list = baseDao.selectMoveInList(formDTO); - resultDTO.setList(list); - } else { - //列表查询 - PageInfo data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()) - .doSelectPageInfo(() -> baseDao.selectMoveInList(formDTO)); - resultDTO.setTotal((int) data.getTotal()); - resultDTO.setList(data.getList()); - } + //列表/导出查询 + PageInfo data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) + .doSelectPageInfo(() -> baseDao.selectMoveInList(formDTO)); + resultDTO.setTotal((int) data.getTotal()); + resultDTO.setList(data.getList()); + //查询封装房屋信息 if (!CollectionUtils.isEmpty(resultDTO.getList())) { Map map = new HashMap<>(); @@ -295,4 +290,4 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 18:15:25 +0800 Subject: [PATCH 064/102] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=9A=84=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E7=9A=84=E6=97=B6=E9=97=B4=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/IcMoveInRecordExcel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java index 192ce17cd3..370dc9b4b1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java @@ -5,8 +5,8 @@ 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.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; @@ -56,7 +56,7 @@ public class IcMoveInRecordExcel implements Serializable { @ExcelProperty(value = "迁入时间") @ColumnWidth(20) @Excel(name = "迁入时间") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date inTime; @ExcelProperty(value = "迁入原因") From da805f0e8e38474ac8da11f592d75f96e49aa24a Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 11 May 2022 18:22:37 +0800 Subject: [PATCH 065/102] =?UTF-8?q?Revert=20"=E8=BF=81=E5=85=A5=E7=9A=84?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84=E6=97=B6=E9=97=B4=E4=B8=8D=E5=AF=B9?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 66b83f3c --- .../src/main/java/com/epmet/excel/IcMoveInRecordExcel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java index 370dc9b4b1..192ce17cd3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java @@ -5,8 +5,8 @@ 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.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; @@ -56,7 +56,7 @@ public class IcMoveInRecordExcel implements Serializable { @ExcelProperty(value = "迁入时间") @ColumnWidth(20) @Excel(name = "迁入时间") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date inTime; @ExcelProperty(value = "迁入原因") From 427ca1d9e303f35f936137a0f9c9163ae6b0c406 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 11 May 2022 18:24:22 +0800 Subject: [PATCH 066/102] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=9A=84=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E7=9A=84=E6=97=B6=E9=97=B4=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/IcMoveInRecordExcel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java index 192ce17cd3..26edb423ce 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java @@ -2,10 +2,10 @@ package com.epmet.excel; import cn.afterturn.easypoi.excel.annotation.Excel; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.DateTimeFormat; 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.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; @@ -56,7 +56,7 @@ public class IcMoveInRecordExcel implements Serializable { @ExcelProperty(value = "迁入时间") @ColumnWidth(20) @Excel(name = "迁入时间") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat("yyyy-MM-dd") private Date inTime; @ExcelProperty(value = "迁入原因") From 4e08ce53ee50f67afd8e1f4d7f0ef535f3b44773 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 11 May 2022 18:30:09 +0800 Subject: [PATCH 067/102] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=9A=84=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=88=97=E5=AE=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/IcMoveInRecordExcel.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java index 26edb423ce..4976970ffa 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java @@ -24,6 +24,7 @@ public class IcMoveInRecordExcel implements Serializable { private static final long serialVersionUID = -12110233388005838L; @ExcelProperty(value = "姓名") @Excel(name = "姓名") + @ColumnWidth(20) private String name; @ExcelProperty(value = "所属网格") @@ -37,11 +38,11 @@ public class IcMoveInRecordExcel implements Serializable { private String allName; @ExcelProperty(value = "手机号") - @Excel(name = "手机号") + @ColumnWidth(20) private String mobile; @ExcelProperty(value = "身份证号") - @ColumnWidth(20) + @ColumnWidth(25) @Excel(name = "身份证号") private String idCard; From 908409ae97f5753ff239c68b03954008437158a0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 11 May 2022 18:30:50 +0800 Subject: [PATCH 068/102] =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/IcBirthRecordExcel.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java index fc20ac93ef..130cde401e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java @@ -6,6 +6,8 @@ import com.alibaba.excel.annotation.write.style.HeadStyle; import com.alibaba.excel.enums.poi.FillPatternTypeEnum; import lombok.Data; +import java.io.Serializable; + /** * 出生管理 * @@ -14,8 +16,9 @@ import lombok.Data; */ @HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44) @Data -public class IcBirthRecordExcel { +public class IcBirthRecordExcel implements Serializable { + private static final long serialVersionUID = 4539449621014654213L; @ColumnWidth(10) @ExcelProperty(value = "序号",order = 1) private Integer index; @@ -72,4 +75,4 @@ public class IcBirthRecordExcel { @ExcelProperty(value = "与户主关系",order = 1) private String householderRelation; -} \ No newline at end of file +} From f89e1c4962e591f21e2841a4419f0358a37be9bd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 11 May 2022 18:32:42 +0800 Subject: [PATCH 069/102] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=BF=81=E5=85=A5?= =?UTF-8?q?=E7=99=BB=E8=AE=B0+=E5=87=BA=E7=94=9F=E7=99=BB=E8=AE=B0?= =?UTF-8?q?=E6=97=B6=E7=94=9F=E6=88=90=E8=B0=83=E5=8A=A8=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E8=BF=81=E5=87=BA=E4=B8=8D=E7=94=9F=E6=88=90=EF=BC=8C?= =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E8=BF=81=E5=87=BA=E6=97=B6=E6=89=80=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E6=88=BF=E5=B1=8B=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ChangeRelocationServiceImpl.java | 2 +- .../impl/IcMoveInRecordServiceImpl.java | 8 +-- .../impl/IcUserTransferRecordServiceImpl.java | 63 ++++++++----------- 3 files changed, 32 insertions(+), 41 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java index b1cf1db7a1..bc58c655a9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java @@ -194,7 +194,7 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl result2 = getNewHouseInfo(formDTO); CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity(); - //5.生成调动记录: 只有迁出，或者房屋变更的才生成居民调动记录表ic_user_transfer_record记录 - if (IcResiUserConstant.OUT.equals(formDTO.getOrigin()) || IcResiUserConstant.CHANGE.equals(formDTO.getOrigin())) { + //5.生成调动记录: 只有迁入，或者房屋变更（变动）的才生成居民调动记录表ic_user_transfer_record记录 + if (IcResiUserConstant.IN.equals(formDTO.getOrigin()) || IcResiUserConstant.CHANGE.equals(formDTO.getOrigin())) { IcUserTransferRecordEntity recordEntity = saveTransferRecord(staffInfoCache, formDTO, resiUserDTO, icResiUserOrgMsgResultDTO, result2.getData()); insert(recordEntity); changeRecordEntity.setIcUserTransferRecordId(recordEntity.getId()); @@ -357,22 +359,23 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl getNewHouseInfo(IcResiUserTransferFormDTO formDTO) { Result result2 = new Result<>(); - if ((IcResiUserConstant.OUT.equals(formDTO.getOrigin()) || IcResiUserConstant.CHANGE.equals(formDTO.getOrigin())) + if ((IcResiUserConstant.IN.equals(formDTO.getOrigin()) || IcResiUserConstant.CHANGE.equals(formDTO.getOrigin())) && "in".equals(formDTO.getType())) { - //迁出/变动且类型为 迁出到本客户内的，才会查询新的房屋信息；迁出到其他的不查询 - IcResiUserOrgMsgFormDTO orgMsgFormDTO2 = new IcResiUserOrgMsgFormDTO(); - orgMsgFormDTO2.setCustomerId(formDTO.getCustomerId()); - orgMsgFormDTO2.setAgencyId(formDTO.getNewAgencyId()); - orgMsgFormDTO2.setGridId(formDTO.getNewGridId()); - orgMsgFormDTO2.setNeighborHoodId(formDTO.getNewNeighborHoodId()); - orgMsgFormDTO2.setBuildingId(formDTO.getNewBuildingId()); - orgMsgFormDTO2.setBuildingUnitId(formDTO.getNewBuildingUnitId()); - orgMsgFormDTO2.setHouseId(formDTO.getNewHouseId()); - result2 = govOrgOpenFeignClient.icResiUserOrgMsg(orgMsgFormDTO2); - if (!result2.success() || null == result2.getData().getAgencyDTO() || null == result2.getData().getGridDTO() || null == result2.getData().getNeighborHoodDTO() - || null == result2.getData().getBuildingDTO() || null == result2.getData().getBuildingUnitDTO() || null == result2.getData().getHouseDTO()) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查找迁入后的组织、网格、小区、楼栋、单元、房屋信息失败", "迁出至的房屋信息异常"); - } - } - if (IcResiUserConstant.IN.equals(formDTO.getOrigin())) { - //|| IcResiUserConstant.BIRTH.equals(formDTO.getOrigin()) - //出生管理、迁入管理的查询当前选择的房屋信息 + //迁入管理-迁入登记 + //变更 IcResiUserOrgMsgFormDTO orgMsgFormDTO2 = new IcResiUserOrgMsgFormDTO(); orgMsgFormDTO2.setCustomerId(formDTO.getCustomerId()); orgMsgFormDTO2.setAgencyId(formDTO.getNewAgencyId()); @@ -479,7 +470,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 18:54:19 +0800 Subject: [PATCH 070/102] =?UTF-8?q?=E8=BF=81=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcUserTransferRecordServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java index 80cedee107..5c3bada17e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java @@ -455,10 +455,13 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl getNewHouseInfo(IcResiUserTransferFormDTO formDTO) { Result result2 = new Result<>(); - if ((IcResiUserConstant.IN.equals(formDTO.getOrigin()) || IcResiUserConstant.CHANGE.equals(formDTO.getOrigin())) + if ((IcResiUserConstant.IN.equals(formDTO.getOrigin()) + || IcResiUserConstant.CHANGE.equals(formDTO.getOrigin()) + || IcResiUserConstant.OUT.equals(formDTO.getOrigin())) && "in".equals(formDTO.getType())) { //迁入管理-迁入登记 //变更 + //迁出管理-拟迁入的 IcResiUserOrgMsgFormDTO orgMsgFormDTO2 = new IcResiUserOrgMsgFormDTO(); orgMsgFormDTO2.setCustomerId(formDTO.getCustomerId()); orgMsgFormDTO2.setAgencyId(formDTO.getNewAgencyId()); From 254f93a921a6b5b5f12eb6de1c099e2e4b669775 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 11 May 2022 19:15:42 +0800 Subject: [PATCH 071/102] =?UTF-8?q?=E5=87=BA=E7=94=9F=E8=B0=83=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcBirthRecordServiceImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java index c3225149ad..afb5f9bfd4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java @@ -157,9 +157,9 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl Date: Thu, 12 May 2022 09:13:13 +0800 Subject: [PATCH 072/102] =?UTF-8?q?=E8=BF=81=E5=87=BA=E7=90=86=E7=94=B1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=95=BF=E5=BA=A6=E3=80=82moveResi=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/IcUserTransferRecordService.java | 13 ++++++------- .../db/migration/V0.0.46__modify_move_outreason.sql | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.46__modify_move_outreason.sql diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java index 2930a1f5e9..4fe9bdfddf 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java @@ -37,14 +37,13 @@ public interface IcUserTransferRecordService extends BaseService Date: Thu, 12 May 2022 09:22:35 +0800 Subject: [PATCH 073/102] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcHouseChangeRecordServiceImpl.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseChangeRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseChangeRecordServiceImpl.java index f1ccb252aa..22da0f3a3e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseChangeRecordServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseChangeRecordServiceImpl.java @@ -105,15 +105,9 @@ public class IcHouseChangeRecordServiceImpl extends BaseServiceImpl pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.getHouseChangeList(formDTO)); - pageData.setList(pageInfo.getList()); - pageData.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); - }else { - List houseChangeList = baseDao.getHouseChangeList(formDTO); - pageData.setList(houseChangeList); - pageData.setTotal(houseChangeList.size()); - } + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.getHouseChangeList(formDTO)); + pageData.setList(pageInfo.getList()); + pageData.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); return pageData; } From 7ceadc91ac51f86f8ab7298752e5cff95990fa49 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 12 May 2022 09:53:08 +0800 Subject: [PATCH 074/102] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=B7=B2=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcHouseServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 20bea1a301..e884a6904c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -8,6 +8,8 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; @@ -89,6 +91,9 @@ public class IcHouseServiceImpl extends BaseServiceImpl Date: Thu, 12 May 2022 09:53:16 +0800 Subject: [PATCH 075/102] . --- .../epmet/dto/form/IcMoveInListFormDTO.java | 2 +- .../dto/result/IcMoveInListResultDTO.java | 279 +++++++++--------- .../controller/IcMoveInRecordController.java | 22 +- .../java/com/epmet/dao/IcMoveInRecordDao.java | 2 +- .../epmet/service/IcMoveInRecordService.java | 4 +- .../impl/IcMoveInRecordServiceImpl.java | 33 ++- .../resources/mapper/IcMoveInRecordDao.xml | 2 +- 7 files changed, 169 insertions(+), 175 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInListFormDTO.java index 7dc30d24f1..e7e510d247 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInListFormDTO.java @@ -69,7 +69,7 @@ public class IcMoveInListFormDTO implements Serializable { */ private Integer pageSize = 20; - private Boolean isPage = false; + private Boolean isPage = true; private String customerId; private String moveInId; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java index bcc6d70f55..92eef807fd 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java @@ -16,152 +16,139 @@ import java.util.List; @Data public class IcMoveInListResultDTO implements Serializable { private static final long serialVersionUID = 1L; + + /** + * 迁入Id + */ + private String moveInId; + /** + * 网格ID + */ + private String gridId; + /** + * 网格名称 + */ + private String gridName; + /** + * 所属小区ID + */ + private String villageId; + /** + * 所属小区名称 + */ + private String villageName; + /** + * 所属楼宇Id + */ + private String buildId; + /** + * 所属楼宇名称 + */ + private String buildName; + /** + * 单元id + */ + private String unitId; + /** + * 单元名称 + */ + private String unitName; + /** + * 所属家庭Id + */ + private String homeId; + /** + * 所属家庭名称 + */ + private String homeName; + /** + * 所属家庭Id + */ + private String allName; + /** + * 姓名 + */ + private String name; + /** + * 是否享受福利【否:0 是:1】 + */ + private String isWeifare; + /** + * 是否勾选补充居民信息0否 1是 + */ + private String isCheck; + + /** + * 手机号 + */ + private String mobile; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 性别（1男2女0未知） + */ + private String gender; + + /** + * 性别（1男2女0未知） + */ + private String genderName; + + /** + * 年龄 + */ + private Integer age; + + /** + * 迁入时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date inTime; + + /** + * 迁入原因 + */ + private String inReason; + + /** + * 来源地区编码 + */ + private String sourceAddressCode; + /** + * 来源地区编码全路径 + */ + private String sourceAddressPathCode; + /** + * 来源地区地址 + */ + private String sourceAddress; + /** + * 详细地址 + */ + private String address; + + /** + * 迁移证号码 + */ + private String moveNumber; + + /** + * 户主姓名 + */ + private String householderName; + /** - * 议题总数 - */ - private Integer total; - - /** - * 议题列表 - */ - private List list; - - @Data - public static class IcMoveInList { - /** - * 迁入Id - */ - private String moveInId; - /** - * 网格ID - */ - private String gridId; - /** - * 网格名称 - */ - private String gridName; - /** - * 所属小区ID - */ - private String villageId; - /** - * 所属小区名称 - */ - private String villageName; - /** - * 所属楼宇Id - */ - private String buildId; - /** - * 所属楼宇名称 - */ - private String buildName; - /** - * 单元id - */ - private String unitId; - /** - * 单元名称 - */ - private String unitName; - /** - * 所属家庭Id - */ - private String homeId; - /** - * 所属家庭名称 - */ - private String homeName; - /** - * 所属家庭Id - */ - private String allName; - /** - * 姓名 - */ - private String name; - /** - * 是否享受福利【否:0 是:1】 - */ - private String isWeifare; - /** - * 是否勾选补充居民信息0否 1是 - */ - private String isCheck; - - /** - * 手机号 - */ - private String mobile; - - /** - * 身份证号 - */ - private String idCard; - - /** - * 性别（1男2女0未知） - */ - private String gender; - - /** - * 性别（1男2女0未知） - */ - private String genderName; - - /** - * 年龄 - */ - private Integer age; - - /** - * 迁入时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date inTime; - - /** - * 迁入原因 - */ - private String inReason; - - /** - * 来源地区编码 - */ - private String sourceAddressCode; - /** - * 来源地区编码全路径 - */ - private String sourceAddressPathCode; - /** - * 来源地区地址 - */ - private String sourceAddress; - /** - * 详细地址 - */ - private String address; - - /** - * 迁移证号码 - */ - private String moveNumber; - - /** - * 户主姓名 - */ - private String householderName; - - /** - * 与户主关系[字典表] - */ - private String householderRelation; - - /** - * 与户主关系[字典表] - */ - private String householderRelationName; - - } + * 与户主关系[字典表] + */ + private String householderRelation; + + /** + * 与户主关系[字典表] + */ + private String householderRelationName; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java index aef718c8c9..4989355df4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java @@ -7,6 +7,7 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; @@ -18,10 +19,12 @@ 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; @@ -57,9 +60,9 @@ public class IcMoveInRecordController { @RequestMapping("list") @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) - public Result list(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO){ + public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); - return new Result().ok(icMoveInRecordService.list(formDTO)); + return new Result>().ok(icMoveInRecordService.list(formDTO)); } @NoRepeatSubmit @@ -89,13 +92,9 @@ public class IcMoveInRecordController { } @PostMapping("export") - public void export(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO, HttpServletResponse response) throws Exception { + public void export(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO, HttpServletResponse response) { formDTO.setCustomerId(tokenDto.getCustomerId()); - /* formDTO.setIsPage(true); - IcMoveInListResultDTO resultDTO = icMoveInRecordService.list(formDTO); - List list = ConvertUtils.sourceToTarget(resultDTO.getList(), IcMoveInRecordExcel.class); - ExcelUtils.exportExcelToTarget(response, null, list, IcMoveInRecordExcel.class);*/ - + formDTO.setIsPage(false); ExcelWriter excelWriter = null; formDTO.setPageSize(NumConstant.TEN_THOUSAND); int pageNo = NumConstant.ONE; @@ -103,9 +102,10 @@ public class IcMoveInRecordController { String fileName = "迁入管理"+DateUtils.format(new Date())+".xlsx"; excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcMoveInRecordExcel.class).build(); WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; List list = null; do { - IcMoveInListResultDTO data = icMoveInRecordService.list(formDTO); + data = icMoveInRecordService.list(formDTO); list = ConvertUtils.sourceToTarget(data.getList(), IcMoveInRecordExcel.class); formDTO.setPageNo(++pageNo); excelWriter.write(list, writeSheet); @@ -120,10 +120,10 @@ public class IcMoveInRecordController { } @RequestMapping("detail") - public Result detail(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO){ + public Result detail(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); formDTO.setCustomerId(tokenDto.getCustomerId()); - return new Result().ok(icMoveInRecordService.detail(formDTO)); + return new Result().ok(icMoveInRecordService.detail(formDTO)); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcMoveInRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcMoveInRecordDao.java index 9d568a8abd..e15d2d0b97 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcMoveInRecordDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcMoveInRecordDao.java @@ -21,5 +21,5 @@ public interface IcMoveInRecordDao extends BaseDao { * @Author sun * @Description 【迁入管理】列表查询 **/ - List selectMoveInList(IcMoveInListFormDTO formDTO); + List selectMoveInList(IcMoveInListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java index 14704378b5..07eef5d36a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java @@ -36,7 +36,7 @@ public interface IcMoveInRecordService extends BaseService * @author generator * @date 2022-05-09 */ - IcMoveInListResultDTO list(IcMoveInListFormDTO formDTO); + PageData list(IcMoveInListFormDTO formDTO); /** * 单条查询 @@ -78,5 +78,5 @@ public interface IcMoveInRecordService extends BaseService */ void delete(String[] ids); - IcMoveInListResultDTO.IcMoveInList detail(IcMoveInListFormDTO formDTO); + IcMoveInListResultDTO detail(IcMoveInListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java index 3b545c8981..4c8f3b1252 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; @@ -18,6 +19,7 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcMoveInRecordDao; import com.epmet.dto.ChangeWelfareDTO; +import com.epmet.dto.IcBirthRecordDTO; import com.epmet.dto.IcMoveInRecordDTO; import com.epmet.dto.form.IcMoveInAddEditFormDTO; import com.epmet.dto.form.IcMoveInListFormDTO; @@ -25,6 +27,7 @@ import com.epmet.dto.form.IcResiUserTransferFormDTO; import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.IcMoveInListResultDTO; import com.epmet.dto.result.SyncResiResDTO; +import com.epmet.entity.IcBirthRecordEntity; import com.epmet.entity.IcMoveInRecordEntity; import com.epmet.entity.IcResiUserEntity; import com.epmet.feign.EpmetAdminOpenFeignClient; @@ -78,19 +81,17 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl list(IcMoveInListFormDTO formDTO) { //列表/导出查询 - PageInfo data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) - .doSelectPageInfo(() -> baseDao.selectMoveInList(formDTO)); - resultDTO.setTotal((int) data.getTotal()); - resultDTO.setList(data.getList()); + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + List list = baseDao.selectMoveInList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); //查询封装房屋信息 - if (!CollectionUtils.isEmpty(resultDTO.getList())) { + if (!CollectionUtils.isEmpty(list)) { Map map = new HashMap<>(); //查询房屋信息 - Set houseIds = resultDTO.getList().stream().filter(l -> StringUtils.isNotBlank(l.getHomeId())).map(m -> m.getHomeId()).collect(Collectors.toSet()); + Set houseIds = list.stream().filter(l -> StringUtils.isNotBlank(l.getHomeId())).map(m -> m.getHomeId()).collect(Collectors.toSet()); Result> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(houseIds, formDTO.getCustomerId()); List houseInfoDTOList = houseInfoRes.success() && !org.apache.commons.collections4.CollectionUtils.isEmpty(houseInfoRes.getData()) ? houseInfoRes.getData() : new ArrayList<>(); Map houseInfoMap = houseInfoDTOList.stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity())); @@ -99,7 +100,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); //封装数据 - for (IcMoveInListResultDTO.IcMoveInList v : resultDTO.getList()) { + for (IcMoveInListResultDTO v : list) { if (!map.containsKey(v.getGridId())) { //获取网格缓存信息 GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(v.getGridId()); @@ -119,7 +120,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); } private QueryWrapper getWrapper(Map params){ @@ -265,10 +266,10 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl list = baseDao.selectMoveInList(formDTO); + List list = baseDao.selectMoveInList(formDTO); //2.查询网格房屋信息 if (!CollectionUtils.isEmpty(list)) { resultDTO = list.get(NumConstant.ZERO); @@ -290,6 +291,12 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode()); + Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + resultDTO.setHouseholderRelationName(statusMap.get(resultDTO.getHouseholderRelation())); + } } return resultDTO; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml index 663aa09060..1c3d49016e 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml @@ -3,7 +3,7 @@ - SELECT id moveInId, grid_id gridId, From 61807e3b9f7f39bacad5b2be66273a964b82dd19 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 12 May 2022 09:56:04 +0800 Subject: [PATCH 076/102] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/processor/MaskProcessor.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java index 353fb06a47..eb1632d1e6 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java @@ -13,8 +13,10 @@ import java.lang.reflect.Field; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.regex.Pattern; +/** + * desc:脱敏处理器 + */ @Slf4j public class MaskProcessor { @@ -42,20 +44,15 @@ public class MaskProcessor { if (object instanceof Result) { mask(((Result) object).getData()); - return; } else if (object instanceof PageData) { mask(((PageData) object).getList()); - return; } else if (object instanceof List) { ((List)object).forEach(e -> mask(e)); - return; } else if (object instanceof Map) { maskMap((Map) object); - return; } else if (object.getClass().getName().startsWith(EPMET_PACKAGE_PREFIX)) { // 自定义bean，走反射 maskEpmetBean(object); - return; } } @@ -77,14 +74,12 @@ public class MaskProcessor { if (value != null && value.getClass().getName().startsWith(EPMET_PACKAGE_PREFIX)) { // 是epmet的对象 maskEpmetBean(value); - continue; } else if (value instanceof String) { int index = fieldNames.indexOf(key); if (index != -1) { String maskResult = maskString((String) value, fieldsMaskType.get(index)); entry.setValue(maskResult); } - continue; } } } From 5f3f6aa4faeacf7b583d63e6c14cdff7334cd855 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 12 May 2022 10:09:14 +0800 Subject: [PATCH 077/102] =?UTF-8?q?=E5=8D=95=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/HouseMemberResultDTO.java | 2 +- .../main/java/com/epmet/service/impl/HouseServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java index 66bfdfa4ad..3d2e8a0360 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java @@ -37,7 +37,7 @@ public class HouseMemberResultDTO implements Serializable { @ExcelProperty(value = {"房屋信息","所属楼栋"},index = 4) private String buildingName; @ExcelProperty(value = {"房屋信息","单元"},index = 5) - private String unitName; + private String unitNum; /** * 门牌号 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 7cacfb2513..eb2e64d1e8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -507,7 +507,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { int finalSearchLevel = searchLevel; AtomicInteger num = new AtomicInteger((formDTO.getPageNo()-1) * formDTO.getPageSize()); - resultDTOS.stream().forEach(o ->{ + resultDTOS.forEach(o ->{ resiParam.setNeighborHoodId(o.getNeighborHoodId()); if (finalSearchLevel == 1){ @@ -537,7 +537,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { resultDTO.setGridName(o.getGridName()); resultDTO.setNeighborHoodName(o.getNeighborHoodName()); resultDTO.setBuildingName(o.getBuildingName()); - resultDTO.setUnitName(o.getUnitName()); + resultDTO.setUnitNum(o.getUnitNum()); resultDTO.setDoorName(o.getDoorName()); resultDTO.setHouseType(o.getHouseType()); resultDTO.setPurpose(o.getPurpose()); From 0437baf980c2024e739d699ccdb30ca1292430ad Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 12 May 2022 10:13:13 +0800 Subject: [PATCH 078/102] =?UTF-8?q?=E5=8D=95=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/IcHouseListResultDTO.java | 2 +- .../src/main/java/com/epmet/service/impl/HouseServiceImpl.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java index 93b9b9818e..4c1b40288f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java @@ -49,7 +49,7 @@ public class IcHouseListResultDTO implements Serializable { */ private String buildingName; /** - * 单元号 + * 单元号_单元 */ private String unitNum; /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index eb2e64d1e8..b9ad4c5201 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -500,14 +500,13 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } PageData houseData = this.getHouseList(formDTO); - List resultDTOS = ConvertUtils.sourceToTarget(houseData.getList(), HouseMemberResultDTO.class); List resultList = new ArrayList<>(); PageData result = new PageData<>(resultList,houseData.getList().size()); int finalSearchLevel = searchLevel; AtomicInteger num = new AtomicInteger((formDTO.getPageNo()-1) * formDTO.getPageSize()); - resultDTOS.forEach(o ->{ + houseData.getList().forEach(o ->{ resiParam.setNeighborHoodId(o.getNeighborHoodId()); if (finalSearchLevel == 1){ From b5b331a97464c29acbf3cf2c7da91ea6b296cafb Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 12 May 2022 10:15:48 +0800 Subject: [PATCH 079/102] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/ChangeRelocationController.java | 2 +- .../src/main/java/com/epmet/dao/ChangeRelocationDao.java | 2 +- .../com/epmet/service/impl/ChangeRelocationServiceImpl.java | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java index f29f38464a..70d0d6183c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java @@ -24,7 +24,7 @@ import java.util.Map; /** - * 合同表 + * 人员迁出表 * * @author generator generator@elink-cn.com * @since v1.0.0 2022-05-06 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ChangeRelocationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ChangeRelocationDao.java index ee7a543e8e..4a47804a98 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ChangeRelocationDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ChangeRelocationDao.java @@ -5,7 +5,7 @@ import com.epmet.entity.ChangeRelocationEntity; import org.apache.ibatis.annotations.Mapper; /** - * 合同表 + * 人员迁出表 * * @author generator generator@elink-cn.com * @since v1.0.0 2022-05-06 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java index bc58c655a9..066af7485b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java @@ -44,7 +44,7 @@ import java.util.List; import java.util.Map; /** - * 合同表 + * 人员迁出表 * * @author generator generator@elink-cn.com * @since v1.0.0 2022-05-06 @@ -72,7 +72,6 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( From f27197eca19ebe15578c89b33a677691eda90831 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 12 May 2022 11:04:10 +0800 Subject: [PATCH 080/102] =?UTF-8?q?=E5=87=BA=E7=94=9F=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/BirthRecordFormDTO.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordFormDTO.java index adaff9111b..e9093a03ee 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordFormDTO.java @@ -69,9 +69,4 @@ public class BirthRecordFormDTO extends PageFormDTO implements Serializable { * 是否福利 */ private String isWelfare; - - /** - * 是否分页 - */ - private Boolean isPage; } From 0ebaa05e1cda279ce7f625ee3e9772e47390b943 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 12 May 2022 12:11:48 +0800 Subject: [PATCH 081/102] =?UTF-8?q?easyExcel=E5=8D=87=E7=BA=A7=E5=88=B0?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-commons/epmet-commons-tools/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/pom.xml b/epmet-commons/epmet-commons-tools/pom.xml index 867fcf47c7..b0f7737940 100644 --- a/epmet-commons/epmet-commons-tools/pom.xml +++ b/epmet-commons/epmet-commons-tools/pom.xml @@ -24,7 +24,7 @@ 2.8.6 1.11.3 1.18.4 - 3.0.3 + 3.0.5 From 740109af5459446aeb2b2ba8067227a0465e84db Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 12 May 2022 14:33:44 +0800 Subject: [PATCH 082/102] =?UTF-8?q?=E6=80=A7=E5=88=AB=E6=98=AF2=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ChangeRelocationServiceImpl.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java index 066af7485b..e65f35c859 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java @@ -88,8 +88,8 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); String name = (String) params.get("name"); String idCard = (String) params.get("idCard"); String mobile = (String) params.get("mobile"); @@ -165,22 +165,24 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl Date: Thu, 12 May 2022 14:44:19 +0800 Subject: [PATCH 083/102] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=8A=B9=E6=8E=89DTO=E7=9A=84ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/ChangeWelfareServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java index 301091af1f..80669119dd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java @@ -150,6 +150,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl Date: Thu, 12 May 2022 15:19:55 +0800 Subject: [PATCH 084/102] =?UTF-8?q?=E9=81=BF=E5=85=8D=E4=B8=8B=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 5dc796e562..3e0363caa9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -613,7 +613,7 @@ public class GovOrgServiceImpl implements GovOrgService { CustomerAgencyEntity customerAgencyEntity=customerAgencyDao.selectById(agencyId); CustomerAgencyDTO res= ConvertUtils.sourceToTarget(customerAgencyEntity,CustomerAgencyDTO.class); //设置行政地区编码全路径 - if (StringUtils.isNotBlank(res.getAreaCode()) && StringUtils.isNotBlank(res.getParentAreaCode())) { + if (null != res && StringUtils.isNotBlank(res.getAreaCode()) && StringUtils.isNotBlank(res.getParentAreaCode())) { res.setAreaCodePath(queryAreaCodePath(res)); } return res; From ab46a6d8c0e7628db40ce61187985601acbce8db Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 12 May 2022 15:38:16 +0800 Subject: [PATCH 085/102] . --- .../java/com/epmet/dto/form/IcMoveInListFormDTO.java | 10 ++++------ .../src/main/resources/mapper/IcMoveInRecordDao.xml | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInListFormDTO.java index e7e510d247..eaeb03b6db 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInListFormDTO.java @@ -1,10 +1,8 @@ package com.epmet.dto.form; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.util.Date; /** * @Description 【迁入管理】列表--接口入参 @@ -53,13 +51,13 @@ public class IcMoveInListFormDTO implements Serializable { /** * 起始迁入时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date startTime; + //@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private String startTime; /** * 终止迁入时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date endTime; + //@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private String endTime; /** * 页码 */ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml index 1c3d49016e..eae6a3e826 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml @@ -57,10 +57,10 @@ AND id_card = #{idCard} - AND in_time =]]> #{startTime} + AND DATE_FORMAT(in_time,"%Y-%m-%d") =]]> #{startTime} - AND in_time #{endTime} + AND DATE_FORMAT(in_time,"%Y-%m-%d") #{endTime} AND is_welfare = #{isWeifare} From 1b095c0a0e8d5f6dc1ace4d443a301e4e300bbbf Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 12 May 2022 16:38:12 +0800 Subject: [PATCH 086/102] =?UTF-8?q?=E5=88=A0=E6=8E=89page=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/IcMoveInRecordService.java | 14 +---------- .../impl/IcMoveInRecordServiceImpl.java | 24 ------------------- 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java index 07eef5d36a..8af41fdc78 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java @@ -8,8 +8,6 @@ import com.epmet.dto.form.IcMoveInListFormDTO; import com.epmet.dto.result.IcMoveInListResultDTO; import com.epmet.entity.IcMoveInRecordEntity; -import java.util.Map; - /** * 迁入管理记录 * @@ -18,16 +16,6 @@ import java.util.Map; */ public interface IcMoveInRecordService extends BaseService { - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2022-05-09 - */ - PageData page(Map params); - /** * 默认查询 * @@ -79,4 +67,4 @@ public interface IcMoveInRecordService extends BaseService void delete(String[] ids); IcMoveInListResultDTO detail(IcMoveInListFormDTO formDTO); -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java index 4c8f3b1252..fa85309071 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java @@ -1,10 +1,6 @@ package com.epmet.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.DictTypeEnum; @@ -19,7 +15,6 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcMoveInRecordDao; import com.epmet.dto.ChangeWelfareDTO; -import com.epmet.dto.IcBirthRecordDTO; import com.epmet.dto.IcMoveInRecordDTO; import com.epmet.dto.form.IcMoveInAddEditFormDTO; import com.epmet.dto.form.IcMoveInListFormDTO; @@ -27,7 +22,6 @@ import com.epmet.dto.form.IcResiUserTransferFormDTO; import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.IcMoveInListResultDTO; import com.epmet.dto.result.SyncResiResDTO; -import com.epmet.entity.IcBirthRecordEntity; import com.epmet.entity.IcMoveInRecordEntity; import com.epmet.entity.IcResiUserEntity; import com.epmet.feign.EpmetAdminOpenFeignClient; @@ -71,15 +65,6 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IcMoveInRecordDTO.class); - } - @Override public PageData list(IcMoveInListFormDTO formDTO) { //列表/导出查询 @@ -123,15 +108,6 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); } - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - @Override public IcMoveInRecordDTO get(String id) { IcMoveInRecordEntity entity = baseDao.selectById(id); From 08bf874fa3fe365f9f90adeb6e444602a690f221 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 12 May 2022 16:38:12 +0800 Subject: [PATCH 087/102] =?UTF-8?q?=E5=88=A0=E6=8E=89page=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/BadgeCertificationConfigDTO.java | 5 ++-- .../src/main/java/com/epmet/dto/BadgeDTO.java | 5 ++-- .../com/epmet/dto/ChangeRelocationDTO.java | 1 - .../java/com/epmet/dto/GovStaffRoleDTO.java | 17 ++++++------- .../java/com/epmet/dto/GridLatestDTO.java | 5 ++-- .../java/com/epmet/dto/GridVisitedDTO.java | 5 ++-- .../java/com/epmet/dto/IcEnsureHouseDTO.java | 5 ++-- .../dto/IcEpidemicSpecialAttentionDTO.java | 12 ++++------ .../java/com/epmet/dto/IcMoveInRecordDTO.java | 5 ++-- .../java/com/epmet/dto/IcNatRelationDTO.java | 5 ++-- .../java/com/epmet/dto/IcOldPeopleDTO.java | 5 ++-- .../java/com/epmet/dto/IcResiDemandDTO.java | 5 ++-- .../java/com/epmet/dto/IcResiVaccineDTO.java | 5 ++-- .../main/java/com/epmet/dto/IcSpecialDTO.java | 5 ++-- .../com/epmet/dto/IcStatsResiWarnDTO.java | 5 ++-- .../com/epmet/dto/IcTripReportRecordDTO.java | 1 - .../java/com/epmet/dto/IcUnemployedDTO.java | 5 ++-- .../java/com/epmet/dto/IcUnitedFrontDTO.java | 5 ++-- .../epmet/dto/IcUserChangeDetailedDTO.java | 5 ++-- .../epmet/dto/IcUserTransferRecordDTO.java | 5 ++-- .../main/java/com/epmet/dto/IcVaccineDTO.java | 5 ++-- .../com/epmet/dto/IcVaccineRelationDTO.java | 5 ++-- .../java/com/epmet/dto/IcVolunteerDTO.java | 5 ++-- .../main/java/com/epmet/dto/OperUserDTO.java | 4 ++-- .../com/epmet/dto/RegisterRelationDTO.java | 5 ++-- .../java/com/epmet/dto/ResiUserBadgeDTO.java | 5 ++-- .../src/main/java/com/epmet/dto/RoleDTO.java | 7 +++--- .../com/epmet/dto/StaffAgencyVisitedDTO.java | 5 ++-- .../com/epmet/dto/StaffGridVisitedDTO.java | 5 ++-- .../main/java/com/epmet/dto/StaffRoleDTO.java | 19 ++++++++------- .../dto/StatsStaffPatrolRecordDailyDTO.java | 5 ++-- .../java/com/epmet/dto/UserAdviceDTO.java | 3 ++- .../java/com/epmet/dto/UserInvitationDTO.java | 5 ++-- .../epmet/dto/UserResiRegisterVisitDTO.java | 5 ++-- .../java/com/epmet/dto/UserWechatDTO.java | 2 -- .../com/epmet/dto/form/AddBadgeFormDTO.java | 1 - .../com/epmet/dto/form/AdviceListFormDTO.java | 2 -- .../dto/form/AttentionDetailFormDTO.java | 1 - .../form/CancelAttentionPackageFormDTO.java | 2 -- .../form/CustomerAgencyUserRoleFormDTO.java | 2 -- .../com/epmet/dto/form/DemandUserFormDTO.java | 1 - .../com/epmet/dto/form/EditBadgeFormDTO.java | 1 - .../epmet/dto/form/EnableStaffFormDTO.java | 3 --- .../epmet/dto/form/GetRoleKeyListFormDTO.java | 1 - .../dto/form/IcUserWarnNoticeFormDTO.java | 1 - .../com/epmet/dto/form/NatListFormDTO.java | 1 - .../epmet/dto/form/PageTripReportFormDTO.java | 3 --- .../epmet/dto/form/ResiInfoSubmitFormDTO.java | 2 -- .../com/epmet/dto/form/SendNoticeFormDTO.java | 1 - .../epmet/dto/form/StaffBasicInfoFormDTO.java | 1 - .../dto/form/StatsResiWarnCountFormDTO.java | 4 +--- .../epmet/dto/form/TagCustomerFormDTO.java | 1 - .../dto/form/ThirdCustomerStaffFormDTO.java | 1 - .../epmet/dto/form/UserBasicInfoFormDTO.java | 1 - .../epmet/dto/form/UserInvitationFormDTO.java | 1 - .../epmet/dto/form/UserOperListFormDTO.java | 1 - .../dto/form/VaccinationListFormDTO.java | 1 - .../dto/form/VolunteerCommonFormDTO.java | 1 - .../com/epmet/dto/form/WxUserInfoFormDTO.java | 1 - .../epmet/dto/result/AdviceListResultDTO.java | 1 - .../CustomerStaffRoleListResultDTO.java | 1 - .../epmet/dto/result/EpmetUserFamilyDTO.java | 1 - .../dto/result/GovStaffRoleResultDTO.java | 3 +-- .../dto/result/GovStaffRoleTemplateDTO.java | 17 ++++++------- .../dto/result/IcMoveInListResultDTO.java | 3 --- .../epmet/dto/result/IcResiUserBriefDTO.java | 7 +++--- .../result/PatrolRecordDetailResultDTO.java | 1 - .../dto/result/QueryOperUserResultDto.java | 2 -- .../com/epmet/dto/result/RoleResultDTO.java | 1 - .../epmet/dto/result/StatsdataResultDTO.java | 2 -- .../dto/result/UserBadgeListResultDTO.java | 1 - .../com/epmet/enums/AttentionTypeEnum.java | 1 - .../controller/GovStaffRoleController.java | 1 - .../controller/GridLatestController.java | 2 +- .../controller/IcMoveInRecordController.java | 2 -- .../controller/IcResiCollectController.java | 5 +++- .../controller/IcStatsResiWarnController.java | 6 ++--- .../IcVaccineRelationController.java | 2 +- .../epmet/controller/LbTestController.java | 2 -- .../RegisterRelationController.java | 6 ++--- .../com/epmet/controller/RoleController.java | 8 +++---- .../StaffAgencyVisitedController.java | 4 +--- .../StaffGridVisitedController.java | 7 ++---- .../controller/StaffPatrolController.java | 13 ---------- ...StatsStaffPatrolRecordDailyController.java | 8 +++---- .../controller/UserAdviceImgController.java | 6 ++--- .../controller/UserInvitationController.java | 1 - .../UserResiRegisterVisitController.java | 6 ++--- .../epmet/controller/UserRoleController.java | 2 +- .../controller/UserWechatController.java | 12 ++++++---- .../epmet/controller/VolunteerController.java | 2 -- .../java/com/epmet/dao/GovStaffRoleDao.java | 3 +-- .../java/com/epmet/dao/GridVisitedDao.java | 4 +--- .../main/java/com/epmet/dao/IcVaccineDao.java | 1 - .../com/epmet/dao/RegisterRelationDao.java | 3 +-- .../src/main/java/com/epmet/dao/RoleDao.java | 4 +--- .../com/epmet/dao/StaffGridVisitedDao.java | 3 +-- .../main/java/com/epmet/dao/UserRoleDao.java | 2 -- .../com/epmet/entity/CustomerStaffEntity.java | 1 - .../com/epmet/entity/GovStaffRoleEntity.java | 3 --- .../com/epmet/entity/GridLatestEntity.java | 1 - .../com/epmet/entity/GridVisitedEntity.java | 1 - .../com/epmet/entity/IcNatRelationEntity.java | 3 --- .../com/epmet/entity/IcOldPeopleEntity.java | 3 --- .../com/epmet/entity/IcResiDemandEntity.java | 3 --- .../com/epmet/entity/IcSpecialEntity.java | 3 --- .../com/epmet/entity/IcUnemployedEntity.java | 3 --- .../com/epmet/entity/IcUnitedFrontEntity.java | 3 --- .../com/epmet/entity/IcVaccineEntity.java | 1 - .../com/epmet/entity/IcVolunteerEntity.java | 3 --- .../java/com/epmet/entity/OperUserEntity.java | 3 --- .../java/com/epmet/entity/RoleEntity.java | 5 +--- .../com/epmet/entity/StaffRoleEntity.java | 3 --- .../com/epmet/entity/UserAdviceEntity.java | 1 - .../com/epmet/enums/IcResiUserTableEnum.java | 3 --- .../com/epmet/excel/PcWorkListExport.java | 4 ---- .../handler/IcVaccineExcelImportListener.java | 2 -- .../excel/support/ExportResiUserItemDTO.java | 4 +++- .../com/epmet/feign/MessageFeignClient.java | 1 - .../OperRoleUserFeignClientFallBack.java | 1 - .../com/epmet/service/GridVisitedService.java | 3 +-- .../epmet/service/IcMoveInRecordService.java | 14 +---------- .../service/IcUserChangeDetailedService.java | 3 +-- .../service/PatrolRoutineWorkService.java | 1 - .../service/StaffGridVisitedService.java | 4 ++-- .../StatsStaffPatrolRecordDailyService.java | 6 ++--- .../BadgeCertificationConfigServiceImpl.java | 5 ++-- .../impl/IcMoveInRecordServiceImpl.java | 24 ------------------- .../epmet/service/impl/IcNatServiceImpl.java | 2 -- .../impl/IcStatsResiWarnServiceImpl.java | 7 ++---- .../impl/IcVaccineRelationServiceImpl.java | 4 ++-- .../impl/ResiUserBadgeServiceImpl.java | 5 ++-- .../impl/StaffGridVisitedServiceImpl.java | 5 ++-- ...tatsStaffPatrolRecordDailyServiceImpl.java | 6 ++--- .../service/impl/UserAdviceServiceImpl.java | 7 ++++-- 135 files changed, 195 insertions(+), 343 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeCertificationConfigDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeCertificationConfigDTO.java index 5eb6e95749..55b50ee4b9 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeCertificationConfigDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeDTO.java index 719675c301..8f0290ac52 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java index 72914073bb..25b5dbf56b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java +++ b/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; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GovStaffRoleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GovStaffRoleDTO.java index 44845e753f..014f2a9076 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GovStaffRoleDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridLatestDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridLatestDTO.java index 98a6176f5f..98ef82f1b4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridLatestDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridVisitedDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridVisitedDTO.java index 72eea402f8..78b43c058d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridVisitedDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEnsureHouseDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEnsureHouseDTO.java index 1f53e4206a..05403600c9 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEnsureHouseDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java index 21499eef9a..ef59cb992b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcMoveInRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcMoveInRecordDTO.java index 329c44314b..f812ba00dd 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcMoveInRecordDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatRelationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatRelationDTO.java index eade3aac7b..69654aca84 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatRelationDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcOldPeopleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcOldPeopleDTO.java index 789e5ff1da..60809718eb 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcOldPeopleDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiDemandDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiDemandDTO.java index a04efa1096..7b9da87c66 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiDemandDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiVaccineDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiVaccineDTO.java index 57ea1109e3..89a4f37452 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiVaccineDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcSpecialDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcSpecialDTO.java index bc9458b2d0..0319ce3e03 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcSpecialDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcStatsResiWarnDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcStatsResiWarnDTO.java index 006cf7fb67..50c6f6ceaa 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcStatsResiWarnDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 85f0e83a89..508f8dc2ad 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/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; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnemployedDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnemployedDTO.java index 85a3e63feb..bc7109fed4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnemployedDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnitedFrontDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnitedFrontDTO.java index c6be71bc6c..effcaa8925 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnitedFrontDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeDetailedDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeDetailedDTO.java index 81c3cd0780..3d0c3271af 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeDetailedDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserTransferRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserTransferRecordDTO.java index 1b6992a53c..00dbb2b770 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserTransferRecordDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java index 73a5d69fe0..585b4ef550 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineRelationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineRelationDTO.java index 3dfbaf85cd..7939293b5b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineRelationDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVolunteerDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVolunteerDTO.java index 4a49527d42..3bc1ac5e7f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVolunteerDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/OperUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/OperUserDTO.java index 95fafdccbd..61688b5dbc 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/OperUserDTO.java +++ b/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; - /** * 运营人员表 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java index 68c2e4d895..0cc3ea4019 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ResiUserBadgeDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ResiUserBadgeDTO.java index 09417f15f4..923e498e5a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ResiUserBadgeDTO.java +++ b/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"; } -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RoleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RoleDTO.java index a1d1c0adbd..96bb093c81 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RoleDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffAgencyVisitedDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffAgencyVisitedDTO.java index 45c5c443a8..2cdb9ee5f0 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffAgencyVisitedDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffGridVisitedDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffGridVisitedDTO.java index 328aafad2e..74e9afae88 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffGridVisitedDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java index 753bc36884..b596bdd919 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StatsStaffPatrolRecordDailyDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StatsStaffPatrolRecordDailyDTO.java index dfbc170559..8c0ac8b48f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StatsStaffPatrolRecordDailyDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserAdviceDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserAdviceDTO.java index 6a26e01d39..7e245bec62 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserAdviceDTO.java +++ b/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; /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserInvitationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserInvitationDTO.java index 9fd3d260a8..737a8d621b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserInvitationDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiRegisterVisitDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiRegisterVisitDTO.java index fc472c660d..a2a24ec20d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiRegisterVisitDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserWechatDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserWechatDTO.java index 1d794e0c30..0af7a4a616 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserWechatDTO.java +++ b/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; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddBadgeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddBadgeFormDTO.java index ceb07d1651..256d1d51b5 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddBadgeFormDTO.java +++ b/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; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java index 9e0fd23933..39ca1de27d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java +++ b/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: diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AttentionDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AttentionDetailFormDTO.java index 484cc4e2d2..92c62dbbfa 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AttentionDetailFormDTO.java +++ b/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; /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CancelAttentionPackageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CancelAttentionPackageFormDTO.java index 183c59195f..6867827cd4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CancelAttentionPackageFormDTO.java +++ b/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; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CustomerAgencyUserRoleFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CustomerAgencyUserRoleFormDTO.java index 392e995b86..9137aa9b5a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CustomerAgencyUserRoleFormDTO.java +++ b/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 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DemandUserFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DemandUserFormDTO.java index 27e59a526d..56822cbe2c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DemandUserFormDTO.java +++ b/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; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditBadgeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditBadgeFormDTO.java index 7b8cc1fb4a..ac9e16ed84 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditBadgeFormDTO.java +++ b/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; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EnableStaffFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EnableStaffFormDTO.java index beb2fae20f..e2212b7608 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EnableStaffFormDTO.java +++ b/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 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GetRoleKeyListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GetRoleKeyListFormDTO.java index 263b263a8f..4ec02f0cf0 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GetRoleKeyListFormDTO.java +++ b/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; /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserWarnNoticeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserWarnNoticeFormDTO.java index 0179217f1d..6b18910d0a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserWarnNoticeFormDTO.java +++ b/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; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/NatListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/NatListFormDTO.java index 85b56ecb29..3e1ac11b2d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/NatListFormDTO.java +++ b/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; /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java index da2e899d96..45f9152909 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java +++ b/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 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiInfoSubmitFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiInfoSubmitFormDTO.java index c675b309dc..db5b074e59 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiInfoSubmitFormDTO.java +++ b/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; /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java index 7aadaf3fcb..75a2eee8e0 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java +++ b/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; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffBasicInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffBasicInfoFormDTO.java index 5548431919..0f32479cc0 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffBasicInfoFormDTO.java +++ b/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; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StatsResiWarnCountFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StatsResiWarnCountFormDTO.java index 7fba162e27..485c4f2e17 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StatsResiWarnCountFormDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/TagCustomerFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/TagCustomerFormDTO.java index 62dd66c8a0..761eb87eb2 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/TagCustomerFormDTO.java +++ b/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 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ThirdCustomerStaffFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ThirdCustomerStaffFormDTO.java index 181fb40e70..fabcd22200 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ThirdCustomerStaffFormDTO.java +++ b/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; /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserBasicInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserBasicInfoFormDTO.java index cfe7f721c8..f9cdd21d90 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserBasicInfoFormDTO.java +++ b/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; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserInvitationFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserInvitationFormDTO.java index f0bb36cab8..c36a1a0355 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserInvitationFormDTO.java +++ b/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 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserOperListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserOperListFormDTO.java index 84578f7abb..7d265b1463 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserOperListFormDTO.java +++ b/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; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java index 23da9d859b..6d365c9955 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java +++ b/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; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerCommonFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerCommonFormDTO.java index 1cea3c46c4..5a29f8bf69 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerCommonFormDTO.java +++ b/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; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/WxUserInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/WxUserInfoFormDTO.java index 832f3c127c..a31cc8587b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/WxUserInfoFormDTO.java +++ b/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; /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceListResultDTO.java index f9be8de0b8..8e0f5ca0bd 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceListResultDTO.java +++ b/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; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerStaffRoleListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerStaffRoleListResultDTO.java index 66b843e924..f994254655 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerStaffRoleListResultDTO.java +++ b/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查询人员在客户下的角色列表-接口返参 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java index 9b80c69701..26e056f24e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java +++ b/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; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleResultDTO.java index 3302c18b97..9bffb84f0a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleResultDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleTemplateDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleTemplateDTO.java index 6a83a0b552..bbdba74e4b 100755 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleTemplateDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java index 92eef807fd..9ec9b5956d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java +++ b/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 【迁入管理】列表--接口返参 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java index 9d5f1453d3..056acbc584 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java +++ b/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 houseUserList; - + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRecordDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRecordDetailResultDTO.java index ee1b9e172d..ad9c02ba50 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRecordDetailResultDTO.java +++ b/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 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/QueryOperUserResultDto.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/QueryOperUserResultDto.java index c9ebe973db..360f706725 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/QueryOperUserResultDto.java +++ b/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 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RoleResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RoleResultDTO.java index c6424eca94..ceb7539914 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RoleResultDTO.java +++ b/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; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StatsdataResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StatsdataResultDTO.java index 307309f01c..87eaa23625 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StatsdataResultDTO.java +++ b/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 网格员例行工作数据统计 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBadgeListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBadgeListResultDTO.java index 940955725c..0d82016f74 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBadgeListResultDTO.java +++ b/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 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/enums/AttentionTypeEnum.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/enums/AttentionTypeEnum.java index 3e40404466..0e002dc2a8 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/enums/AttentionTypeEnum.java +++ b/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; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java index 01bb8ca3f3..56ac079839 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java +++ b/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; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java index b1b07c4e9e..af72b5c9cc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java +++ b/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; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java index 4989355df4..6798bc40fd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java +++ b/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; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java index 9c96f77ace..543493a395 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java +++ b/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; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcStatsResiWarnController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcStatsResiWarnController.java index 5b681b639b..45b2d877da 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcStatsResiWarnController.java +++ b/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().ok(icStatsResiWarnService.personWarnLeftPie(tokenDto)); } -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineRelationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineRelationController.java index b24494d2c9..8e5905b035 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineRelationController.java +++ b/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; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LbTestController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LbTestController.java index a7e8d14592..b304e1428d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LbTestController.java +++ b/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 { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java index 65e8b455fa..8f0322f02e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java +++ b/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); } -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RoleController.java index 98ec4c998f..b21ccdda34 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RoleController.java +++ b/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>().ok(roleService.getUserRoleKeyList(formDTO)); } -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java index 40f45a45ba..ef63dbd8d2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java +++ b/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().ok(staffAgencyVisitedService.getStaffBasicInfo(formDTO)); } -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffGridVisitedController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffGridVisitedController.java index c79e3439b2..cfcaa166cb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffGridVisitedController.java +++ b/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); } -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java index c9bcc9d905..f45d0b2cf2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java +++ b/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; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsStaffPatrolRecordDailyController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsStaffPatrolRecordDailyController.java index 06bfa933d2..6a0067a91c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsStaffPatrolRecordDailyController.java +++ b/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> patrolInfo(@RequestParam("agencyId")String agencyId){ return new Result>().ok(statsStaffPatrolRecordDailyService.patrolInfo(agencyId)); } -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceImgController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceImgController.java index 2be0871e68..21fa2e3606 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceImgController.java +++ b/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); } -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserInvitationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserInvitationController.java index fc268ac8dd..0922ed1cce 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserInvitationController.java +++ b/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; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java index aea84d1a23..472e74e395 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java +++ b/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 init(@RequestBody ResiRegisterFormDTO resiRegisterFormDTO){ return userResiRegisterVisitService.init(resiRegisterFormDTO); } -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java index ea4c5b010e..99b07f9c36 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java +++ b/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; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserWechatController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserWechatController.java index d077a55188..b6cd18f343 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserWechatController.java +++ b/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>().ok(userWechatService.selectUserHeadPhotoByUserId(certifiedResultDTOS)); } -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/VolunteerController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/VolunteerController.java index 51e5020b31..8b5cac02fc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/VolunteerController.java +++ b/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; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java index 9753829066..bd8d6a633a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java +++ b/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 { * @Author sun **/ int upNameOrDescription(UpGovRoleFormDTO formDTO); -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java index 4efb9ad241..c6a8751eb1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java +++ b/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 { int updateByVisitedId(GridVisitedDTO dto); void deleteBatch(@Param("ids") List ids); -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java index 3868760fab..0471d9496b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java +++ b/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; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java index 480c8b52fa..6c6e3aa4fb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java +++ b/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 { * @date 2021/12/30 3:14 下午 */ RegisterRelationDTO resiRelationInfo(@Param("userId")String userId); -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java index c8ceda37c5..4ec14a21a6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java +++ b/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 { * @Description 获取居民端角色列表 */ List selectResiRoleList(); -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java index 554da4a12d..fc1f23dcf1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java +++ b/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 { **/ void updateRecordTime(String id, Date date); -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java index dea59dfff7..e8a47ab9a1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java +++ b/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; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java index a352125fa3..86bedb482c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java +++ b/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; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleEntity.java index 6ac107e80a..785426fe04 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleEntity.java +++ b/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; - /** * 政府端角色表 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridLatestEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridLatestEntity.java index 254829c16f..7a553346fc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridLatestEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridLatestEntity.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; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridVisitedEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridVisitedEntity.java index a6cb62c704..31982cd353 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridVisitedEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridVisitedEntity.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; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatRelationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatRelationEntity.java index ce74babe94..7dd51b4d55 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatRelationEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatRelationEntity.java @@ -3,13 +3,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 核酸记录关系表 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcOldPeopleEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcOldPeopleEntity.java index ba5835c5da..c554ea1257 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcOldPeopleEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcOldPeopleEntity.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; - /** * 老年人 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiDemandEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiDemandEntity.java index fa4da89b59..c3f5bac002 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiDemandEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiDemandEntity.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; - /** * 居民需求 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcSpecialEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcSpecialEntity.java index 4a63f28cf5..114ad7e2e5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcSpecialEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcSpecialEntity.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; - /** * 特殊人群 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnemployedEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnemployedEntity.java index 9e00e6527f..181103125e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnemployedEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnemployedEntity.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; - /** * 失业人员 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnitedFrontEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnitedFrontEntity.java index 71b0939e67..cd328584ac 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnitedFrontEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnitedFrontEntity.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; - /** * 统战人员 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java index 9bef5581d7..215fd77173 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java @@ -3,7 +3,6 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVolunteerEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVolunteerEntity.java index b5693d7e7f..bcd3340965 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVolunteerEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVolunteerEntity.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; - /** * 志愿者 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/OperUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/OperUserEntity.java index 1cc5261936..cc4e0fbb5f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/OperUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/OperUserEntity.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; - /** * 运营人员表 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RoleEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RoleEntity.java index 45652df21f..2e86e5a2f2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RoleEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RoleEntity.java @@ -18,15 +18,12 @@ 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; - /** - * 角色表 + * 角色表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-30 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java index 61e8db0fcd..602d0357b7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java @@ -20,13 +20,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 工作人员-角色关系表 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java index 9340acd044..2d6352569c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.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; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java index 65bafdd551..3a4e561c77 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java @@ -1,9 +1,6 @@ package com.epmet.enums; import lombok.AllArgsConstructor; -import lombok.Data; - -import java.util.List; /** * @Description 描述 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PcWorkListExport.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PcWorkListExport.java index e553e205e5..316ff22aa7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PcWorkListExport.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PcWorkListExport.java @@ -1,16 +1,12 @@ package com.epmet.excel; -import cn.afterturn.easypoi.excel.annotation.Excel; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import java.util.List; - /** * @Author zxc * @DateTime 2022/1/5 10:00 上午 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcVaccineExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcVaccineExcelImportListener.java index e12d4549a9..bb10e9c185 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcVaccineExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcVaccineExcelImportListener.java @@ -7,9 +7,7 @@ import com.epmet.commons.tools.exception.ValidateException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.entity.IcVaccineEntity; -import com.epmet.excel.data.IcNatImportExcelData; import com.epmet.excel.data.IcVaccineImportExcelData; -import com.epmet.service.impl.IcNatServiceImpl; import com.epmet.service.impl.IcVaccineServiceImpl; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/support/ExportResiUserItemDTO.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/support/ExportResiUserItemDTO.java index 8f7cb6de14..c05d9661f6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/support/ExportResiUserItemDTO.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/support/ExportResiUserItemDTO.java @@ -4,7 +4,9 @@ import com.epmet.dto.result.FormItemResult; import lombok.Data; import java.io.Serializable; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; /** * desc: diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/MessageFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/MessageFeignClient.java index e0be305d7f..005670627a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/MessageFeignClient.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/MessageFeignClient.java @@ -9,7 +9,6 @@ import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; import java.util.List; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/OperRoleUserFeignClientFallBack.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/OperRoleUserFeignClientFallBack.java index 39fc8aae8a..c53f3adc60 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/OperRoleUserFeignClientFallBack.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/OperRoleUserFeignClientFallBack.java @@ -6,7 +6,6 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.feign.OperRoleUserFeignClient; import org.springframework.stereotype.Component; - import java.util.List; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridVisitedService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridVisitedService.java index 717edcb011..8bfb4ea6d8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridVisitedService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridVisitedService.java @@ -20,7 +20,6 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.GridLatestDTO; import com.epmet.dto.GridVisitedDTO; import com.epmet.dto.form.VisitedFormDTO; import com.epmet.entity.GridVisitedEntity; @@ -100,4 +99,4 @@ public interface GridVisitedService extends BaseService { * @param formDTO */ Result saveVisitedRecord(VisitedFormDTO formDTO); -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java index 07eef5d36a..8af41fdc78 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java @@ -8,8 +8,6 @@ import com.epmet.dto.form.IcMoveInListFormDTO; import com.epmet.dto.result.IcMoveInListResultDTO; import com.epmet.entity.IcMoveInRecordEntity; -import java.util.Map; - /** * 迁入管理记录 * @@ -18,16 +16,6 @@ import java.util.Map; */ public interface IcMoveInRecordService extends BaseService { - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2022-05-09 - */ - PageData page(Map params); - /** * 默认查询 * @@ -79,4 +67,4 @@ public interface IcMoveInRecordService extends BaseService void delete(String[] ids); IcMoveInListResultDTO detail(IcMoveInListFormDTO formDTO); -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java index f42238b5cf..ce2747ddcd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java @@ -19,7 +19,6 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.entity.IcUserChangeDetailedEntity; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -37,4 +36,4 @@ public interface IcUserChangeDetailedService extends BaseService icUserIds); -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PatrolRoutineWorkService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PatrolRoutineWorkService.java index 81653fea19..0023dea98e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PatrolRoutineWorkService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PatrolRoutineWorkService.java @@ -27,7 +27,6 @@ import com.epmet.entity.PatrolRoutineWorkEntity; import com.github.pagehelper.Page; import javax.servlet.http.HttpServletResponse; -import java.util.List; /** * 巡查例行工作 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffGridVisitedService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffGridVisitedService.java index e7989a7de1..05c296d274 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffGridVisitedService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffGridVisitedService.java @@ -22,8 +22,8 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.StaffGridVisitedDTO; import com.epmet.dto.form.LatestGridFormDTO; -import com.epmet.dto.result.CustomerGridByUserIdResultDTO; import com.epmet.dto.form.StaffGridVisitedFormDTO; +import com.epmet.dto.result.CustomerGridByUserIdResultDTO; import com.epmet.entity.StaffGridVisitedEntity; import java.util.List; @@ -114,4 +114,4 @@ public interface StaffGridVisitedService extends BaseService patrolInfo(String agencyId); -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeCertificationConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeCertificationConfigServiceImpl.java index 2af4587368..dcd93d1fa1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeCertificationConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeCertificationConfigServiceImpl.java @@ -20,16 +20,15 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.BadgeCertificationConfigDao; import com.epmet.dto.BadgeCertificationConfigDTO; import com.epmet.entity.BadgeCertificationConfigEntity; import com.epmet.service.BadgeCertificationConfigService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -146,4 +145,4 @@ public class BadgeCertificationConfigServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IcMoveInRecordDTO.class); - } - @Override public PageData list(IcMoveInListFormDTO formDTO) { //列表/导出查询 @@ -123,15 +108,6 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); } - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - @Override public IcMoveInRecordDTO get(String id) { IcMoveInRecordEntity entity = baseDao.selectById(id); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index 92712c498b..d44c421e5a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -25,7 +25,6 @@ import com.epmet.dao.UserBaseInfoDao; import com.epmet.dto.IcNatDTO; import com.epmet.dto.IcNoticeDTO; import com.epmet.dto.form.AddIcNatFormDTO; -import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.form.MyNatListFormDTO; import com.epmet.dto.form.SendNoticeFormDTO; import com.epmet.dto.result.*; @@ -46,7 +45,6 @@ import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.http.entity.ContentType; import org.apache.poi.util.IOUtils; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcStatsResiWarnServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcStatsResiWarnServiceImpl.java index 42bf629675..26ba2b9e9c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcStatsResiWarnServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcStatsResiWarnServiceImpl.java @@ -20,6 +20,7 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetException; @@ -27,17 +28,13 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcStatsResiWarnDao; -import com.epmet.dto.IcResiCategoryWarnConfigDTO; import com.epmet.dto.IcStatsResiWarnDTO; -import com.epmet.dto.PersonWarnLeftPieDTO; import com.epmet.dto.result.CustomerCategoryShowAndWarnListResultDTO; import com.epmet.dto.result.PersonWarnLeftPieResultDTO; import com.epmet.entity.IcStatsResiWarnEntity; import com.epmet.feign.OperCustomizeOpenFeignClient; -import com.epmet.redis.IcStatsResiWarnRedis; import com.epmet.service.IcStatsResiWarnService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -169,4 +166,4 @@ public class IcStatsResiWarnServiceImpl extends BaseServiceImpl().ok(gridResult); } -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsStaffPatrolRecordDailyServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsStaffPatrolRecordDailyServiceImpl.java index 03467b2c30..b1f0005f6a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsStaffPatrolRecordDailyServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsStaffPatrolRecordDailyServiceImpl.java @@ -5,12 +5,12 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.constant.PatrolConstant; import com.epmet.dao.StatsStaffPatrolRecordDailyDao; +import com.epmet.dto.form.PatrolCountFormDTO; +import com.epmet.dto.result.PatrolCountResultDTO; import com.epmet.dto.result.PatrolYuShanResultDTO; import com.epmet.dto.result.SelectPatrolCountResultDTO; import com.epmet.entity.StatsStaffPatrolRecordDailyEntity; import com.epmet.service.StatsStaffPatrolRecordDailyService; -import com.epmet.dto.form.PatrolCountFormDTO; -import com.epmet.dto.result.PatrolCountResultDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -60,4 +60,4 @@ public class StatsStaffPatrolRecordDailyServiceImpl extends BaseServiceImpl patrolInfo(String agencyId) { return baseDao.patrolInfo(agencyId); } -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java index 3f189b5426..a6480dca76 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java @@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; @@ -32,7 +33,6 @@ import com.epmet.commons.tools.scan.param.TextScanParamDTO; import com.epmet.commons.tools.scan.param.TextTaskDTO; import com.epmet.commons.tools.scan.result.SyncScanResult; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.ScanContentUtils; import com.epmet.constant.UserAdviceConstant; @@ -41,7 +41,10 @@ import com.epmet.dto.CustomerDTO; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.UserAdviceDTO; import com.epmet.dto.form.*; -import com.epmet.dto.result.*; +import com.epmet.dto.result.AdviceDetailResultDTO; +import com.epmet.dto.result.AdviceListResultDTO; +import com.epmet.dto.result.MyAdviceListResultDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.entity.UserAdviceEntity; import com.epmet.entity.UserAdviceImgEntity; import com.epmet.feign.GovOrgOpenFeignClient; From 8961ec7bb640954e7493736e7bb0b64335a6b707 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 12 May 2022 16:45:38 +0800 Subject: [PATCH 088/102] import --- .../java/com/epmet/entity/BadgeCertificationConfigEntity.java | 3 --- .../main/java/com/epmet/entity/GovStaffRoleTemplateEntity.java | 3 --- .../com/epmet/entity/IcEpidemicSpecialAttentionEntity.java | 3 --- .../src/main/java/com/epmet/entity/IcFollowUpRecordEntity.java | 1 - .../src/main/java/com/epmet/entity/IcStatsResiWarnEntity.java | 3 --- .../main/java/com/epmet/entity/IcTripReportRecordEntity.java | 1 - .../main/java/com/epmet/entity/IcVaccineRelationEntity.java | 3 --- .../java/com/epmet/entity/PatrolRoutineWorkTypeEntity.java | 3 --- .../src/main/java/com/epmet/entity/RegisterRelationEntity.java | 3 --- .../src/main/java/com/epmet/entity/ResiUserBadgeEntity.java | 3 --- .../main/java/com/epmet/entity/StaffAgencyVisitedEntity.java | 3 --- .../src/main/java/com/epmet/entity/StaffGridVisitedEntity.java | 3 --- .../main/java/com/epmet/entity/StaffPatrolDetailEntity.java | 1 - .../main/java/com/epmet/entity/StaffPatrolRecordEntity.java | 1 - .../com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java | 1 - .../src/main/java/com/epmet/entity/UserAdviceImgEntity.java | 3 --- .../com/epmet/entity/UserBadgeCertificateRecordEntity.java | 3 +-- .../src/main/java/com/epmet/entity/UserInvitationEntity.java | 1 - .../java/com/epmet/entity/UserResiRegisterVisitEntity.java | 1 - .../main/java/com/epmet/service/impl/IcVaccineServiceImpl.java | 3 --- .../main/java/com/epmet/service/impl/OperUserServiceImpl.java | 2 +- .../src/main/java/com/epmet/service/impl/RoleServiceImpl.java | 2 +- .../main/java/com/epmet/service/impl/StaffRoleServiceImpl.java | 1 - 23 files changed, 3 insertions(+), 48 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeCertificationConfigEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeCertificationConfigEntity.java index 90a6001940..a78c6271be 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeCertificationConfigEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeCertificationConfigEntity.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; - /** * 徽章认证配置 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleTemplateEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleTemplateEntity.java index cd87413736..3ee34582be 100755 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleTemplateEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleTemplateEntity.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; - /** * 政府端角色模板表 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java index 52e6ff132f..25a853dd55 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java @@ -1,13 +1,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; - /** * 疫情特别关注 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcFollowUpRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcFollowUpRecordEntity.java index 8f976d02b2..810b40d588 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcFollowUpRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcFollowUpRecordEntity.java @@ -1,7 +1,6 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcStatsResiWarnEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcStatsResiWarnEntity.java index fd636c095b..8ec7d9aeae 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcStatsResiWarnEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcStatsResiWarnEntity.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; - /** * 预警统计表 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index f14eb97013..7182332216 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -1,7 +1,6 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java index 0c1b6c88ac..d4cfb6ad48 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java @@ -3,13 +3,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 疫苗接种记录关系表 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkTypeEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkTypeEntity.java index bf18e08bee..d3361c803d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkTypeEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkTypeEntity.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; - /** * 巡查例行工作 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.java index 100ea4c9ec..ba4ff82087 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.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; - /** * 注册关系表 用于统计客户网格的注册居民数 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ResiUserBadgeEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ResiUserBadgeEntity.java index 4087df8fc6..9906531528 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ResiUserBadgeEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ResiUserBadgeEntity.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; - /** * 用户徽章关系表 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffAgencyVisitedEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffAgencyVisitedEntity.java index 44c0ab2f51..bfbaf148e5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffAgencyVisitedEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffAgencyVisitedEntity.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; - /** * 工作人员进入组织日志表 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffGridVisitedEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffGridVisitedEntity.java index 9c6ffe281e..e0c1a4a8c2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffGridVisitedEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffGridVisitedEntity.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; - /** * 工作人员进入网格日志表 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolDetailEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolDetailEntity.java index d90192e218..5334ba2465 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolDetailEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolDetailEntity.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; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolRecordEntity.java index ab52721c9e..d082a56f47 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolRecordEntity.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; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java index 6a2ee8ab04..e1cffc3be7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.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; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceImgEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceImgEntity.java index 02215059c4..374a63c2b2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceImgEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceImgEntity.java @@ -20,13 +20,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 用户建议图片 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java index 867ae11bdb..a032c42fea 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.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; @@ -39,7 +38,7 @@ public class UserBadgeCertificateRecordEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; /** - * 客户Id + * 客户Id */ private String customerId; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserInvitationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserInvitationEntity.java index 6307c323ba..e146328d59 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserInvitationEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserInvitationEntity.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; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserResiRegisterVisitEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserResiRegisterVisitEntity.java index 0331f222ec..c44fc959d2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserResiRegisterVisitEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserResiRegisterVisitEntity.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; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java index f138bba0ba..1f33bbb603 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java @@ -19,7 +19,6 @@ import com.epmet.dao.IcResiUserDao; import com.epmet.dao.IcVaccineDao; import com.epmet.dao.IcVaccineRelationDao; import com.epmet.dto.IcVaccineDTO; -import com.epmet.dto.UserAdviceDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.form.VaccineListFormDTO; import com.epmet.dto.result.IcVaccineListResultDTO; @@ -29,7 +28,6 @@ import com.epmet.dto.result.VaccineListDTO; import com.epmet.entity.IcResiUserEntity; import com.epmet.entity.IcVaccineEntity; import com.epmet.entity.IcVaccineRelationEntity; -import com.epmet.entity.UserAdviceEntity; import com.epmet.excel.data.IcNatImportExcelData; import com.epmet.excel.data.IcVaccineImportExcelData; import com.epmet.excel.handler.IcVaccineExcelImportListener; @@ -43,7 +41,6 @@ import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.http.entity.ContentType; import org.apache.poi.util.IOUtils; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java index f3dddd6a59..2ebbcb49ac 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java @@ -22,11 +22,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.AppClientConstant; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.enums.SuperAdminEnum; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.password.PasswordUtils; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.OperUserDao; import com.epmet.dto.OperUserDTO; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java index be443d9651..3657bddf69 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java @@ -21,9 +21,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.AppClientConstant; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.RoleDao; import com.epmet.dao.StaffRoleDao; import com.epmet.dao.UserRoleDao; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java index 6b69b9506b..b8f34b04c9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java @@ -32,7 +32,6 @@ import com.epmet.entity.StaffRoleEntity; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.StaffRoleService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.ListUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; From cca5361014a8912605a36d1c1161fc70d11ecbdd Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 12 May 2022 17:01:42 +0800 Subject: [PATCH 089/102] =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcBirthRecordController.java | 18 ++++++------- .../controller/IcMoveInRecordController.java | 26 +++++++++---------- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java index 8983e1f8c6..0dec64a35f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java @@ -48,23 +48,23 @@ public class IcBirthRecordController { private IcBirthRecordService icBirthRecordService; @RequestMapping("page") - @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) - public Result> page(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordFormDTO formDTO){ + @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + public Result> page(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); PageData page = icBirthRecordService.page(formDTO); return new Result>().ok(page); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { IcBirthRecordDTO data = icBirthRecordService.get(id); return new Result().ok(data); } @NoRepeatSubmit @PostMapping("save") - public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcBirthRecordDTO dto){ + public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcBirthRecordDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); icBirthRecordService.save(tokenDto, dto); @@ -73,7 +73,7 @@ public class IcBirthRecordController { @NoRepeatSubmit @PostMapping("update") - public Result update(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordUpdateDTO dto){ + public Result update(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordUpdateDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); icBirthRecordService.update(tokenDto, dto); @@ -81,7 +81,7 @@ public class IcBirthRecordController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); icBirthRecordService.delete(ids); @@ -94,7 +94,6 @@ public class IcBirthRecordController { formDTO.setStaffId(tokenDto.getUserId()); formDTO.setIsPage(false); formDTO.setPageSize(NumConstant.TEN_THOUSAND); - int pageNo = formDTO.getPageNo(); ExcelWriter excelWriter = null; AtomicInteger i = new AtomicInteger(1); @@ -110,7 +109,7 @@ public class IcBirthRecordController { item.setIndex(i.getAndIncrement()); }); excelWriter.write(list, writeSheet); - formDTO.setPageNo(pageNo++); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); } while (CollectionUtils.isNotEmpty(page.getList()) && page.getList().size() == formDTO.getPageSize()); } catch (Exception e) { log.error("export exception", e); @@ -122,5 +121,4 @@ public class IcBirthRecordController { } - } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java index 6798bc40fd..cb8fc0f7a4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java @@ -50,22 +50,22 @@ public class IcMoveInRecordController { private IcMoveInRecordService icMoveInRecordService; - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { IcMoveInRecordDTO data = icMoveInRecordService.get(id); return new Result().ok(data); } @RequestMapping("list") - @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) - public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO){ + @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result>().ok(icMoveInRecordService.list(formDTO)); } @NoRepeatSubmit @PostMapping("add") - public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInAddEditFormDTO dto){ + public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInAddEditFormDTO dto) { ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); dto.setCustomerId(tokenDto.getCustomerId()); dto.setUserId(tokenDto.getUserId()); @@ -74,7 +74,7 @@ public class IcMoveInRecordController { } @PostMapping("edit") - public Result update(@RequestBody IcMoveInAddEditFormDTO dto){ + public Result update(@RequestBody IcMoveInAddEditFormDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); icMoveInRecordService.update(dto); @@ -82,7 +82,7 @@ public class IcMoveInRecordController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); icMoveInRecordService.delete(ids); @@ -95,9 +95,8 @@ public class IcMoveInRecordController { formDTO.setIsPage(false); ExcelWriter excelWriter = null; formDTO.setPageSize(NumConstant.TEN_THOUSAND); - int pageNo = NumConstant.ONE; try { - String fileName = "迁入管理"+DateUtils.format(new Date())+".xlsx"; + String fileName = "迁入管理" + DateUtils.format(new Date()) + ".xlsx"; excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcMoveInRecordExcel.class).build(); WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); PageData data = null; @@ -105,12 +104,12 @@ public class IcMoveInRecordController { do { data = icMoveInRecordService.list(formDTO); list = ConvertUtils.sourceToTarget(data.getList(), IcMoveInRecordExcel.class); - formDTO.setPageNo(++pageNo); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); excelWriter.write(list, writeSheet); } while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); - }catch (Exception e){ + } catch (Exception e) { log.error("export exception", e); - }finally { + } finally { if (excelWriter != null) { excelWriter.finish(); } @@ -118,12 +117,11 @@ public class IcMoveInRecordController { } @RequestMapping("detail") - public Result detail(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO){ + public Result detail(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result().ok(icMoveInRecordService.detail(formDTO)); } - } From 308c29bc591434868a924d6ac9e7fcf0ba189db7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 12 May 2022 17:43:45 +0800 Subject: [PATCH 090/102] =?UTF-8?q?import=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/NewsDTO.java | 2 +- .../main/java/com/epmet/dto/SysDeptDTO.java | 3 +- .../java/com/epmet/dto/SysDictDataDTO.java | 2 +- .../java/com/epmet/dto/SysDictTypeDTO.java | 3 +- .../main/java/com/epmet/dto/SysMenuDTO.java | 2 +- .../main/java/com/epmet/dto/SysParamsDTO.java | 3 +- .../main/java/com/epmet/dto/SysRegionDTO.java | 3 +- .../main/java/com/epmet/dto/SysRoleDTO.java | 3 +- .../main/java/com/epmet/dto/SysUserDTO.java | 3 +- .../dto/region/LogOperationResultDTO.java | 5 --- .../java/com/epmet/dto/region/Region.java | 1 - .../com/epmet/remote/ParamsRemoteService.java | 2 +- .../controller/LogOperationController.java | 1 - .../epmet/controller/SysDeptController.java | 4 +- .../controller/SysDictTypeController.java | 6 +-- .../epmet/controller/SysMenuController.java | 8 ++-- .../epmet/controller/SysRegionController.java | 6 +-- .../epmet/controller/SysRoleController.java | 5 +-- .../epmet/controller/SysUserController.java | 11 +++-- .../com/epmet/entity/CorsConfigEntity.java | 3 -- .../com/epmet/entity/LogOperationEntity.java | 1 - .../mq/listener/RocketMQConsumerRegister.java | 9 +--- .../listener/ProjectOperationLogListener.java | 1 - .../java/com/epmet/service/NewsService.java | 2 +- .../com/epmet/service/SysDeptService.java | 2 +- .../com/epmet/service/SysDictTypeService.java | 2 +- .../com/epmet/service/SysLogErrorService.java | 2 +- .../com/epmet/service/SysLogLoginService.java | 2 +- .../epmet/service/SysLogOperationService.java | 2 +- .../com/epmet/service/SysMenuService.java | 2 +- .../com/epmet/service/SysParamsService.java | 2 +- .../com/epmet/service/SysRegionService.java | 2 +- .../com/epmet/service/SysResourceService.java | 2 +- .../com/epmet/service/SysRoleService.java | 2 +- .../com/epmet/service/SysUserService.java | 2 +- .../service/impl/CorsConfigServiceImpl.java | 1 - .../service/impl/LogOperationServiceImpl.java | 1 - .../epmet/service/impl/NewsServiceImpl.java | 1 - .../epmet/controller/BackDoorController.java | 1 - .../epmet/controller/GovLoginController.java | 1 - .../epmet/controller/GovWebController.java | 2 - .../epmet/controller/IcLoinController.java | 5 ++- .../controller/PublicUserLoginController.java | 5 --- .../com/epmet/controller/SsoController.java | 2 +- .../controller/ThirdLoginController.java | 3 -- .../java/com/epmet/jwt/JwtTokenUtils.java | 2 - .../service/impl/GovLoginServiceImpl.java | 1 - .../epmet/service/impl/GovWebServiceImpl.java | 2 - .../service/impl/IcLoginServiceImpl.java | 4 +- .../impl/PublicUserLoginServiceImpl.java | 5 ++- .../service/impl/ResourceServiceImpl.java | 2 +- .../src/test/java/com/epmet/TokenGenTest.java | 3 -- .../resources/template/add-or-update.vue.vm | 5 ++- .../src/main/resources/template/index.vue.vm | 7 +-- .../epmet/common/token/util/TokenUtil.java | 1 - .../util/AbstractDataSourceNameFetcher.java | 2 - .../aspect/ExternalAppRequestAuthAspect.java | 2 +- .../mybatis/aspect/DataFilterAspect.java | 2 +- .../dto/form/StaffPermissionFormDTO.java | 3 -- .../feign/MybatisGovAccessFeignClient.java | 6 +-- .../feign/MybatisGovOrgFeignClient.java | 3 +- .../MybatisGovAccessFeignClientFallback.java | 7 +-- .../MybatisGovOrgFeignClientFallback.java | 3 +- .../interceptor/DataFilterInterceptor.java | 1 - .../rocketmq/messages/OrgOrStaffMQMsg.java | 3 -- .../rocketmq/register/MQAbstractRegister.java | 1 - .../epmet/commons/security/jwt/JwtUtils.java | 1 - .../com/epmet/commons/thirdplat/DemoApp.java | 1 - .../com/epmet/wx/mp/handler/ScanHandler.java | 7 ++- .../epmet/wx/mp/handler/SubscribeHandler.java | 7 ++- .../tools/annotation/MaskResponse.java | 4 -- .../commons/tools/config/AsyncConfig.java | 6 ++- .../tools/constant/ThreadLocalConstant.java | 2 - .../tools/security/config/WebMvcConfig.java | 4 +- .../tools/security/dto/GovTokenDto.java | 1 - .../tools/security/password/BCrypt.java | 2 - ...oginUserHandlerMethodArgumentResolver.java | 5 --- .../tools/utils/EpmetRequestHolder.java | 1 - .../commons/tools/utils/ModuleUtils.java | 3 -- .../commons/tools/utils/TreeStringNode.java | 1 - .../java/com/epmet/auth/AuthProcessor.java | 8 ---- .../java/com/epmet/filter/AuthFilter.java | 4 +- .../filter/CpAuthGatewayFilterFactory.java | 3 +- .../healthcheck/HealthCheckController.java | 1 - .../java/com/epmet/jwt/JwtTokenUtils.java | 2 - .../form/AgenctBasicDataFormDTO.java | 1 - .../dto/epmettduck/AcUserAuthorizeDTO.java | 7 +-- .../dataaggre/dto/epmettduck/AcUserDTO.java | 7 +-- .../PrProjectTemplateCategoryDTO.java | 7 +-- .../dto/epmettduck/PrProjectTemplateDTO.java | 7 +-- .../epmettduck/PrProjectTemplateItemDTO.java | 11 ++--- .../dto/epmettduck/PrProjectThemeDTO.java | 7 +-- .../dto/epmettduck/PrPublishRangeDTO.java | 7 +-- .../dto/epmettduck/PrResultExtDTO.java | 7 +-- .../dto/epmettduck/PrUserProjectDTO.java | 7 +-- .../dto/epmettduck/PrUserProjectItemDTO.java | 11 ++--- .../dto/epmettduck/PrUserProjectLogicDTO.java | 7 +-- .../epmettduck/PrUserProjectResultDTO.java | 7 +-- .../epmettduck/PrUserProjectSettingDTO.java | 9 ++-- .../dto/epmettduck/PrUserProjectThemeDTO.java | 7 +-- .../dto/epmettduck/PrVistRecordDTO.java | 7 +-- .../dataaggre/dto/epmettduck/WxMpUserDTO.java | 11 ++--- .../form/TDuckHeaderInfoFormDTO.java | 1 - .../BadgeCertificationConfigFieldDTO.java | 7 +-- .../dataaggre/dto/epmetuser/BadgeDTO.java | 5 ++- .../dto/epmetuser/CustomerStaffDTO.java | 5 ++- .../dto/epmetuser/CustomerUserDTO.java | 5 ++- .../dto/epmetuser/GovStaffRoleDTO.java | 17 +++---- .../epmetuser/GovStaffRoleTemplateDTO.java | 17 +++---- .../dto/epmetuser/GridLatestDTO.java | 7 +-- .../dto/epmetuser/GridVisitedDTO.java | 5 ++- .../dataaggre/dto/epmetuser/OperUserDTO.java | 5 ++- .../dto/epmetuser/RegisterRelationDTO.java | 5 ++- .../dto/epmetuser/ResiUserBadgeDTO.java | 5 ++- .../dataaggre/dto/epmetuser/RoleDTO.java | 7 +-- .../dto/epmetuser/StaffAgencyVisitedDTO.java | 5 ++- .../dto/epmetuser/StaffGridVisitedDTO.java | 5 ++- .../dto/epmetuser/StaffPatrolRecordDTO.java | 3 +- .../dataaggre/dto/epmetuser/StaffRoleDTO.java | 19 ++++---- .../dto/epmetuser/StaffWechatDTO.java | 7 +-- .../dto/epmetuser/UserAdviceDTO.java | 9 ++-- .../dto/epmetuser/UserAdviceImgDTO.java | 5 ++- .../UserBadgeCertificateRecordDTO.java | 7 +-- .../dto/epmetuser/UserBaseInfoDTO.java | 5 ++- .../dto/epmetuser/UserCustomerDTO.java | 7 +-- .../dataaggre/dto/epmetuser/UserDTO.java | 7 +-- .../dto/epmetuser/UserInvitationDTO.java | 5 ++- .../dto/epmetuser/UserResiInfoDTO.java | 5 ++- .../epmetuser/UserResiRegisterVisitDTO.java | 5 ++- .../dataaggre/dto/epmetuser/UserRoleDTO.java | 7 +-- .../dto/epmetuser/UserWechatDTO.java | 7 +-- .../form/GridMemberPatrolListFormDTO.java | 3 -- .../dto/epmetuser/form/RoleListFormDTO.java | 1 - .../dto/epmetuser/form/StaffListFormDTO.java | 1 - .../result/IcUserCategoryResultDTO.java | 1 - .../govissue/IssueProjectCategoryDictDTO.java | 3 +- .../form/ShiftProjectIssueListFormDTO.java | 1 - .../dto/govorg/form/GridLivelyFormDTO.java | 1 - .../dto/govorg/form/StaffDetailV2FormDTO.java | 1 - .../govorg/result/GridLivelyResultDTO.java | 1 - .../ProjectProcessAttachmentDTO.java | 7 +-- .../govproject/ProjectProcessScanTaskDTO.java | 5 ++- .../ProjectRelatedPersonnelDTO.java | 5 ++- .../ProjectSatisfactionDetailDTO.java | 5 ++- .../ProjectSatisfactionStatisticsDTO.java | 5 ++- .../dto/govproject/ProjectStaffDTO.java | 5 ++- .../dto/govproject/ProjectTagsDTO.java | 5 ++- .../form/ProjectAnalysisFormDTO.java | 1 - .../resigroup/GroupEditSubmitRecordDTO.java | 7 +-- .../dto/resigroup/GroupInvitationDTO.java | 5 ++- .../resigroup/GroupMemeberOperationDTO.java | 5 ++- .../dto/resigroup/ResiGroupCodeDTO.java | 5 ++- .../dto/resigroup/ResiGroupMemberDTO.java | 5 ++- .../dto/resigroup/ResiGroupOperationDTO.java | 5 ++- .../resigroup/ResiGroupStatisticalDTO.java | 5 ++- .../dto/resigroup/ResiTopicAttachmentDTO.java | 5 ++- .../dto/resigroup/ResiTopicOperationDTO.java | 5 ++- .../resigroup/TopicDraftAttachmentDTO.java | 7 +-- .../dto/resigroup/TopicDraftDTO.java | 9 ++-- .../dto/resigroup/TopicDraftOperationDTO.java | 5 ++- .../dto/resigroup/TopicDraftScanTaskDTO.java | 5 ++- .../resigroup/TopicShareLinkRecordDTO.java | 5 ++- .../TopicShareLinkVisitRecordDTO.java | 7 +-- .../enums/GridMemberDataAnalysisEnums.java | 3 -- ...GridMemberDataAnalysisExcelExportBean.java | 3 +- .../controller/EpmetTDuckController.java | 1 + .../PrProjectTemplateCategoryDao.java | 6 +-- .../dao/epmettduck/PrVistRecordDao.java | 5 +-- .../dataaggre/dao/govproject/ProjectDao.java | 1 - .../dao/opercustomize/CustomerFootBarDao.java | 4 +- .../FactGridMemberStatisticsDailyEntity.java | 3 -- .../epmettduck/AcUserAuthorizeEntity.java | 5 +-- .../entity/epmettduck/AcUserEntity.java | 3 +- .../PrProjectTemplateCategoryEntity.java | 5 +-- .../epmettduck/PrProjectTemplateEntity.java | 5 +-- .../PrProjectTemplateItemEntity.java | 9 ++-- .../epmettduck/PrProjectThemeEntity.java | 5 +-- .../epmettduck/PrPublishRangeEntity.java | 5 +-- .../entity/epmettduck/PrResultExtEntity.java | 5 +-- .../epmettduck/PrUserProjectEntity.java | 5 +-- .../epmettduck/PrUserProjectLogicEntity.java | 5 +-- .../epmettduck/PrUserProjectResultEntity.java | 5 +-- .../PrUserProjectSettingEntity.java | 5 +-- .../epmettduck/PrUserProjectThemeEntity.java | 5 +-- .../entity/epmettduck/WxMpUserEntity.java | 9 ++-- .../BadgeCertificationConfigFieldEntity.java | 3 -- .../entity/epmetuser/BadgeEntity.java | 3 -- .../entity/epmetuser/CustomerStaffEntity.java | 1 - .../entity/epmetuser/GovStaffRoleEntity.java | 3 -- .../epmetuser/GovStaffRoleTemplateEntity.java | 3 -- .../entity/epmetuser/GridLatestEntity.java | 3 +- .../entity/epmetuser/GridVisitedEntity.java | 1 - .../entity/epmetuser/OperUserEntity.java | 3 -- .../epmetuser/RegisterRelationEntity.java | 3 -- .../entity/epmetuser/ResiUserBadgeEntity.java | 3 -- .../entity/epmetuser/RoleEntity.java | 5 +-- .../epmetuser/StaffAgencyVisitedEntity.java | 3 -- .../epmetuser/StaffGridVisitedEntity.java | 3 -- .../epmetuser/StaffPatrolDetailEntity.java | 1 - .../epmetuser/StaffPatrolRecordEntity.java | 1 - .../entity/epmetuser/StaffRoleEntity.java | 3 -- .../entity/epmetuser/StaffWechatEntity.java | 5 +-- .../entity/epmetuser/UserAdviceEntity.java | 5 +-- .../entity/epmetuser/UserAdviceImgEntity.java | 3 -- .../UserBadgeCertificateRecordEntity.java | 3 +- .../entity/epmetuser/UserBaseInfoEntity.java | 3 -- .../entity/epmetuser/UserCustomerEntity.java | 5 +-- .../entity/epmetuser/UserEntity.java | 5 +-- .../epmetuser/UserInvitationEntity.java | 1 - .../entity/epmetuser/UserResiInfoEntity.java | 3 -- .../UserResiRegisterVisitEntity.java | 1 - .../entity/epmetuser/UserRoleEntity.java | 5 +-- .../entity/epmetuser/UserWechatEntity.java | 5 +-- .../govproject/ProjectCategoryEntity.java | 3 -- .../entity/govproject/ProjectEntity.java | 3 -- .../govproject/ProjectOrgRelationEntity.java | 1 - .../ProjectProcessAttachmentEntity.java | 5 +-- .../govproject/ProjectProcessEntity.java | 1 - .../ProjectProcessScanTaskEntity.java | 3 -- .../ProjectRelatedPersonnelEntity.java | 3 -- .../ProjectSatisfactionDetailEntity.java | 3 -- .../ProjectSatisfactionStatisticsEntity.java | 3 -- .../entity/govproject/ProjectStaffEntity.java | 3 -- .../entity/govproject/ProjectTagsEntity.java | 3 -- .../GroupEditSubmitRecordEntity.java | 1 - .../resigroup/GroupInvitationEntity.java | 1 - .../GroupMemeberOperationEntity.java | 3 -- .../entity/resigroup/ResiGroupCodeEntity.java | 3 -- .../entity/resigroup/ResiGroupEntity.java | 1 - .../resigroup/ResiGroupMemberEntity.java | 3 -- .../resigroup/ResiGroupOperationEntity.java | 3 -- .../resigroup/ResiGroupStatisticalEntity.java | 3 -- .../resigroup/ResiTopicAttachmentEntity.java | 3 -- .../entity/resigroup/ResiTopicEntity.java | 7 +-- .../resigroup/ResiTopicOperationEntity.java | 3 -- .../resigroup/TopicDraftAttachmentEntity.java | 5 +-- .../entity/resigroup/TopicDraftEntity.java | 7 +-- .../resigroup/TopicDraftOperationEntity.java | 3 -- .../resigroup/TopicDraftScanTaskEntity.java | 3 -- .../resigroup/TopicShareLinkRecordEntity.java | 3 -- .../TopicShareLinkVisitRecordEntity.java | 3 -- .../epmet/dataaggre/redis/ResiGroupRedis.java | 1 - .../dataaggre/service/AggreGridService.java | 1 - .../service/datastats/DataStatsService.java | 2 - .../impl/EpmetMessageServiceImpl.java | 1 - .../PrProjectTemplateCategoryService.java | 5 +-- .../epmettduck/PrUserProjectItemService.java | 6 +-- .../impl/PrUserProjectItemServiceImpl.java | 4 +- .../impl/StaffPatrolDetailServiceImpl.java | 4 +- .../service/govproject/GovProjectService.java | 1 - .../impl/GovProjectServiceImpl.java | 1 - .../opercrm/impl/CustomerRelationImpl.java | 1 - .../resigroup/impl/ResiGroupServiceImpl.java | 5 ++- .../com/epmet/dto/StaffPatrolDetailDTO.java | 5 ++- .../com/epmet/dto/StaffPatrolRecordDTO.java | 5 ++- .../epmet/dto/result/ParentListResultDTO.java | 3 +- .../result/issue/IssueAvgAuditTimeDTO.java | 3 -- .../project/GridProjectCountResultDTO.java | 2 - .../index/result/IndexExplainChildResult.java | 2 - .../dto/result/AgeDistributionResultDTO.java | 1 - .../result/GenderDistributionResultDTO.java | 1 - .../result/HeartActcounttrendResultDTO.java | 1 - .../HeartVolunteerportrayalResultDTO.java | 1 - .../result/UserPointRankListResultDTO.java | 1 - .../feign/DataReportOpenFeignClient.java | 1 - .../DataReportOpenFeignClientFallBack.java | 1 - .../group/dto/form/GroupIncrTrendFormDTO.java | 1 - .../project/dto/CustomerCategoryDTO.java | 2 - .../dto/result/FactTagViewedAgencyDTO.java | 3 +- .../controller/group/GroupController.java | 2 +- .../controller/issue/IssueController.java | 2 +- .../controller/project/ProjectController.java | 16 ++----- .../publicity/PublicityController.java | 4 +- .../screen/GrassRootsGovernController.java | 5 ++- .../controller/screen/KcScreenController.java | 5 +-- .../user/StaffPatrolDetailController.java | 13 +++--- .../user/UserAnalysisController.java | 2 +- .../screen/ScreenCustomerAgencyDao.java | 1 - .../ScreenProjectCategoryOrgDailyDao.java | 3 +- .../screen/ScreenProjectOrgDailyDao.java | 3 +- .../fact/FactVolunteerServiceDailyDao.java | 4 +- .../datareport/dao/fact/IndexDictDao.java | 1 - .../ScreenKcIssueSummaryGridDailyDTO.java | 5 ++- .../ScreenKcIssueTrendGridMonthlyDTO.java | 5 ++- .../dao/user/StaffPatrolRecordDao.java | 6 +-- .../entity/user/StaffPatrolDetailEntity.java | 1 - .../entity/user/StaffPatrolRecordEntity.java | 1 - .../backdoor/impl/BackDoorServiceImpl.java | 1 - .../screen/KcScreenService.java | 2 - .../screen/ScreenProjectService.java | 1 - .../screen/impl/AnScreenServiceImpl.java | 1 - .../screen/impl/KcScreenServiceImpl.java | 3 -- ...nProjectQuantityOrgMonthlyServiceImpl.java | 7 ++- .../screen/impl/ScreenProjectServiceImpl.java | 5 ++- .../service/group/impl/GroupServiceImpl.java | 2 +- .../service/issue/impl/IssueServiceImpl.java | 2 +- .../service/project/ProjectService.java | 2 +- .../publicity/impl/PublicityServiceImpl.java | 4 +- .../service/topic/impl/TopicServiceImpl.java | 2 +- .../user/StaffPatrolDetailService.java | 10 ++--- .../impl/StaffPatrolDetailServiceImpl.java | 9 ++-- .../user/impl/UserAnalysisServiceImpl.java | 2 +- .../basereport/form/AgencyProjectFormDTO.java | 1 - .../form/GridGroupTotalFormDTO.java | 2 - .../form/GridTopicIssueFormDTO.java | 1 - .../epmet/dto/extract/DimObjectActionDTO.java | 5 ++- .../epmet/dto/extract/DimObjectStatusDTO.java | 5 ++- .../extract/FactOriginGroupMainDailyDTO.java | 16 +++---- .../FactOriginGroupMemberDailyDTO.java | 15 ++++--- .../extract/FactOriginIssueLogDailyDTO.java | 5 ++- .../extract/FactOriginIssueMainDailyDTO.java | 5 ++- .../FactOriginProjectMainDailyDTO.java | 5 ++- .../FactOriginProjectOrgPeriodDailyDTO.java | 17 +++---- .../form/GovernAbilityGridMonthlyFormDTO.java | 8 ++-- .../extract/form/IssueMainDailyFormDTO.java | 1 - .../form/PartyAbilityGridMonthlyFormDTO.java | 8 ++-- .../result/GridProjectToProjectMainDTO.java | 3 +- .../result/ProjectEvaluateResultDTO.java | 1 - .../dto/group/form/AgencyMonthlyFormDTO.java | 1 - .../FactIndexGovrnAblityGridMonthlyDTO.java | 8 ++-- .../FactIndexPartyAblityGridMonthlyDTO.java | 8 ++-- .../FactIndexServiceAblityGridMonthlyDTO.java | 6 +-- .../form/DeptGovrnAbilityDataFormDTO.java | 1 - .../form/GridGovrnAbilityDataFormDTO.java | 1 - .../form/GridPartyAbilityDataFormDTO.java | 1 - .../form/GridPartyMemberDataFormDTO.java | 4 -- .../form/OrgGovrnAbilityDataFormDTO.java | 1 - .../form/OrgPartyAbilityFormDTO.java | 1 - .../form/OrgServiceAbilityFormDTO.java | 1 - .../issue/IssueProjectCategoryDictDTO.java | 5 ++- .../ScreenCustomerWorkRecordDictDTO.java | 5 ++- .../project/form/MonthProjectListFormDTO.java | 1 - .../dto/screen/CategoryDictDataFormDTO.java | 2 - .../dto/screen/FactIndexGridScoreDTO.java | 4 +- .../screen/ScreenGovernRankDataDailyDTO.java | 6 +-- .../dto/screen/ScreenProjectImgDataDTO.java | 3 +- .../ScreenProjectProcessAttachmentDTO.java | 3 +- .../dto/screen/ScreenProjectProcessDTO.java | 9 ++-- .../dto/screen/result/TreeResultDTO.java | 3 -- .../dto/screencoll/ScreenCollFormDTO.java | 4 +- .../screencoll/form/EventDataListFormDTO.java | 3 -- .../form/PioneerDataListFormDTO.java | 1 - .../com/epmet/dto/stats/DimAgencyDTO.java | 7 +-- .../dto/stats/DimCustomerPartymemberDTO.java | 7 +-- .../java/com/epmet/dto/stats/DimDateDTO.java | 5 ++- .../com/epmet/dto/stats/DimDepartmentDTO.java | 5 ++- .../java/com/epmet/dto/stats/DimGridDTO.java | 5 ++- .../java/com/epmet/dto/stats/DimMonthDTO.java | 5 ++- .../com/epmet/dto/stats/DimQuarterDTO.java | 5 ++- .../epmet/dto/stats/DimTopicStatusDTO.java | 5 ++- .../java/com/epmet/dto/stats/DimWeekDTO.java | 5 ++- .../java/com/epmet/dto/stats/DimYearDTO.java | 5 ++- .../FactAgencyOriginProjectDailyDTO.java | 6 +-- .../FactAgencyOriginProjectMonthlyDTO.java | 6 +-- .../dto/stats/FactAgencyProjectDailyDTO.java | 6 +-- .../stats/FactAgencyProjectMonthlyDTO.java | 6 +-- .../FactGridMemberStatisticsDailyDTO.java | 5 ++- .../FactGridMemberStatisticsMonthlyDTO.java | 5 ++- .../dto/stats/FactGridProjectDailyDTO.java | 6 +-- .../dto/stats/FactGridProjectMonthlyDTO.java | 6 +-- .../dto/stats/FactGroupAgencyDailyDTO.java | 5 ++- .../dto/stats/FactGroupAgencyMonthlyDTO.java | 5 ++- .../dto/stats/FactGroupGridDailyDTO.java | 5 ++- .../stats/FactGroupTotalAgencyDailyDTO.java | 5 ++- .../dto/stats/FactGroupTotalGridDailyDTO.java | 5 ++- .../dto/stats/FactIssueAgencyDailyDTO.java | 8 ++-- .../dto/stats/FactIssueAgencyMonthlyDTO.java | 8 ++-- .../dto/stats/FactIssueGridDailyDTO.java | 8 ++-- .../dto/stats/FactIssueGridMonthlyDTO.java | 8 ++-- ...FactPartyMemberVanguardAgencyDailyDTO.java | 6 +-- .../FactPartyMemberVanguardGridDailyDTO.java | 6 +-- .../form/CustomerIdAndDateIdFormDTO.java | 1 - .../dto/stats/form/GmUploadDataFormDTO.java | 3 -- .../dto/stats/form/GmUploadEventFormDTO.java | 1 - .../FactTopicHotdiscussAgencyDailyDTO.java | 5 ++- .../FactTopicHotdiscussGridDailyDTO.java | 5 ++- .../topic/FactTopicIssueAgencyDailyDTO.java | 5 ++- .../topic/FactTopicIssueAgencyMonthlyDTO.java | 5 ++- .../topic/FactTopicIssueGridDailyDTO.java | 5 ++- .../topic/FactTopicIssueGridMonthlyDTO.java | 5 ++- .../topic/FactTopicStatusAgencyDailyDTO.java | 6 +-- .../FactTopicStatusAgencyMonthlyDTO.java | 8 ++-- .../topic/FactTopicStatusGridDailyDTO.java | 6 +-- .../topic/FactTopicTotalAgencyDailyDTO.java | 5 ++- .../topic/FactTopicTotalGridDailyDTO.java | 5 ++- .../FactParticipationUserAgencyDailyDTO.java | 12 ++--- ...FactParticipationUserAgencyMonthlyDTO.java | 12 ++--- .../FactParticipationUserGridDailyDTO.java | 13 +++--- .../FactParticipationUserGridMonthlyDTO.java | 13 +++--- .../stats/user/FactRegUserAgencyDailyDTO.java | 12 ++--- .../user/FactRegUserAgencyMonthlyDTO.java | 12 ++--- .../stats/user/FactRegUserGridDailyDTO.java | 13 +++--- .../stats/user/FactRegUserGridMonthlyDTO.java | 13 +++--- .../dto/user/result/GridUserInfoDTO.java | 1 - .../epmet/controller/DemandController.java | 17 ++++--- .../com/epmet/controller/DimController.java | 5 +-- .../controller/StatsGroupController.java | 1 - .../controller/StatsTopicController.java | 1 - .../indexcal/AgencyScoreDao.java | 1 - .../indexcal/DeptScoreDao.java | 2 +- .../ScreenProjectCategoryOrgDailyDao.java | 3 +- .../epmet/dao/partymember/PartyMemberDao.java | 8 ---- .../epmet/dao/project/ProjectProcessDao.java | 1 - .../com/epmet/dao/stats/BaseReportDao.java | 3 -- .../com/epmet/dao/stats/DimAgencyDao.java | 3 +- .../java/com/epmet/dao/stats/DimDateDao.java | 4 +- .../epmet/dao/stats/DimTopicStatusDao.java | 5 +-- ...actArticlePublishedDepartmentDailyDao.java | 3 +- .../dao/stats/FactGroupGridDailyDao.java | 3 +- .../FactParticipationUserGridDailyDao.java | 3 +- .../java/com/epmet/dao/topic/TopicDao.java | 2 +- .../extract/DimObjectActionEntity.java | 3 -- .../extract/DimObjectStatusEntity.java | 3 -- .../FactGridMemberStatisticsDailyEntity.java | 3 -- ...FactGridMemberStatisticsMonthlyEntity.java | 3 -- .../FactOriginGroupMainDailyEntity.java | 3 -- .../FactOriginGroupMemberDailyEntity.java | 5 +-- .../FactOriginIssueLogDailyEntity.java | 3 -- .../FactOriginIssueMainDailyEntity.java | 3 -- .../FactOriginProjectLogDailyEntity.java | 3 -- .../FactOriginProjectMainDailyEntity.java | 3 -- ...FactOriginProjectOrgPeriodDailyEntity.java | 3 +- .../FactOriginTopicLogDailyEntity.java | 1 - .../screen/DimLastSyncRecordEntity.java | 3 +- .../IndexGroupDetailTemplateEntity.java | 2 - .../screen/IndexGroupTemplateEntity.java | 2 - ...ScreenAnCommunityProjectProfileEntity.java | 1 - ...ScreenAnGrassRootsGovernMonthlyEntity.java | 2 - .../ScreenAnGrassRootsOrgMonthlyEntity.java | 3 -- ...creenAnGrassRootsPmTotalMonthlyEntity.java | 3 -- .../screen/ScreenKcActSummaryDailyEntity.java | 3 -- .../screen/ScreenKcActTrendMonthlyEntity.java | 3 -- .../ScreenKcGroupDetailGridDailyEntity.java | 3 -- .../ScreenKcGroupSummaryGridDailyEntity.java | 3 -- .../ScreenKcIssueSummaryGridDailyEntity.java | 3 -- .../ScreenKcIssueTrendGridMonthlyEntity.java | 3 -- .../ScreenKcNewsCategoryAnalysisEntity.java | 3 -- .../screen/ScreenKcNewsRankEntity.java | 3 -- .../ScreenKcNewsSummaryDailyEntity.java | 3 -- .../ScreenKcNewsTrendMonthlyEntity.java | 3 -- .../ScreenKcPlatformSummaryDailyEntity.java | 3 -- ...creenKcProjectCategoryGridDailyEntity.java | 3 -- ...ScreenKcProjectSatisGridMonthlyEntity.java | 3 -- ...ScreenKcProjectSummaryGridDailyEntity.java | 3 -- .../ScreenKcTopicTrendGridMonthlyEntity.java | 3 -- .../ScreenKcUserSummaryDailyEntity.java | 3 -- .../ScreenKcUserTrendGridMonthlyEntity.java | 3 -- ...eenKcVolunteerHeatRankGridDailyEntity.java | 3 -- .../ScreenKcVolunteerSummaryDailyEntity.java | 3 -- .../screen/ScreenProjectDataEntity.java | 1 - .../screen/ScreenProjectImgDataEntity.java | 3 -- .../ScreenProjectProcessAttachmentEntity.java | 3 -- .../screen/ScreenProjectProcessEntity.java | 1 - .../entity/heart/VolunteerInfoEntity.java | 3 -- .../entity/plugins/ScreenBidInfoEntity.java | 1 - .../plugins/ScreenContractInfoEntity.java | 1 - .../ScreenCustomerWorkRecordDictEntity.java | 3 -- .../epmet/entity/stats/DimCustomerEntity.java | 1 - .../stats/DimCustomerPartymemberEntity.java | 3 +- .../com/epmet/entity/stats/DimDateEntity.java | 1 - .../entity/stats/DimDepartmentEntity.java | 1 - .../com/epmet/entity/stats/DimGridEntity.java | 1 - .../epmet/entity/stats/DimMonthEntity.java | 1 - .../epmet/entity/stats/DimQuarterEntity.java | 1 - .../entity/stats/DimTopicStatusEntity.java | 1 - .../com/epmet/entity/stats/DimWeekEntity.java | 1 - .../FactAgencyOriginProjectDailyEntity.java | 2 - .../FactAgencyOriginProjectMonthlyEntity.java | 2 - .../stats/FactAgencyProjectDailyEntity.java | 2 - .../stats/FactAgencyProjectMonthlyEntity.java | 2 - .../stats/FactGridProjectDailyEntity.java | 2 - .../stats/FactGridProjectMonthlyEntity.java | 2 - .../stats/FactGroupAgencyDailyEntity.java | 3 -- .../stats/FactGroupAgencyMonthlyEntity.java | 3 -- .../stats/FactGroupGridDailyEntity.java | 3 -- .../FactGroupTotalAgencyDailyEntity.java | 3 -- .../stats/FactGroupTotalGridDailyEntity.java | 3 -- .../stats/FactIssueAgencyDailyEntity.java | 4 +- .../stats/FactIssueAgencyMonthlyEntity.java | 4 +- .../stats/FactIssueGridDailyEntity.java | 4 +- .../stats/FactIssueGridMonthlyEntity.java | 4 +- ...tPartyMemberVanguardAgencyDailyEntity.java | 2 - ...actPartyMemberVanguardGridDailyEntity.java | 2 - .../FactTopicHotdiscussAgencyDailyEntity.java | 3 -- .../FactTopicHotdiscussGridDailyEntity.java | 3 -- .../FactVolunteerServiceDailyEntity.java | 9 ++-- .../entity/stats/LastExecRecordEntity.java | 1 - .../FactTopicIssueAgencyDailyEntity.java | 3 -- .../FactTopicIssueAgencyMonthlyEntity.java | 3 -- .../topic/FactTopicIssueGridDailyEntity.java | 3 -- .../FactTopicIssueGridMonthlyEntity.java | 3 -- .../FactTopicStatusAgencyDailyEntity.java | 2 - .../FactTopicStatusAgencyMonthlyEntity.java | 4 +- .../topic/FactTopicStatusGridDailyEntity.java | 2 - .../FactTopicTotalAgencyDailyEntity.java | 3 -- .../topic/FactTopicTotalGridDailyEntity.java | 3 -- ...actParticipationUserAgencyDailyEntity.java | 8 ++-- ...tParticipationUserAgencyMonthlyEntity.java | 8 ++-- .../FactParticipationUserGridDailyEntity.java | 8 ++-- ...actParticipationUserGridMonthlyEntity.java | 8 ++-- .../user/FactRegUserAgencyDailyEntity.java | 8 ++-- .../user/FactRegUserAgencyMonthlyEntity.java | 8 ++-- .../user/FactRegUserGridDailyEntity.java | 8 ++-- .../user/FactRegUserGridMonthlyEntity.java | 8 ++-- .../StatsStaffPatrolRecordDailyEntity.java | 1 - .../voice/ArticleOperateRecordEntity.java | 1 - .../epmet/mq/RocketMQConsumerRegister.java | 11 +---- .../com/epmet/service/StatsGroupService.java | 2 - .../StatsPartyMemberVanguardService.java | 2 - .../extract/todata/ProjectExtractService.java | 3 -- .../impl/FactGridGovernDailyServiceImpl.java | 5 ++- ...FactOriginGroupMemberDailyServiceImpl.java | 7 ++- .../GovernRankDataExtractServiceImpl.java | 2 +- .../impl/PartyBaseInfoServiceImpl.java | 2 +- .../IndexCalculateDistrictServiceImpl.java | 1 - .../screen/ScreenCustomerAgencyService.java | 3 +- ...ProjectCategoryGridAndOrgDailyService.java | 11 +---- .../ScreenGovernRankDataDailyServiceImpl.java | 3 +- .../impl/ScreenGovernRankDataServiceImpl.java | 3 +- .../impl/ScreenProjectImgDataServiceImpl.java | 2 +- .../ScreenProjectOrgDailyServiceImpl.java | 4 +- ...enProjectProcessAttachmentServiceImpl.java | 2 +- ...nProjectQuantityOrgMonthlyServiceImpl.java | 3 +- .../heart/impl/HeartDemandServiceImpl.java | 6 +-- .../heart/impl/HeartVolunteerServiceImpl.java | 7 +-- .../epmet/service/impl/EIDimServiceImpl.java | 7 ++- .../impl/GovernanceDataReportServiceImpl.java | 2 - .../service/impl/StatsTopicServiceImpl.java | 5 ++- .../service/org/CustomerGridService.java | 1 - .../epmet/service/stats/DimAgencyService.java | 3 +- .../service/stats/DimCustomerService.java | 3 +- .../epmet/service/stats/DimGridService.java | 3 +- .../stats/FactGroupAgencyMonthlyService.java | 3 +- .../stats/FactTagUsedAgencyDailyService.java | 3 +- .../stats/impl/DemandStatsServiceImpl.java | 5 +-- .../DimCustomerPartymemberServiceImpl.java | 4 +- .../stats/impl/DimGridServiceImpl.java | 10 +++-- .../stats/impl/DimTopicStatusServiceImpl.java | 3 +- ...ctAgencyOriginProjectDailyServiceImpl.java | 5 +-- ...AgencyOriginProjectMonthlyServiceImpl.java | 5 +-- ...yMemberVanguardAgencyDailyServiceImpl.java | 2 +- .../FactTopicIssueAgencyDailyService.java | 3 +- .../FactTopicIssueAgencyMonthlyService.java | 3 +- .../topic/FactTopicIssueGridDailyService.java | 3 +- .../FactTopicIssueGridMonthlyService.java | 3 +- .../FactTopicStatusAgencyDailyService.java | 3 +- .../FactTopicStatusAgencyMonthlyService.java | 3 +- .../FactTopicStatusGridDailyService.java | 3 +- .../FactTopicTotalAgencyDailyService.java | 3 +- .../topic/FactTopicTotalGridDailyService.java | 3 +- .../FactTopicIssueAgencyDailyServiceImpl.java | 7 ++- ...actTopicIssueAgencyMonthlyServiceImpl.java | 7 ++- .../FactTopicIssueGridDailyServiceImpl.java | 7 ++- .../FactTopicIssueGridMonthlyServiceImpl.java | 7 ++- ...FactTopicStatusAgencyDailyServiceImpl.java | 7 ++- ...ctTopicStatusAgencyMonthlyServiceImpl.java | 7 ++- .../FactTopicStatusGridDailyServiceImpl.java | 7 ++- .../FactTopicTotalAgencyDailyServiceImpl.java | 7 ++- .../FactTopicTotalGridDailyServiceImpl.java | 7 ++- ...ctParticipationUserAgencyDailyService.java | 3 +- ...ParticipationUserAgencyMonthlyService.java | 3 +- ...FactParticipationUserGridDailyService.java | 3 +- ...ctParticipationUserGridMonthlyService.java | 3 +- .../user/FactRegUserAgencyDailyService.java | 3 +- .../user/FactRegUserGridDailyService.java | 3 +- .../user/FactRegUserGridMonthlyService.java | 3 +- ...rticipationUserAgencyDailyServiceImpl.java | 6 +-- ...icipationUserAgencyMonthlyServiceImpl.java | 7 ++- ...ParticipationUserGridDailyServiceImpl.java | 7 ++- ...rticipationUserGridMonthlyServiceImpl.java | 7 ++- .../FactRegUserAgencyDailyServiceImpl.java | 7 ++- .../impl/FactRegUserGridDailyServiceImpl.java | 7 ++- .../normalizing/batch/IndexOutputVO.java | 1 - .../com/epmet/stats/test/RedissonTest.java | 2 - .../epmet/controller/ActModelController.java | 2 - .../controller/ActProcessController.java | 1 - .../controller/ActRunningController.java | 1 + .../editor/model/ModelSaveRestResource.java | 2 +- .../com/epmet/service/ActModelService.java | 6 +-- .../com/epmet/service/ActProcessService.java | 4 +- .../main/java/com/epmet/dto/AreaCodeDTO.java | 5 ++- .../main/java/com/epmet/dto/CalenderDTO.java | 10 ++--- .../dto/result/AreaCodeDictResultDTO.java | 1 - .../dto/result/ExternalCustomerResultDTO.java | 8 ++-- .../epmet/dto/result/WorkDayResultDTO.java | 1 - .../controller/AreaCodeChildController.java | 6 +-- .../epmet/controller/CalenderController.java | 8 ++-- .../controller/ExternalAppController.java | 5 ++- .../epmet/controller/WorkDayController.java | 2 +- .../com/epmet/dao/ExternalAppSecretDao.java | 4 +- .../com/epmet/entity/AreaCodeChildEntity.java | 3 -- .../java/com/epmet/entity/AreaCodeEntity.java | 3 -- .../java/com/epmet/entity/CalenderEntity.java | 3 +- .../com/epmet/entity/ExternalAppEntity.java | 3 -- .../epmet/entity/ExternalAppSecretEntity.java | 3 -- .../epmet/entity/ExternalCustomerEntity.java | 5 +-- .../com/epmet/entity/HelperVideoEntity.java | 1 - .../service/ExternalCustomerService.java | 1 - .../com/epmet/service/ShowApiService.java | 2 - .../com/epmet/service/WorkDayService.java | 4 +- .../impl/AreaCodeChildServiceImpl.java | 4 +- .../service/impl/CalenderServiceImpl.java | 5 +-- .../service/impl/ImportTaskServiceImpl.java | 2 +- .../epmet/task/MultithreadScheduleTask.java | 3 -- .../src/main/java/com/epmet/dto/DemoDTO.java | 5 ++- .../epmet/dto/form/SaveCustomerFormDTO.java | 1 - .../com/epmet/controller/DemoController.java | 2 +- .../java/com/epmet/entity/DemoEntity.java | 1 - .../epmet/dto/form/StaffSinGridFormDTO.java | 1 - .../java/com/epmet/config/OpenApiConfig.java | 1 - .../OpenApiAccessTokenController.java | 5 ++- .../java/com/epmet/dto/ActCustomizedDTO.java | 5 ++- .../java/com/epmet/dto/ActLivePicDTO.java | 5 ++- .../java/com/epmet/dto/ActLiveRecDTO.java | 6 +-- .../java/com/epmet/dto/ActSignInPicDTO.java | 5 ++- .../java/com/epmet/dto/ActSignInRecDTO.java | 6 +-- .../java/com/epmet/dto/ActSummaryDTO.java | 5 ++- .../epmet/dto/IcActivityUnitRelationDTO.java | 5 ++- .../dto/IcCommunitySelfOrganizationDTO.java | 9 ++-- ...CommunitySelfOrganizationPersonnelDTO.java | 9 ++-- .../java/com/epmet/dto/IcSocietyOrgDTO.java | 5 ++- .../com/epmet/dto/LatestActContentDTO.java | 5 ++- .../dto/LatestActServiceRelationDTO.java | 5 ++- .../epmet/dto/LatestActUnitRelationDTO.java | 5 ++- .../AddCommunitySelfOrganizationFormDTO.java | 1 - .../EditCommunitySelfOrganizationFormDTO.java | 2 - .../demand/UserDemandNameQueryFormDTO.java | 1 - .../form/resi/ResiActInsertLiveFormDTO.java | 2 - .../dto/form/resi/VolunteerCommonFormDTO.java | 3 -- .../dto/form/work/ActListCommonFormDTO.java | 1 - .../result/resi/ResiActContentResultDTO.java | 1 - .../work/AuditingUserDetailResultDTO.java | 1 - ...tySelfOrganizationPersonnelController.java | 6 +-- .../IcPartyUnitCompletionController.java | 9 ++-- .../controller/ResiActListController.java | 2 +- .../controller/WorkActDraftController.java | 15 ++++--- .../controller/WorkActUserController.java | 5 ++- .../java/com/epmet/dao/ActSignInRecDao.java | 1 - .../java/com/epmet/dao/IcSocietyOrgDao.java | 3 +- .../com/epmet/entity/ActContentEntity.java | 3 -- .../com/epmet/entity/ActCustomizedEntity.java | 3 -- .../com/epmet/entity/ActLivePicEntity.java | 3 -- .../com/epmet/entity/ActLiveRecEntity.java | 2 - .../com/epmet/entity/ActSignInPicEntity.java | 3 -- .../com/epmet/entity/ActSignInRecEntity.java | 2 - .../com/epmet/entity/ActSummaryEntity.java | 3 -- .../epmet/entity/ActUserRelationEntity.java | 1 - .../IcCommunitySelfOrganizationEntity.java | 4 -- ...munitySelfOrganizationPersonnelEntity.java | 3 -- .../epmet/entity/IcPartyActivityEntity.java | 1 - .../com/epmet/entity/IcPartyUnitEntity.java | 5 +-- .../com/epmet/entity/IcSocietyOrgEntity.java | 1 - .../entity/IcUserDemandOperateLogEntity.java | 1 - .../IcUserDemandSatisfactionEntity.java | 1 - .../entity/IcUserDemandServiceEntity.java | 1 - .../epmet/entity/LatestActContentEntity.java | 3 -- .../com/epmet/entity/LatestActInfoEntity.java | 1 - .../entity/UserKindnessTimeLogEntity.java | 3 -- .../ExportCommunitySelfOrganizationExcel.java | 3 +- .../com/epmet/excel/IcPartyActivityExcel.java | 5 +-- .../com/epmet/excel/IcSocietyOrgExcel.java | 4 +- .../ImportCommunitySelfOrganization.java | 1 - .../com/epmet/service/ActInfoService.java | 4 +- .../IcCommunitySelfOrganizationService.java | 3 +- .../service/impl/ActContentServiceImpl.java | 4 +- .../service/impl/ActLivePicServiceImpl.java | 4 +- .../service/impl/ActLiveRecServiceImpl.java | 5 +-- .../impl/ActOperationRecServiceImpl.java | 4 +- .../service/impl/ActPointLogServiceImpl.java | 4 +- .../service/impl/ActSignInPicServiceImpl.java | 4 +- .../impl/ActStatisticalServiceImpl.java | 4 +- .../service/impl/ActSummaryServiceImpl.java | 3 +- .../service/impl/ActUserLogServiceImpl.java | 2 +- .../impl/ActUserRelationServiceImpl.java | 7 +-- ...ySelfOrganizationPersonnelServiceImpl.java | 5 +-- ...cCommunitySelfOrganizationServiceImpl.java | 1 - .../impl/LatestActContentServiceImpl.java | 4 +- .../impl/VolunteerInfoServiceImpl.java | 6 --- .../controller/ScheduleJobController.java | 1 - .../java/com/epmet/dao/ScheduleJobDao.java | 1 - .../impl/DimPartyMemberServiceImpl.java | 2 - .../service/impl/StatsGroupServiceImpl.java | 2 +- .../service/impl/TestTaskServiceImpl.java | 3 -- .../com/epmet/task/GroupAndHotTopicTask.java | 2 - .../epmet/constant/WxmpMessageConstant.java | 3 -- .../java/com/epmet/dto/SysMailLogDTO.java | 1 - .../com/epmet/dto/SysMailTemplateDTO.java | 3 +- .../com/epmet/dto/WxmpMsgSendRecordDTO.java | 3 +- .../epmet/dto/WxmpResiUserSubscribeDTO.java | 5 ++- .../WxmpTemplateMsgSubscribeStatusDTO.java | 5 ++- .../com/epmet/dto/WxmpUpdateSendDataDTO.java | 7 +-- .../epmet/dto/WxmpUpdateSendRecordDTO.java | 17 +++---- .../epmet/dto/WxmpUserSubscribeRecordDTO.java | 5 ++- .../epmet/dto/WxmpWorkUserSubscribeDTO.java | 7 +-- .../dto/form/ReceiverGroupCommonFormDTO.java | 1 - .../dto/form/WxSubscribeMessageFormDTO.java | 3 -- .../dto/form/WxmpMessagePushFormDTO.java | 2 - .../feign/EpmetMessageOpenFeignClient.java | 8 +--- .../EpmetMessageOpenFeignClientFallback.java | 8 +--- .../com/epmet/controller/InfoController.java | 13 +++--- .../epmet/controller/MailLogController.java | 1 - .../com/epmet/controller/SmsController.java | 1 - .../controller/UserMessageController.java | 1 - .../WxmpMsgSendRecordController.java | 6 +-- .../WxmpResiUserSubscribeController.java | 6 +-- ...pTemplateMsgSubscribeStatusController.java | 6 +-- .../WxmpUpdateSendDataController.java | 2 +- .../WxmpUpdateSendRecordController.java | 6 +-- .../WxmpUserSubscribeRecordController.java | 6 +-- .../WxmpWorkUserSubscribeController.java | 8 ++-- .../main/java/com/epmet/email/EmailUtils.java | 2 +- .../java/com/epmet/entity/InfoEntity.java | 3 -- .../entity/InfoGroupReceiversEntity.java | 3 -- .../epmet/entity/InfoReceiverGroupEntity.java | 3 -- .../com/epmet/entity/InfoReplyEntity.java | 3 -- .../com/epmet/entity/SystemMessageEntity.java | 4 -- .../entity/SystemMessagePenddingEntity.java | 3 -- .../epmet/entity/WxmpMsgSendRecordEntity.java | 1 - .../entity/WxmpResiUserSubscribeEntity.java | 3 -- .../WxmpTemplateMsgSubscribeStatusEntity.java | 3 -- .../entity/WxmpUpdateSendDataEntity.java | 5 +-- .../entity/WxmpUpdateSendRecordEntity.java | 13 +++--- .../entity/WxmpUserSubscribeRecordEntity.java | 3 -- .../entity/WxmpWorkUserSubscribeEntity.java | 5 +-- .../java/com/epmet/service/InfoService.java | 3 +- .../com/epmet/service/UserMessageService.java | 3 +- .../epmet/service/impl/InfoServiceImpl.java | 1 - .../impl/WxmpMsgSendRecordServiceImpl.java | 2 +- .../WxmpResiUserSubscribeServiceImpl.java | 4 +- ...TemplateMsgSubscribeStatusServiceImpl.java | 4 +- .../impl/WxmpUpdateSendDataServiceImpl.java | 4 +- .../impl/WxmpUpdateSendRecordServiceImpl.java | 4 +- .../WxmpUserSubscribeRecordServiceImpl.java | 4 +- .../WxmpWorkUserSubscribeServiceImpl.java | 6 +-- .../java/com/epmet/sms/QcloudSmsService.java | 8 ++-- .../main/java/com/epmet/sms/SmsConfig.java | 1 - .../com/epmet/cloud/CloudStorageConfig.java | 4 +- .../cloud/FastDFSCloudStorageService.java | 4 +- .../cloud/QcloudCloudStorageService.java | 4 +- .../epmet/cloud/QiniuCloudStorageService.java | 5 +-- .../com/epmet/dto/BizPointTotalDetailDTO.java | 5 ++- .../com/epmet/dto/PointAdjustmentLogDTO.java | 21 ++++----- .../epmet/dto/PointVerificationLogDTO.java | 5 ++- .../PointVerificationStatisticalDailyDTO.java | 5 ++- .../java/com/epmet/dto/SysOperateLogDTO.java | 5 ++- .../com/epmet/dto/UserPointActionLogDTO.java | 5 ++- .../dto/UserPointStatisticalDailyDTO.java | 5 ++- .../java/com/epmet/dto/UserPointTotalDTO.java | 5 ++- .../com/epmet/dto/form/AllPartyFormDTO.java | 1 - .../com/epmet/dto/form/GroupPointFormDTO.java | 1 - .../form/ResiAroundPartyPointRankFormDTO.java | 2 - .../form/WorkPointVerificationFormDTO.java | 1 - .../dto/result/ResiPointRankResultDTO.java | 2 - .../feign/EpmetPointOpenFeignClient.java | 1 - .../EpmetPointOpenFeignClientFallback.java | 1 - .../controller/GroupPointController.java | 4 -- .../entity/BizPointTotalDetailEntity.java | 3 -- .../entity/BizPointUserTotalDetailEntity.java | 3 -- .../entity/PointAdjustmentLogEntity.java | 5 +-- .../entity/PointVerificationLogEntity.java | 3 -- ...intVerificationStatisticalDailyEntity.java | 3 -- .../entity/UserPointActionLogEntity.java | 3 -- .../UserPointStatisticalDailyEntity.java | 3 -- .../epmet/entity/UserPointTotalEntity.java | 3 -- .../service/BizPointTotalDetailService.java | 4 +- .../impl/BizPointTotalDetailServiceImpl.java | 11 +++-- .../impl/PointAdjustmentLogServiceImpl.java | 3 +- .../service/impl/PointRuleServiceImpl.java | 6 ++- .../impl/PointVerificationLogServiceImpl.java | 4 +- ...rificationStatisticalDailyServiceImpl.java | 4 +- .../main/java/com/epmet/dto/AuthCodeDTO.java | 17 +++---- .../com/epmet/dto/AuthResultRecordDTO.java | 7 +-- .../com/epmet/dto/AuthorizationInfoDTO.java | 17 +++---- .../java/com/epmet/dto/BindingAccountDTO.java | 7 +-- .../java/com/epmet/dto/BusinessInfoDTO.java | 7 +-- .../com/epmet/dto/CodeAuditRecordDTO.java | 9 ++-- .../com/epmet/dto/CodeAuditResultDTO.java | 7 +-- .../java/com/epmet/dto/CodeCustomerDTO.java | 7 +-- .../main/java/com/epmet/dto/CodeExtDTO.java | 7 +-- .../main/java/com/epmet/dto/CodeMediaDTO.java | 7 +-- .../epmet/dto/CodeOperationHistoryDTO.java | 7 +-- .../epmet/dto/ComponentAccessTokenDTO.java | 5 ++- .../epmet/dto/ComponentVerifyTicketDTO.java | 5 ++- .../java/com/epmet/dto/CustomerMpDTO.java | 5 ++- .../java/com/epmet/dto/FixationAppIdDTO.java | 7 +-- .../main/java/com/epmet/dto/FuncInfoDTO.java | 17 +++---- .../com/epmet/dto/MiniCategoryInfoDTO.java | 5 ++- .../main/java/com/epmet/dto/MiniInfoDTO.java | 5 ++- .../com/epmet/dto/MiniNetworkInfoDTO.java | 5 ++- .../com/epmet/dto/OpenPlatformAccountDTO.java | 7 +-- .../com/epmet/dto/PaCustomerAgencyDTO.java | 8 ++-- .../java/com/epmet/dto/PaCustomerDTO.java | 5 ++- .../epmet/dto/PaCustomerUserAgencyDTO.java | 5 ++- .../main/java/com/epmet/dto/PaInfoDTO.java | 9 ++-- .../main/java/com/epmet/dto/PaUserDTO.java | 5 ++- .../java/com/epmet/dto/PaUserVisitedDTO.java | 5 ++- .../java/com/epmet/dto/PaUserWechatDTO.java | 7 +-- .../com/epmet/dto/PersonalTemplateDTO.java | 7 +-- .../java/com/epmet/dto/PreAuthTokenDTO.java | 7 +-- .../java/com/epmet/dto/PublicTemplateDTO.java | 29 ++++++------ .../form/BlockChainProjectProcessFormDTO.java | 45 +++++++++---------- .../epmet/dto/form/CheckPaUserFormDTO.java | 1 - .../form/ComponentVerifyTicketFormDTO.java | 1 - .../epmet/dto/form/ModifyDomainFormDTO.java | 1 - .../com/epmet/dto/form/ProjectDetailDTO.java | 1 - .../dto/form/SaveUserVisitedFormDTO.java | 1 - .../epmet/dto/form/WxCodeToTokenFormDTO.java | 1 - .../com/epmet/dto/form/WxLoginFormDTO.java | 1 - .../dto/result/CodeHistoryResultDTO.java | 1 - .../dto/result/CodeVersionInfoResultDTO.java | 1 - .../dto/result/CreateAgencyResultDTO.java | 2 - .../dto/result/CustomerAndUserResultDTO.java | 5 --- .../feign/EpmetThirdOpenFeignClient.java | 19 ++++---- .../com/epmet/feign/ThirdOpenFeignClient.java | 1 - .../EpmetThirdOpenFeignClientFallback.java | 12 +++-- .../ThirdOpenFeignClientFallback.java | 1 - .../main/java/com/epmet/utils/ThirdUtils.java | 3 -- .../epmet/apiservice/impl/DemoApiService.java | 5 +-- .../controller/AuthRedirectController.java | 9 ++-- .../controller/CodeAuditResultController.java | 8 ++-- .../com/epmet/controller/CodeController.java | 5 +-- .../controller/CodeCustomerController.java | 8 ++-- .../epmet/controller/CodeMediaController.java | 8 ++-- .../CodeOperationHistoryController.java | 8 ++-- .../ComponentVerifyTicketController.java | 4 +- .../PaCustomerAgencyController.java | 6 +-- .../controller/PaCustomerController.java | 2 +- .../PaCustomerUserAgencyController.java | 6 +-- .../controller/PaUserWechatController.java | 6 +-- .../epmet/controller/ProjectController.java | 4 +- .../com/epmet/controller/TestConttroller.java | 1 - .../controller/WeChatNotifyController.java | 4 +- .../java/com/epmet/dao/CodeCustomerDao.java | 6 +-- .../epmet/dao/ComponentAccessTokenDao.java | 4 +- .../java/com/epmet/dao/CustomerMpDao.java | 3 +- .../com/epmet/dao/OpenPlatformAccountDao.java | 5 +-- .../main/java/com/epmet/dao/PaInfoDao.java | 5 +-- .../main/java/com/epmet/dao/PaUserDao.java | 3 +- .../com/epmet/dao/PersonalTemplateDao.java | 5 ++- .../java/com/epmet/dao/PublicTemplateDao.java | 5 +-- .../java/com/epmet/entity/AuthCodeEntity.java | 1 - .../epmet/entity/AuthResultRecordEntity.java | 3 +- .../epmet/entity/AuthorizationInfoEntity.java | 1 - .../epmet/entity/BindingAccountEntity.java | 3 -- .../com/epmet/entity/BusinessInfoEntity.java | 5 +-- .../epmet/entity/CodeAuditRecordEntity.java | 3 +- .../epmet/entity/CodeAuditResultEntity.java | 5 +-- .../com/epmet/entity/CodeCustomerEntity.java | 3 +- .../java/com/epmet/entity/CodeExtEntity.java | 5 +-- .../com/epmet/entity/CodeMediaEntity.java | 5 +-- .../entity/CodeOperationHistoryEntity.java | 5 +-- .../entity/ComponentAccessTokenEntity.java | 1 - .../entity/ComponentVerifyTicketEntity.java | 3 -- .../com/epmet/entity/CustomerMpEntity.java | 3 -- .../com/epmet/entity/FixationAppIdEntity.java | 5 +-- .../java/com/epmet/entity/FuncInfoEntity.java | 5 +-- .../epmet/entity/MessagePushTextEntity.java | 3 +- .../epmet/entity/MiniCategoryInfoEntity.java | 3 -- .../java/com/epmet/entity/MiniInfoEntity.java | 3 -- .../epmet/entity/MiniNetworkInfoEntity.java | 3 -- .../entity/OpenPlatformAccountEntity.java | 3 -- .../epmet/entity/PaCustomerAgencyEntity.java | 3 -- .../com/epmet/entity/PaCustomerEntity.java | 3 -- .../entity/PaCustomerUserAgencyEntity.java | 3 -- .../java/com/epmet/entity/PaInfoEntity.java | 7 +-- .../java/com/epmet/entity/PaUserEntity.java | 3 -- .../com/epmet/entity/PaUserVisitedEntity.java | 3 -- .../com/epmet/entity/PaUserWechatEntity.java | 5 +-- .../epmet/entity/PersonalTemplateEntity.java | 5 +-- .../com/epmet/entity/PreAuthTokenEntity.java | 3 +- .../epmet/entity/PublicTemplateEntity.java | 13 +++--- .../entity/ThirdplatformActionEntity.java | 9 ++-- .../ThirdplatformCustomerActionEntity.java | 3 -- .../ThirdplatformCustomerRegisterEntity.java | 9 ++-- .../com/epmet/entity/ThirdplatformEntity.java | 7 +-- .../service/ComponentVerifyTicketService.java | 1 - .../com/epmet/service/ProjectService.java | 4 +- .../com/epmet/service/SubscribeService.java | 9 ++-- .../epmet/service/ThirdPlatformService.java | 2 +- .../impl/BlockChainProjectServiceImpl.java | 31 +++++++------ .../impl/CodeAuditResultServiceImpl.java | 6 +-- .../service/impl/CodeCustomerServiceImpl.java | 4 +- .../service/impl/CodeExtServiceImpl.java | 6 +-- .../service/impl/CodeMediaServiceImpl.java | 6 +-- .../impl/CodeOperationHistoryServiceImpl.java | 6 +-- .../impl/PaCustomerAgencyServiceImpl.java | 4 +- .../impl/PaCustomerUserAgencyServiceImpl.java | 4 +- .../service/impl/PaUserWechatServiceImpl.java | 4 +- .../service/impl/PrivateEpmetServiceImpl.java | 4 -- .../service/impl/ProjectServiceImpl.java | 4 +- .../impl/ThirdPlatformServiceImpl.java | 2 +- .../service/impl/WarrantServiceImpl.java | 5 ++- .../com/epmet/wxapi/param/WxMaNewsReq.java | 1 - .../epmet/wxapi/result/WxBasicInfoResult.java | 1 - .../epmet/wxapi/result/WxMaNewsResult.java | 1 - .../epmet/wxapi/service/WxLoginService.java | 2 - .../wxapi/service/WxMaSettingService.java | 2 - .../service/impl/WxMaSettingServiceImpl.java | 2 - .../com/epmet/dto/GovCustomerMenuDTO.java | 5 ++- .../com/epmet/dto/IcOftenUseFunctionDTO.java | 7 +-- .../java/com/epmet/dto/OperationScopeDTO.java | 5 ++- .../main/java/com/epmet/dto/RoleScopeDTO.java | 7 +-- .../form/AccessConfigAdd4RoletFormDTO.java | 1 - .../AccessConfigOpeDefaultScopesFormDTO.java | 2 - .../java/com/epmet/dto/form/MenuFormDTO.java | 1 - .../PackageAddOftenUseFunctionFormDTO.java | 1 - .../result/RoleOperationDefaultResultDTO.java | 7 +-- .../GovAccessFeignClientFallBack.java | 3 +- .../epmet/config/PermissionInitializer.java | 5 ++- .../epmet/controller/AccessController.java | 9 +++- .../controller/GovCustomerMenuController.java | 2 +- .../IcOftenUseFunctionController.java | 13 +++--- .../java/com/epmet/dao/OperationScopeDao.java | 3 +- .../epmet/dao/RoleOperationDefaultDao.java | 4 +- .../epmet/entity/GovCustomerMenuEntity.java | 3 -- .../entity/IcOftenUseFunctionEntity.java | 3 -- .../com/epmet/entity/OperationEntity.java | 7 +-- .../entity/OperationScopeDefaultEntity.java | 3 -- .../epmet/entity/OperationScopeEntity.java | 3 -- .../com/epmet/entity/RoleOperationEntity.java | 3 -- .../com/epmet/entity/RoleScopeEntity.java | 3 -- .../fallback/GovOrgFeignClientFallBack.java | 7 +-- .../service/IcOftenUseFunctionService.java | 3 +- .../service/impl/AccessConfigServiceImpl.java | 5 ++- .../impl/IcOftenUseFunctionServiceImpl.java | 3 +- .../impl/OperationScopeServiceImpl.java | 5 +-- .../impl/RoleOperationServiceImpl.java | 4 +- .../service/impl/RoleScopeServiceImpl.java | 5 +-- .../epmet/service/impl/TestServiceImpl.java | 1 - .../result/AuditedPartyMemberResultDTO.java | 1 - .../result/AuditingPartyMemberResultDTO.java | 1 - .../epmet/controller/ResiTopicController.java | 2 - .../fallback/GovOrgFeignClientFallBack.java | 5 +-- .../ResiGroupFeignClientFallBack.java | 4 +- .../epmet/service/ResiPartyMemberService.java | 9 +--- .../java/com/epmet/dto/IssueCategoryDTO.java | 5 ++- .../epmet/dto/IssueCustomerParameterDTO.java | 5 ++- .../java/com/epmet/dto/IssueProcessDTO.java | 5 ++- .../epmet/dto/IssueProjectRelationDTO.java | 5 ++- .../com/epmet/dto/IssueProjectTagDictDTO.java | 5 ++- .../epmet/dto/IssueSatisfactionDetailDTO.java | 5 ++- .../dto/IssueSatisfactionStatisticalDTO.java | 5 ++- .../dto/IssueShareLinkVisitRecordDTO.java | 9 ++-- .../main/java/com/epmet/dto/IssueTagsDTO.java | 5 ++- .../com/epmet/dto/IssueVoteDetailDTO.java | 5 ++- .../epmet/dto/IssueVoteStatisticalDTO.java | 5 ++- .../dto/IssueVoteStatisticalDailyDTO.java | 5 ++- .../com/epmet/dto/form/AddTagFormDTO.java | 1 - .../epmet/dto/form/IssueAuditionFormDTO.java | 1 - .../form/IssueShiftedFromTopicFormDTO.java | 1 - .../epmet/dto/form/MemosToRemindFormDTO.java | 1 - .../dto/form/MyPubIssuesAuditingFormDTO.java | 1 - .../dto/form/SaveIssueCategoryFormDTO.java | 1 - .../result/ApplicationDetailResultDTO.java | 1 - .../dto/result/GovIssueDetailResultDTO.java | 1 - .../dto/result/MemosToRemindResultDTO.java | 1 - .../GovIssueOpenFeignClientFallBack.java | 3 -- .../controller/IssueAuditController.java | 5 ++- .../IssueCustomerParameterController.java | 6 +-- .../controller/IssueProcessController.java | 6 +-- .../IssueProjectRelationController.java | 6 +-- .../IssueProjectTagDictController.java | 6 +-- .../IssueSatisfactionDetailController.java | 6 +-- ...ssueSatisfactionStatisticalController.java | 6 +-- .../IssueShareLinkVisitRecordController.java | 7 ++- .../controller/IssueVoteDetailController.java | 6 +-- .../IssueVoteStatisticalController.java | 2 +- .../IssueVoteStatisticalDailyController.java | 6 +-- .../java/com/epmet/dao/IssueProcessDao.java | 4 +- .../dao/IssueShareLinkVisitRecordDao.java | 6 +-- .../com/epmet/entity/IssueCategoryEntity.java | 3 -- .../entity/IssueCustomerParameterEntity.java | 3 -- .../java/com/epmet/entity/IssueEntity.java | 1 - .../com/epmet/entity/IssueProcessEntity.java | 3 -- .../IssueProjectCategoryDictEntity.java | 3 -- .../entity/IssueProjectRelationEntity.java | 3 -- .../entity/IssueProjectTagDictEntity.java | 3 -- .../entity/IssueSatisfactionDetailEntity.java | 3 -- .../IssueSatisfactionStatisticalEntity.java | 3 -- .../IssueShareLinkVisitRecordEntity.java | 5 +-- .../epmet/entity/IssueSuggestionEntity.java | 3 -- .../com/epmet/entity/IssueTagsEntity.java | 3 -- .../epmet/entity/IssueVoteDetailEntity.java | 3 -- .../IssueVoteStatisticalDailyEntity.java | 1 - .../entity/IssueVoteStatisticalEntity.java | 3 -- .../epmet/feign/GovProjectFeignClient.java | 2 +- .../com/epmet/feign/ResiGroupFeignClient.java | 2 - .../GovProjectFeignClientFallBack.java | 2 +- .../ResiGroupFeignClientFallBack.java | 3 -- .../epmet/mq/RocketMQConsumerRegister.java | 8 +--- .../epmet/service/IssueProcessService.java | 3 +- .../service/IssueProjectRelationService.java | 3 +- .../java/com/epmet/service/IssueService.java | 2 - .../IssueShareLinkVisitRecordService.java | 5 ++- .../epmet/service/IssueVoteDetailService.java | 4 +- .../service/IssueVoteStatisticalService.java | 3 +- .../impl/IssueApplicationServiceImpl.java | 4 +- .../IssueCustomerParameterServiceImpl.java | 4 +- .../service/impl/IssueProcessServiceImpl.java | 4 +- .../impl/IssueProjectRelationServiceImpl.java | 4 +- .../impl/IssueProjectTagDictServiceImpl.java | 1 - .../IssueSatisfactionDetailServiceImpl.java | 4 +- ...sueSatisfactionStatisticalServiceImpl.java | 4 +- .../IssueShareLinkVisitRecordServiceImpl.java | 1 - .../impl/IssueVoteDetailServiceImpl.java | 4 +- .../IssueVoteStatisticalDailyServiceImpl.java | 5 +-- .../impl/IssueVoteStatisticalServiceImpl.java | 5 +-- .../com/epmet/dto/form/GovFootBarFormDTO.java | 4 +- .../com/epmet/config/LoadBalancerConfig.java | 4 -- .../epmet/controller/AccessController.java | 2 - .../controller/StaffAgencyController.java | 3 +- .../com/epmet/feign/EpmetUserFeignClient.java | 2 - .../EpmetUserFeignClientFallback.java | 6 +-- .../epmet/service/impl/AccessServiceImpl.java | 2 +- .../epmet/dto/CustomerOrgParameterDTO.java | 7 +-- .../com/epmet/dto/CustomerStaffAgencyDTO.java | 5 ++- .../epmet/dto/CustomerStaffDepartmentDTO.java | 7 +-- .../com/epmet/dto/CustomerStaffGridDTO.java | 7 +-- .../java/com/epmet/dto/IcBuildingUnitDTO.java | 5 ++- .../com/epmet/dto/IcHouseChangeDetailDTO.java | 7 +-- .../com/epmet/dto/IcHouseChangeRecordDTO.java | 7 +-- .../dto/IcMatterAppointmentRecordDTO.java | 15 ++++--- .../java/com/epmet/dto/IcNeighborHoodDTO.java | 5 ++- .../com/epmet/dto/IcNeighborHoodPartDTO.java | 5 ++- .../epmet/dto/IcNeighborHoodPropertyDTO.java | 5 ++- .../epmet/dto/IcPartyServiceCenterDTO.java | 13 +++--- .../dto/IcPartyServiceCenterMatterDTO.java | 9 ++-- .../java/com/epmet/dto/IcPlaceOrgDTO.java | 5 ++- .../com/epmet/dto/IcPlacePatrolRecordDTO.java | 5 ++- .../dto/IcPlacePatrolReviewRecordDTO.java | 5 ++- .../com/epmet/dto/IcPlacePatrolTeamDTO.java | 5 ++- .../epmet/dto/IcPlacePatrolTeamStaffDTO.java | 5 ++- .../epmet/dto/IcPropertyManagementDTO.java | 5 ++- .../com/epmet/dto/StaffOrgRelationDTO.java | 5 ++- .../com/epmet/dto/StaffTransferRecordDTO.java | 5 ++- .../java/com/epmet/dto/UserIdAndPidDTO.java | 5 +-- .../dto/form/AddAgencyAndStaffFormDTO.java | 4 +- .../com/epmet/dto/form/AddAgencyFormDTO.java | 3 +- .../com/epmet/dto/form/AdminStaffFromDTO.java | 2 - .../epmet/dto/form/AgencyDeptGridFormDTO.java | 4 +- .../dto/form/CanTickStaffListFormDTO.java | 1 - .../epmet/dto/form/CreateQrCodeFormDTO.java | 1 - .../EditPlacePatrolReviewRecordFormDTO.java | 4 +- .../epmet/dto/form/IcBulidingUnitFormDTO.java | 7 +-- .../com/epmet/dto/form/StaffInfoFromDTO.java | 1 - .../dto/form/UpdateTagUseCountsFormDTO.java | 1 - .../epmet/dto/result/ActSponsorGridInfo.java | 1 - .../AppointmentExistRecordResultDTO.java | 4 -- .../ArticleAgencyGridListResultDTO.java | 4 +- .../epmet/dto/result/BuildingResultDTO.java | 1 - .../dto/result/GridListInfoResultDTO.java | 2 - .../result/IcPropertyManagementResultDTO.java | 2 - .../epmet/dto/result/MapSonOrgResultDTO.java | 1 - .../dto/result/PlaceOrgDetailResultDTO.java | 1 - .../epmet/dto/result/SubAgencyResultDTO.java | 3 +- .../java/com/epmet/dto/result/UnitDTO.java | 1 - .../UpdateBuildingHouseNumResultDTO.java | 1 - .../java/com/epmet/enums/OrgLevelEnums.java | 2 - .../epmet/feign/GovOrgOpenFeignClient.java | 2 - .../GovOrgOpenFeignClientFallback.java | 1 - .../com/epmet/config/LoadBalanceConfig.java | 4 -- .../epmet/controller/AgencyController.java | 1 - .../CustomerDepartmentController.java | 8 ++-- .../CustomerStaffDepartmentController.java | 8 ++-- .../controller/DepartmentController.java | 3 +- .../IcHouseChangeDetailController.java | 2 +- .../IcHouseChangeRecordController.java | 3 +- .../IcMatterAppointmentRecordController.java | 6 +-- .../controller/IcNeighborHoodController.java | 1 - .../IcPartyServiceCenterController.java | 9 ++-- .../IcPartyServiceCenterMatterController.java | 6 +-- .../IcPlacePatrolTeamStaffController.java | 5 +-- .../IcPropertyManagementController.java | 9 ++-- .../StaffTransferRecordController.java | 6 +-- .../epmet/dao/CustomerStaffDepartmentDao.java | 5 +-- .../java/com/epmet/dao/IcNeighborHoodDao.java | 2 +- .../epmet/dao/IcPartyServiceCenterDao.java | 3 +- .../epmet/dao/IcPropertyManagementDao.java | 3 +- .../entity/CustomerOrgParameterEntity.java | 5 +-- .../entity/CustomerPartyBranchEntity.java | 3 -- .../entity/CustomerStaffAgencyEntity.java | 3 -- .../entity/CustomerStaffDepartmentEntity.java | 5 +-- .../epmet/entity/CustomerStaffGridEntity.java | 5 +-- .../epmet/entity/IcBuildingUnitEntity.java | 3 -- .../entity/IcHouseChangeDetailEntity.java | 3 -- .../entity/IcHouseChangeRecordEntity.java | 3 -- .../java/com/epmet/entity/IcHouseEntity.java | 2 - .../IcMatterAppointmentRecordEntity.java | 9 ++-- .../epmet/entity/IcNeighborHoodEntity.java | 3 -- .../entity/IcNeighborHoodPartEntity.java | 3 -- .../entity/IcNeighborHoodPropertyEntity.java | 3 -- .../entity/IcPartyServiceCenterEntity.java | 7 +-- .../IcPartyServiceCenterMatterEntity.java | 3 -- .../com/epmet/entity/IcPlaceOrgEntity.java | 3 -- .../entity/IcPlacePatrolRecordEntity.java | 1 - .../IcPlacePatrolReviewRecordEntity.java | 1 - .../epmet/entity/IcPlacePatrolTeamEntity.java | 1 - .../entity/IcPlacePatrolTeamStaffEntity.java | 3 -- .../entity/IcPropertyManagementEntity.java | 3 -- .../epmet/entity/StaffOrgRelationEntity.java | 3 -- .../entity/StaffTransferRecordEntity.java | 3 -- .../com/epmet/excel/IcNeighborHoodExcel.java | 5 +-- .../epmet/model/BuildingErrorInfoModel.java | 1 - .../com/epmet/model/HouseErrorInfoModel.java | 2 - .../model/ImportBuildingInfoListener.java | 1 - .../epmet/model/ImportHouseInfoListener.java | 4 -- .../model/NeighborHoodErrorInfoModel.java | 1 - .../epmet/mq/RocketMQConsumerRegister.java | 1 - .../service/CustomerStaffGridService.java | 4 +- .../com/epmet/service/DepartmentService.java | 7 ++- .../IcPlacePatrolTeamStaffService.java | 3 +- .../CustomerStaffDepartmentServiceImpl.java | 2 +- .../epmet/service/impl/HouseServiceImpl.java | 1 - .../impl/IcHouseChangeDetailServiceImpl.java | 5 +-- .../impl/IcHouseChangeRecordServiceImpl.java | 5 +-- .../IcMatterAppointmentRecordServiceImpl.java | 5 +-- .../impl/IcNeighborHoodPartServiceImpl.java | 5 +-- .../IcNeighborHoodPropertyServiceImpl.java | 5 +-- ...IcPartyServiceCenterMatterServiceImpl.java | 5 +-- .../impl/IcPartyServiceCenterServiceImpl.java | 2 +- .../IcPlacePatrolTeamStaffServiceImpl.java | 4 +- .../service/impl/NeighborHoodServiceImpl.java | 3 +- .../dto/CustomerProjectParameterDTO.java | 5 ++- .../com/epmet/dto/ProjectCategoryDTO.java | 5 ++- .../com/epmet/dto/ProjectOrgRelationDTO.java | 15 ++++--- .../dto/ProjectProcessAttachmentDTO.java | 5 ++- .../java/com/epmet/dto/ProjectProcessDTO.java | 6 +-- .../epmet/dto/ProjectProcessScanTaskDTO.java | 5 ++- .../epmet/dto/ProjectRelatedPersonnelDTO.java | 5 ++- .../dto/ProjectSatisfactionDetailDTO.java | 5 ++- .../dto/ProjectSatisfactionStatisticsDTO.java | 5 ++- .../java/com/epmet/dto/ProjectStaffDTO.java | 5 ++- .../epmet/dto/ProjectSubAttachmentDTO.java | 7 +-- .../com/epmet/dto/ProjectSubProcessDTO.java | 7 +-- .../java/com/epmet/dto/ProjectTagsDTO.java | 5 ++- .../epmet/dto/form/DelCategoryFormDTO.java | 1 - .../com/epmet/dto/form/EventListFormDTO.java | 1 - .../epmet/dto/form/PatrolProjectFormDTO.java | 1 - .../com/epmet/dto/form/ReplyListFormDTO.java | 1 - .../dto/form/ThirdPlatformConfigFormDTO.java | 1 - .../com/epmet/dto/form/TickStaffFormDTO.java | 3 -- .../epmet/dto/form/UpdateViewTimeFormDTO.java | 1 - .../epmet/dto/result/LatestListResultDTO.java | 1 - .../dto/result/MyPartProjectsResultDTO.java | 1 - .../com/epmet/dto/result/PlatformFileDTO.java | 1 - .../dto/result/ProcesslistResultDTO.java | 4 +- .../ProjectInitEvaluationResultDTO.java | 2 - .../CustomerProjectParameterController.java | 6 +-- .../controller/MemoConcernController.java | 1 - .../controller/MemoWorkDiaryController.java | 5 +-- .../ProjectProcessAttachmentController.java | 6 +-- .../controller/ProjectProcessController.java | 6 +-- .../ProjectProcessScanTaskController.java | 6 +-- .../ProjectRelatedPersonnelController.java | 6 +-- .../ProjectSatisfactionDetailController.java | 6 +-- ...ojectSatisfactionStatisticsController.java | 6 +-- .../controller/ProjectStaffController.java | 6 +-- .../dao/CustomerProjectParameterDao.java | 3 +- .../main/java/com/epmet/dao/MemoAttrDao.java | 3 +- .../java/com/epmet/dao/MemoDifficultyDao.java | 3 +- .../main/java/com/epmet/dao/ProjectDao.java | 7 ++- .../dao/ProjectSatisfactionDetailDao.java | 4 +- .../dao/ProjectSatisfactionStatisticsDao.java | 3 +- .../CustomerProjectParameterEntity.java | 3 -- .../com/epmet/entity/MemoWorkDiaryEntity.java | 2 - .../epmet/entity/ProjectCategoryEntity.java | 3 -- .../entity/ProjectOrgRelationEntity.java | 1 - .../ProjectProcessAttachmentEntity.java | 3 -- .../epmet/entity/ProjectProcessEntity.java | 1 - .../entity/ProjectProcessScanTaskEntity.java | 3 -- .../entity/ProjectRelatedPersonnelEntity.java | 3 -- .../ProjectSatisfactionDetailEntity.java | 3 -- .../ProjectSatisfactionStatisticsEntity.java | 3 -- .../com/epmet/entity/ProjectStaffEntity.java | 3 -- .../entity/ProjectSubAttachmentEntity.java | 5 +-- .../epmet/entity/ProjectSubProcessEntity.java | 3 +- .../com/epmet/entity/ProjectTagsEntity.java | 3 -- .../entity/ResiEventAttachmentEntity.java | 3 -- .../com/epmet/entity/ResiEventEntity.java | 3 +- .../entity/ResiEventOperationLogEntity.java | 1 - .../epmet/entity/ResiEventReplyEntity.java | 3 -- .../java/com/epmet/redis/ProjectRedis.java | 3 +- .../epmet/service/MemoDifficultyService.java | 4 +- .../ProjectSatisfactionDetailService.java | 6 +-- .../epmet/service/ProjectStaffService.java | 3 +- .../impl/BlockChainUploadServiceImpl.java | 1 - .../CustomerProjectParameterServiceImpl.java | 4 +- .../impl/MemoDifficultyServiceImpl.java | 5 +-- .../ProjectProcessAttachmentServiceImpl.java | 4 +- .../ProjectProcessScanTaskServiceImpl.java | 4 +- .../impl/ProjectProcessServiceImpl.java | 13 +----- .../ProjectRelatedPersonnelServiceImpl.java | 4 +- ...jectSatisfactionStatisticsServiceImpl.java | 5 +-- .../service/impl/ProjectStaffServiceImpl.java | 3 +- .../service/impl/ProjectTagsServiceImpl.java | 2 +- .../impl/ResiEventReplyServiceImpl.java | 5 +-- .../java/com/epmet/dto/ArticleCoverDTO.java | 5 ++- .../epmet/dto/ArticleOperateRecordDTO.java | 5 ++- .../java/com/epmet/dto/ArticleTagsDTO.java | 5 ++- .../com/epmet/dto/ArticleVisitRecordDTO.java | 5 ++- .../java/com/epmet/dto/DraftCoverDTO.java | 5 ++- .../com/epmet/dto/GuideCollectionDTO.java | 5 ++- .../com/epmet/dto/GuideExternalLinkDTO.java | 5 ++- .../java/com/epmet/dto/GuideModuleDTO.java | 7 +-- .../com/epmet/dto/GuideModuleDictDTO.java | 5 ++- .../epmet/dto/GuideModuleDictDefaultDTO.java | 5 ++- .../java/com/epmet/dto/TagCustomerDTO.java | 5 ++- .../java/com/epmet/dto/TagDefaultDTO.java | 5 ++- .../main/java/com/epmet/dto/TagGridDTO.java | 5 ++- .../java/com/epmet/dto/form/GuideFormDTO.java | 4 -- .../epmet/dto/form/OffLineArticleFormDTO.java | 1 - .../dto/form/PublishGridListFormDTO.java | 1 - .../epmet/dto/form/PublishedListFormDTO.java | 1 - .../epmet/feign/GovVoiceOpenFeignClient.java | 1 - .../GovVoiceOpenFeignClientFallback.java | 1 - .../main/java/com/epmet/dao/ArticleDao.java | 8 +--- .../com/epmet/entity/ArticleCoverEntity.java | 3 -- .../entity/ArticlePublishRangeEntity.java | 1 - .../com/epmet/entity/ArticleTagsEntity.java | 3 -- .../entity/ArticleVisitRecordEntity.java | 3 -- .../com/epmet/entity/DraftCoverEntity.java | 3 -- .../epmet/entity/DraftPublishRangeEntity.java | 1 - .../epmet/entity/GuideCollectionEntity.java | 3 -- .../entity/GuideModuleDictDefaultEntity.java | 3 -- .../epmet/entity/GuideModuleDictEntity.java | 3 -- .../com/epmet/entity/GuideModuleEntity.java | 5 +-- .../com/epmet/entity/TagDefaultEntity.java | 3 -- .../java/com/epmet/entity/TagGridEntity.java | 3 -- .../epmet/service/SpecialSubjectService.java | 6 +-- .../impl/SpecialSubjectServiceImpl.java | 5 ++- .../entity/BaseDisputeProcessEntity.java | 1 - .../java/com/epmet/dto/OperLanguageDTO.java | 6 +-- .../main/java/com/epmet/dto/OperMenuDTO.java | 10 ++--- .../java/com/epmet/dto/OperResourceDTO.java | 5 ++- .../main/java/com/epmet/dto/OperRoleDTO.java | 6 +-- .../java/com/epmet/dto/OperRoleMenuDTO.java | 5 ++- .../java/com/epmet/dto/OperRoleUserDTO.java | 5 ++- .../feign/OperAccessOpenFeignClient.java | 6 +-- .../OperAccessOpenFeignClientFallback.java | 1 - .../controller/OperLanguageController.java | 6 +-- .../controller/OperResourceController.java | 6 +-- .../controller/OperRoleMenuController.java | 6 +-- .../controller/OperRoleUserController.java | 6 +-- .../java/com/epmet/entity/OperMenuEntity.java | 3 -- .../com/epmet/entity/OperResourceEntity.java | 4 -- .../java/com/epmet/entity/OperRoleEntity.java | 2 - .../com/epmet/entity/OperRoleMenuEntity.java | 1 - .../com/epmet/excel/OperLanguageExcel.java | 4 +- .../com/epmet/feign/EpmetUserFeignClient.java | 3 +- .../com/epmet/service/OperMenuService.java | 4 +- .../service/impl/OperLanguageServiceImpl.java | 4 +- .../service/impl/OperMenuServiceImpl.java | 6 +-- .../service/impl/OperResourceServiceImpl.java | 4 +- .../service/impl/OperRoleMenuServiceImpl.java | 4 +- .../service/impl/OperRoleServiceImpl.java | 4 +- .../service/impl/OperRoleUserServiceImpl.java | 4 +- .../epmet/dto/form/CustomerInitFormDTO.java | 1 - .../com/epmet/dto/form/PageQueryFormDTO.java | 2 - .../epmet/feign/OperCrmOpenFeignClient.java | 1 - .../OperCrmOpenFeignClientFallback.java | 1 - .../CustomerThirdplatApiserviceEntity.java | 3 -- .../CustomerThirdplatApiServiceService.java | 3 -- ...ustomerThirdplatApiServiceServiceImpl.java | 3 -- .../com/epmet/dto/CustomerFunctionDTO.java | 3 +- .../epmet/dto/CustomerFunctionDetailDTO.java | 3 +- .../epmet/dto/CustomerFunctionRoleDTO.java | 7 +-- .../java/com/epmet/dto/CustomerHomeDTO.java | 7 +-- .../com/epmet/dto/CustomerHomeDetailDTO.java | 3 +- .../epmet/dto/CustomerHomeTemplateDTO.java | 3 +- .../com/epmet/dto/CustomerStartPageDTO.java | 5 ++- .../com/epmet/dto/FunctionCustomizedDTO.java | 7 +-- .../dto/FunctionCustomizedVisitedDTO.java | 5 ++- .../main/java/com/epmet/dto/FunctionDTO.java | 3 +- .../epmet/dto/FunctionShoppingHistoryDTO.java | 3 +- .../java/com/epmet/dto/HomeComponentDTO.java | 3 +- .../main/java/com/epmet/dto/IcFormDTO.java | 5 ++- .../com/epmet/dto/IcFormItemOptionsDTO.java | 5 ++- .../dto/IcIndividualCategoryManageDTO.java | 7 +-- .../dto/IcResiCategoryStatsConfigDTO.java | 5 ++- .../dto/IcResiCategoryWarnConfigDTO.java | 5 ++- .../main/java/com/epmet/dto/ItemTypeDTO.java | 5 ++- .../form/CustomerFunctionRoleListFormDTO.java | 1 - .../epmet/dto/form/CustomerHomeFormDTO.java | 1 - .../IcResiCategoryStatsConfigFormDTO.java | 3 +- .../IcResiCategoryStatsConfigSortFormDTO.java | 3 +- .../dto/form/QueryFunctionListFormDTO.java | 1 - .../ResiCategoryStatsConfigListFormDTO.java | 4 +- .../form/SaveFunctionCustomizedFormDTO.java | 1 - .../com/epmet/dto/form/StartPageFromDTO.java | 1 - .../CustomerFunctionRoleListResultDTO.java | 2 - .../epmet/dto/result/CustomerResultDTO.java | 2 - .../dto/result/FunctionDetailResultDTO.java | 1 - .../epmet/dto/result/FunctionResultDTO.java | 2 - .../result/HomeDesignByCustomerResultDTO.java | 1 - .../IcResiCategoryStatsConfigResultDTO.java | 3 +- .../CustomerFunctionDetailController.java | 1 - .../CustomerFunctionRoleController.java | 6 +-- .../controller/CustomerHomeController.java | 8 ++-- .../CustomerHomeDetailController.java | 8 ++-- .../CustomerHomeTemplateController.java | 11 ++--- .../CustomerStartPageController.java | 3 +- .../FunctionCustomizedController.java | 2 +- .../FunctionCustomizedVisitedController.java | 7 ++- .../FunctionShoppingHistoryController.java | 6 +-- .../controller/HomeComponentController.java | 8 ++-- .../IcFormItemOptionsController.java | 2 +- .../IcIndividualCategoryManageController.java | 13 +++--- .../IcResiCategoryStatsConfigController.java | 6 +-- .../IcResiCategoryWarnConfigController.java | 6 +-- .../epmet/controller/ItemTypeController.java | 6 +-- .../epmet/dao/CustomerFunctionDetailDao.java | 1 - .../epmet/dao/CustomerFunctionRoleDao.java | 4 +- .../epmet/dao/CustomerHomeTemplateDao.java | 3 +- .../entity/CustomerFunctionDetailEntity.java | 3 -- .../epmet/entity/CustomerFunctionEntity.java | 5 +-- .../entity/CustomerFunctionRoleEntity.java | 5 +-- .../entity/CustomerHomeDetailEntity.java | 3 -- .../com/epmet/entity/CustomerHomeEntity.java | 5 +-- .../entity/CustomerHomeTemplateEntity.java | 3 -- .../epmet/entity/CustomerStartPageEntity.java | 3 -- .../entity/FunctionCustomizedEntity.java | 3 -- .../FunctionCustomizedVisitedEntity.java | 3 -- .../java/com/epmet/entity/FunctionEntity.java | 5 +-- .../entity/FunctionShoppingHistoryEntity.java | 3 -- .../com/epmet/entity/HomeComponentEntity.java | 3 -- .../java/com/epmet/entity/IcFormEntity.java | 3 -- .../epmet/entity/IcFormItemOptionsEntity.java | 3 -- .../IcIndividualCategoryManageEntity.java | 5 +-- .../IcResiCategoryWarnConfigEntity.java | 3 -- .../java/com/epmet/entity/ItemTypeEntity.java | 3 -- .../com/epmet/feign/OperCrmFeignClient.java | 7 +-- .../fallback/OperCrmFeignClientFallBack.java | 3 -- .../epmet/mq/RocketMQConsumerRegister.java | 6 --- .../java/com/epmet/service/HomeService.java | 1 - .../service/IcExportTemplateService.java | 2 +- .../IcIndividualCategoryManageService.java | 5 +-- .../ResiCategoryStatsConfigService.java | 7 +-- .../CustomerFunctionDetailServiceImpl.java | 1 - .../impl/CustomerFunctionRoleServiceImpl.java | 5 +-- .../impl/CustomerHomeDetailServiceImpl.java | 6 +-- .../service/impl/CustomerHomeServiceImpl.java | 5 +-- .../impl/CustomerHomeTemplateServiceImpl.java | 8 ++-- .../impl/CustomerStartPageServiceImpl.java | 9 ++-- .../FunctionCustomizedVisitedServiceImpl.java | 4 +- .../service/impl/FunctionServiceImpl.java | 2 +- .../FunctionShoppingHistoryServiceImpl.java | 4 +- .../impl/HomeComponentServiceImpl.java | 2 +- .../epmet/service/impl/HomeServiceImpl.java | 4 +- ...IcIndividualCategoryManageServiceImpl.java | 10 ++--- .../IcResiCategoryWarnConfigServiceImpl.java | 4 +- .../group/dto/QRCodeMultipartFileDTO.java | 1 - .../dto/act/ActCommentAttachmentDTO.java | 5 ++- .../resi/group/dto/act/ActCommentDTO.java | 5 ++- .../group/dto/act/ActOperationRecordDTO.java | 5 ++- .../group/dto/act/GroupActContentDTO.java | 5 ++- .../group/ResiGroupAchievementStatsDTO.java | 5 ++- .../group/dto/group/ResiGroupCodeDTO.java | 3 +- .../dto/group/ResiGroupOperationDTO.java | 3 +- .../group/dto/group/ResiGroupSetupDTO.java | 5 ++- .../dto/group/ResiGroupStatisticalDTO.java | 3 +- .../group/dto/group/form/GroupFormDTO.java | 1 + .../group/form/GroupPointDetailFormDTO.java | 2 - .../dto/invitation/GroupInvitationDTO.java | 3 +- .../dto/member/GroupMemeberOperationDTO.java | 3 +- .../member/form/ApplyJoinGroupFormDTO.java | 1 - .../dto/member/form/DisagreeApplyFormDTO.java | 2 - .../member/result/AchievementResultDTO.java | 1 - .../result/GroupMemberListResultDTO.java | 1 - .../member/result/VotableCountResultDTO.java | 1 - .../group/dto/notice/NoticeAttachmentDTO.java | 5 ++- .../notice/NoticeCommentAttachmentDTO.java | 5 ++- .../group/dto/notice/NoticeCommentDTO.java | 5 ++- .../resi/group/dto/notice/NoticeDTO.java | 5 ++- .../group/dto/notice/NoticeReadRecordDTO.java | 5 ++- .../notice/result/NoticeDetailResultDTO.java | 1 - .../dto/topic/ResiTopicAttachmentDTO.java | 5 ++- .../topic/ResiTopicCommentAttachmentDTO.java | 5 ++- .../resi/group/dto/topic/ResiTopicDTO.java | 7 +-- .../dto/topic/ResiTopicOperationDTO.java | 5 ++- .../dto/topic/TopicDraftAttachmentDTO.java | 7 +-- .../resi/group/dto/topic/TopicDraftDTO.java | 9 ++-- .../dto/topic/TopicDraftOperationDTO.java | 5 ++- .../dto/topic/TopicDraftScanTaskDTO.java | 5 ++- .../topic/TopicShareLinkVisitRecordDTO.java | 7 +-- .../dto/topic/form/AllMessagesFormDTO.java | 1 - .../form/ResiTopicCancelHiddenFormDTO.java | 1 - .../topic/form/ResiTopicOperationFormDTO.java | 1 - .../result/CheckTopicPublisherResultDTO.java | 2 - .../dto/topic/result/IssueGridResultDTO.java | 2 - .../ResiTopicIncludeIssueDetailResultDTO.java | 1 - .../dto/topic/result/TopicFileResultDTO.java | 1 - .../group/feign/ResiGroupOpenFeignClient.java | 3 +- .../ResiGroupOpenFeignClientFallback.java | 17 +------ .../act/controller/ActCommentController.java | 11 +++-- .../modules/act/dao/GroupActInfoDao.java | 3 +- .../impl/ActSignInRecordServiceImpl.java | 1 - .../service/impl/GroupActInfoServiceImpl.java | 5 ++- .../fallback/GovOrgFeignClientFallBack.java | 1 - .../controller/GroupIssueController.java | 4 -- .../group/controller/ResiGroupController.java | 4 -- .../epmet/modules/group/dao/ResiGroupDao.java | 2 +- .../entity/GroupEditSubmitRecordEntity.java | 1 - .../ResiGroupAchievementStatsEntity.java | 1 - .../group/entity/ResiGroupCodeEntity.java | 4 -- .../modules/group/entity/ResiGroupEntity.java | 1 - .../entity/ResiGroupOperationEntity.java | 3 -- .../group/entity/ResiGroupSetupEntity.java | 3 -- .../entity/ResiGroupStatisticalEntity.java | 3 -- .../group/service/GroupIssueService.java | 4 -- .../group/service/ResiGroupService.java | 1 - .../service/impl/GroupIssueServiceImpl.java | 9 ++-- .../impl/ResiGroupCodeServiceImpl.java | 1 - .../impl/ResiGroupOperationServiceImpl.java | 2 +- .../impl/ResiGroupStatisticalServiceImpl.java | 3 -- .../impl/StatsAchievementServiceImpl.java | 2 +- .../InvitationRecordController.java | 8 ++-- .../entity/GroupInvitationEntity.java | 1 - .../controller/ResiGroupMemberController.java | 5 ++- .../entity/GroupMemeberOperationEntity.java | 3 -- .../member/entity/GroupVisitorEntity.java | 1 - .../service/GroupMemeberOperationService.java | 2 - .../GroupMemeberOperationServiceImpl.java | 3 -- .../impl/ResiGroupMemberServiceImpl.java | 3 -- .../notice/entity/NoticeAttachmentEntity.java | 3 -- .../notice/entity/NoticeCommentEntity.java | 3 -- .../modules/notice/entity/NoticeEntity.java | 1 - .../notice/entity/NoticeReadRecordEntity.java | 3 -- .../support/GroupAchievementUtils.java | 2 +- .../TopicShareLinkRecordController.java | 5 +-- .../modules/topic/dao/TopicDraftDao.java | 9 ++-- .../entity/ResiTopicAttachmentEntity.java | 3 -- .../modules/topic/entity/ResiTopicEntity.java | 3 +- .../entity/ResiTopicOperationEntity.java | 3 -- .../entity/TopicDraftAttachmentEntity.java | 5 +-- .../topic/entity/TopicDraftEntity.java | 7 +-- .../entity/TopicDraftOperationEntity.java | 3 -- .../entity/TopicDraftScanTaskEntity.java | 3 -- .../TopicShareLinkVisitRecordEntity.java | 3 -- .../service/ResiTopicCommentService.java | 3 +- .../service/ResiTopicOperationService.java | 3 +- .../topic/service/ResiTopicService.java | 4 -- .../topic/service/TopicDraftService.java | 6 +-- .../TopicShareLinkVisitRecordService.java | 4 +- .../impl/ResiTopicAttachmentServiceImpl.java | 4 +- .../impl/ResiTopicCommentServiceImpl.java | 5 +-- .../impl/ResiTopicOperationServiceImpl.java | 5 +-- .../service/impl/ResiTopicServiceImpl.java | 11 +++-- .../impl/TopicDraftAttachmentServiceImpl.java | 3 +- .../impl/TopicDraftScanTaskServiceImpl.java | 5 +-- .../TopicShareLinkVisitRecordServiceImpl.java | 7 --- .../epmet/mq/RocketMQConsumerRegister.java | 10 +---- .../epmet/dto/StrangerAccessRecordDTO.java | 7 +-- .../StrangerAccessRecordController.java | 2 +- .../epmet/dao/StrangerAccessRecordDao.java | 6 +-- .../entity/StrangerAccessRecordEntity.java | 3 +- .../com/epmet/feign/GovOrgFeignClient.java | 1 - .../fallback/GovOrgFeignClientFallBack.java | 1 - .../service/impl/UserAccessServiceImpl.java | 1 - .../epmet/dto/IssueCustomerParameterDTO.java | 5 ++- .../src/main/java/com/epmet/dto/IssueDTO.java | 5 ++- .../java/com/epmet/dto/IssueProcessDTO.java | 5 ++- .../epmet/dto/IssueProjectRelationDTO.java | 5 ++- .../epmet/dto/IssueSatisfactionDetailDTO.java | 5 ++- .../dto/IssueSatisfactionStatisticalDTO.java | 5 ++- .../com/epmet/dto/IssueVoteDetailDTO.java | 5 ++- .../epmet/dto/IssueVoteStatisticalDTO.java | 5 ++- .../dto/IssueVoteStatisticalDailyDTO.java | 5 ++- .../main/java/com/epmet/dto/PolyLineDTO.java | 1 - .../dto/result/InitEvaluationResultDTO.java | 1 - .../com/epmet/feign/GovIssueFeignClient.java | 1 - .../EpmetUserFeignClientFallBack.java | 1 - .../fallback/GovIssueFeignClientFallBack.java | 1 - .../epmet/service/impl/IssueServiceImpl.java | 1 - .../dto/result/ResiEventNpcResultDTO.java | 2 - .../epmet/controller/ProjectController.java | 2 - .../epmet/controller/ResiEventController.java | 1 - .../fallback/GovIssueFeignClientFallBack.java | 1 - .../ResiGroupFeignClientFallBack.java | 4 +- .../modules/advice/service/AdviceService.java | 1 - .../controller/ResiMineGridController.java | 6 ++- .../service/impl/ResiMineGridServiceImpl.java | 5 --- .../person/controller/BadgeController.java | 2 +- .../modules/person/service/BadgeService.java | 2 +- .../person/service/impl/BadgeServiceImpl.java | 2 +- .../service/impl/ResiRegisterServiceImpl.java | 5 --- .../impl/ResiWarmheartedServiceImpl.java | 3 -- .../IcPartymemberStyleCategoryDictDTO.java | 5 ++- .../IcPartymemberStyleImageDTO.java | 7 +-- .../partymember/PartyBranchMembersDTO.java | 5 ++- .../partymember/PartymemberAuthRecordDTO.java | 5 ++- .../result/AuditingDetailResultDTO.java | 1 - .../result/ReviewedParyMemberResultDTO.java | 2 - .../UnderReviewParyMemberResultDTO.java | 1 - .../result/ResiWarmheartedResultDTO.java | 3 +- .../feign/ResiPartyMemberOpenFeignClient.java | 1 - ...esiPartyMemberOpenFeignClientFallback.java | 1 - .../modules/feign/GovOrgFeignClient.java | 2 +- .../fallback/GovOrgFeignClientFallBack.java | 2 +- .../IcPartymemberStyleController.java | 12 ++--- .../PartyBranchMembersController.java | 6 +-- .../PartyMemberConfirmController.java | 1 - .../entity/PartyBranchMembersEntity.java | 3 -- .../entity/PartymemberAuthRecordEntity.java | 1 - .../entity/PartymemberBaseInfoEntity.java | 5 +-- .../entity/PartymemberConfirmAutoEntity.java | 3 +- .../PartymemberConfirmManualEntity.java | 3 -- .../entity/PartymemberVisitEntity.java | 1 - .../service/IcPartymemberStyleService.java | 4 +- .../service/PartyMemberConfirmService.java | 1 - .../impl/PartyBranchMembersServiceImpl.java | 4 +- .../impl/PartymemberInfoServiceImpl.java | 1 - .../dao/ResiWarmheartedVisitDao.java | 5 +-- .../entity/ResiWarmheartedApplyEntity.java | 5 +-- .../entity/ResiWarmheartedVisitEntity.java | 1 - .../impl/ResiWarmheartedVisitServiceImpl.java | 4 +- .../epmet/feign/ResiVoiceOpenFeignClient.java | 4 +- .../ResiVoiceOpenFeignClientFallback.java | 1 - .../scan/service/impl/ScanServiceImpl.java | 1 - .../epmet/openapi/sdk/encrypt/Md5Util.java | 2 - 1519 files changed, 2368 insertions(+), 3865 deletions(-) diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/NewsDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/NewsDTO.java index 831d5a2d0b..638722f904 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/NewsDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/NewsDTO.java @@ -8,10 +8,10 @@ package com.epmet.dto; -import com.fasterxml.jackson.annotation.JsonProperty; 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.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDeptDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDeptDTO.java index fbf3950bea..c416f6766d 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDeptDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDeptDTO.java @@ -8,12 +8,11 @@ package com.epmet.dto; -import com.fasterxml.jackson.annotation.JsonProperty; import com.epmet.commons.tools.utils.TreeNode; 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.fasterxml.jackson.annotation.JsonProperty; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictDataDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictDataDTO.java index 3664870194..7fc9e2191c 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictDataDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictDataDTO.java @@ -8,10 +8,10 @@ package com.epmet.dto; -import com.fasterxml.jackson.annotation.JsonProperty; 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.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import javax.validation.constraints.Min; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictTypeDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictTypeDTO.java index 4fd3c654f4..d6b99c9be5 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictTypeDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictTypeDTO.java @@ -8,11 +8,10 @@ package com.epmet.dto; -import com.fasterxml.jackson.annotation.JsonProperty; 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.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import javax.validation.constraints.Min; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMenuDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMenuDTO.java index 441303c187..89a2dd1be8 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMenuDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMenuDTO.java @@ -8,11 +8,11 @@ package com.epmet.dto; -import com.fasterxml.jackson.annotation.JsonProperty; import com.epmet.commons.tools.utils.TreeNode; 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.fasterxml.jackson.annotation.JsonProperty; import org.hibernate.validator.constraints.Range; import javax.validation.constraints.Min; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysParamsDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysParamsDTO.java index 4edefe2792..1b6573d7e0 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysParamsDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysParamsDTO.java @@ -8,11 +8,10 @@ package com.epmet.dto; -import com.fasterxml.jackson.annotation.JsonProperty; 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.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRegionDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRegionDTO.java index 39f62c48b1..b8b52e8721 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRegionDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRegionDTO.java @@ -8,9 +8,8 @@ package com.epmet.dto; -import com.fasterxml.jackson.annotation.JsonProperty; import com.epmet.commons.tools.validator.group.DefaultGroup; - +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import javax.validation.constraints.Min; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRoleDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRoleDTO.java index e55e01bbd3..7279c60b81 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRoleDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRoleDTO.java @@ -8,11 +8,10 @@ package com.epmet.dto; -import com.fasterxml.jackson.annotation.JsonProperty; 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.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysUserDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysUserDTO.java index bba18236ca..fa5db940bc 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysUserDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysUserDTO.java @@ -8,11 +8,10 @@ package com.epmet.dto; -import com.fasterxml.jackson.annotation.JsonProperty; 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.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.hibernate.validator.constraints.Range; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java index a9cca21013..b08c9fc295 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java @@ -1,12 +1,7 @@ package com.epmet.dto.region; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; -import java.util.Date; - /** * */ diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/Region.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/Region.java index 3129ba0075..f796b54547 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/Region.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/Region.java @@ -9,7 +9,6 @@ package com.epmet.dto.region; import com.fasterxml.jackson.annotation.JsonIgnore; - import lombok.Data; import java.io.Serializable; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/remote/ParamsRemoteService.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/remote/ParamsRemoteService.java index ee4b533bec..88947f2583 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/remote/ParamsRemoteService.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/remote/ParamsRemoteService.java @@ -9,9 +9,9 @@ package com.epmet.remote; import com.alibaba.fastjson.JSON; -import com.epmet.feign.ParamsFeignClient; import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.exception.RenException; +import com.epmet.feign.ParamsFeignClient; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java index bba298577f..089ad29639 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java @@ -3,7 +3,6 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.RequirePermission; import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.user.LoginUserUtil; -import com.epmet.commons.tools.utils.IpUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.LogOperationListFormDTO; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDeptController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDeptController.java index 3bedc14687..f534eac664 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDeptController.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDeptController.java @@ -8,14 +8,14 @@ package com.epmet.controller; -import com.epmet.dto.SysDeptDTO; -import com.epmet.service.SysDeptService; 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.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.SysDeptDTO; +import com.epmet.service.SysDeptService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictTypeController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictTypeController.java index 4d842f5ef1..0f81215fe5 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictTypeController.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictTypeController.java @@ -8,18 +8,18 @@ package com.epmet.controller; -import com.epmet.dto.SysDictTypeDTO; -import com.epmet.service.SysDictTypeService; -import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.page.PageData; 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.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.SysDictTypeDTO; import com.epmet.entity.DictType; +import com.epmet.service.SysDictTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + import java.util.List; import java.util.Map; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMenuController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMenuController.java index 5d92ad1fba..9400789b8f 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMenuController.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMenuController.java @@ -8,16 +8,16 @@ package com.epmet.controller; -import com.epmet.dto.MenuResourceDTO; -import com.epmet.dto.SysMenuDTO; -import com.epmet.service.SysMenuService; -import com.epmet.service.SysResourceService; import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.security.user.UserDetail; 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.DefaultGroup; +import com.epmet.dto.MenuResourceDTO; +import com.epmet.dto.SysMenuDTO; +import com.epmet.service.SysMenuService; +import com.epmet.service.SysResourceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRegionController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRegionController.java index 660402e667..3c0f246e4b 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRegionController.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRegionController.java @@ -8,9 +8,6 @@ package com.epmet.controller; -import com.epmet.dto.SysRegionDTO; -import com.epmet.dto.region.RegionProvince; -import com.epmet.service.SysRegionService; import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.Result; @@ -19,6 +16,9 @@ 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.SysRegionDTO; +import com.epmet.dto.region.RegionProvince; +import com.epmet.service.SysRegionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRoleController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRoleController.java index 8f9ab0ddf9..916436069a 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRoleController.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRoleController.java @@ -8,9 +8,6 @@ package com.epmet.controller; -import com.epmet.dto.SysRoleDTO; -import com.epmet.service.SysRoleService; -import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; @@ -18,8 +15,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.SysRoleDTO; import com.epmet.service.SysRoleDataScopeService; import com.epmet.service.SysRoleMenuService; +import com.epmet.service.SysRoleService; import com.epmet.service.SysRoleUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysUserController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysUserController.java index d21db797a2..a75447ef1a 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysUserController.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysUserController.java @@ -8,16 +8,11 @@ package com.epmet.controller; -import com.epmet.commons.tools.security.user.SecurityUser; -import com.epmet.dto.PasswordDTO; -import com.epmet.dto.SysUserDTO; -import com.epmet.service.SysResourceService; -import com.epmet.service.SysUserService; -import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.bo.ResourceBO; import com.epmet.commons.tools.security.password.PasswordUtils; +import com.epmet.commons.tools.security.user.SecurityUser; import com.epmet.commons.tools.security.user.UserDetail; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ExcelUtils; @@ -27,9 +22,13 @@ 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.PasswordDTO; +import com.epmet.dto.SysUserDTO; import com.epmet.excel.SysUserExcel; +import com.epmet.service.SysResourceService; import com.epmet.service.SysRoleDataScopeService; import com.epmet.service.SysRoleUserService; +import com.epmet.service.SysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/CorsConfigEntity.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/CorsConfigEntity.java index 0a717f1c50..c9d0e46df3 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/CorsConfigEntity.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/CorsConfigEntity.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; - /** * 跨域配置表 * diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java index d3f3f20402..537d1fc9b2 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.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; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/RocketMQConsumerRegister.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/RocketMQConsumerRegister.java index 8c07d1279d..93a2f8e5f0 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/RocketMQConsumerRegister.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/RocketMQConsumerRegister.java @@ -4,19 +4,12 @@ import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants; import com.epmet.commons.rocketmq.constants.TopicConstants; import com.epmet.commons.rocketmq.register.MQAbstractRegister; import com.epmet.commons.rocketmq.register.MQConsumerProperties; -import com.epmet.commons.tools.enums.EnvEnum; import com.epmet.mq.listener.listener.AuthOperationLogListener; import com.epmet.mq.listener.listener.PointOperationLogListener; import com.epmet.mq.listener.listener.ProjectOperationLogListener; -import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer; -import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently; -import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.common.protocol.heartbeat.MessageModel; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; - @Component public class RocketMQConsumerRegister extends MQAbstractRegister { @@ -29,4 +22,4 @@ public class RocketMQConsumerRegister extends MQAbstractRegister { // ...其他监听器类似 } -} \ No newline at end of file +} diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/ProjectOperationLogListener.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/ProjectOperationLogListener.java index a47d55c2de..d2de3b9bf2 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/ProjectOperationLogListener.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/ProjectOperationLogListener.java @@ -2,7 +2,6 @@ package com.epmet.mq.listener.listener; import com.alibaba.fastjson.JSON; import com.epmet.commons.rocketmq.constants.MQUserPropertys; -import com.epmet.commons.rocketmq.messages.LoginMQMsg; import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg; import com.epmet.commons.tools.distributedlock.DistributedLock; import com.epmet.commons.tools.exception.ExceptionUtils; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/NewsService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/NewsService.java index e07846797a..bc4d1a7932 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/NewsService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/NewsService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.NewsDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.NewsDTO; import com.epmet.entity.NewsEntity; import java.util.Map; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDeptService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDeptService.java index f23af1afef..9655030e62 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDeptService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDeptService.java @@ -8,8 +8,8 @@ package com.epmet.service; -import com.epmet.dto.SysDeptDTO; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.SysDeptDTO; import com.epmet.entity.SysDeptEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictTypeService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictTypeService.java index 4f19658c84..fa6fdc7f3c 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictTypeService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictTypeService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.SysDictTypeDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.SysDictTypeDTO; import com.epmet.entity.DictType; import com.epmet.entity.SysDictTypeEntity; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogErrorService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogErrorService.java index d8a1ae2afc..49cb083951 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogErrorService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogErrorService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.SysLogErrorDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.SysLogErrorDTO; import com.epmet.entity.SysLogErrorEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogLoginService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogLoginService.java index 17d3a6958d..058f9e83d0 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogLoginService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogLoginService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.SysLogLoginDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.SysLogLoginDTO; import com.epmet.entity.SysLogLoginEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogOperationService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogOperationService.java index e55784fd09..87a830f395 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogOperationService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogOperationService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.SysLogOperationDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.SysLogOperationDTO; import com.epmet.entity.SysLogOperationEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysMenuService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysMenuService.java index d160d7700a..3f47eada25 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysMenuService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysMenuService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.SysMenuDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.security.user.UserDetail; +import com.epmet.dto.SysMenuDTO; import com.epmet.entity.SysMenuEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysParamsService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysParamsService.java index 54d5ab2b99..ef51d5d862 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysParamsService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysParamsService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.SysParamsDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.SysParamsDTO; import com.epmet.entity.SysParamsEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRegionService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRegionService.java index e67940e197..cfe7d84706 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRegionService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRegionService.java @@ -8,9 +8,9 @@ package com.epmet.service; +import com.epmet.commons.mybatis.service.BaseService; import com.epmet.dto.SysRegionDTO; import com.epmet.dto.region.RegionProvince; -import com.epmet.commons.mybatis.service.BaseService; import com.epmet.entity.SysRegionEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysResourceService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysResourceService.java index a212657b51..83893579c8 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysResourceService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysResourceService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.MenuResourceDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.security.bo.ResourceBO; +import com.epmet.dto.MenuResourceDTO; import com.epmet.entity.SysResourceEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRoleService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRoleService.java index 9a740f42d6..a2d5e05982 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRoleService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRoleService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.SysRoleDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.SysRoleDTO; import com.epmet.entity.SysRoleEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysUserService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysUserService.java index 2681b6d027..397a06903e 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysUserService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysUserService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.SysUserDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.SysUserDTO; import com.epmet.entity.SysUserEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/CorsConfigServiceImpl.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/CorsConfigServiceImpl.java index 2441882ea3..0554dc3b84 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/CorsConfigServiceImpl.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/CorsConfigServiceImpl.java @@ -13,7 +13,6 @@ import com.epmet.service.CorsConfigService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java index 4ccc4e868f..1cbf7e32d2 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.epmet.auth.constants.AuthOperationEnum; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.feign.ResultDataResolver; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/NewsServiceImpl.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/NewsServiceImpl.java index 220cf7d171..211ddeb5ec 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/NewsServiceImpl.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/NewsServiceImpl.java @@ -9,7 +9,6 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.annotation.DataFilter; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.page.PageData; diff --git a/epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java b/epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java index d4edbb0b56..07efb95921 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java @@ -3,7 +3,6 @@ package com.epmet.controller; import com.epmet.redis.CustomerAppWxServiceUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import java.util.Set; diff --git a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java index 8745418f90..386e162c02 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.HashMap; import java.util.List; /** diff --git a/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java b/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java index 89fb9b183c..43b2719dc8 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java @@ -16,8 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.HashMap; - /** * @author sun diff --git a/epmet-auth/src/main/java/com/epmet/controller/IcLoinController.java b/epmet-auth/src/main/java/com/epmet/controller/IcLoinController.java index 659945bddb..27f9cde583 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/IcLoinController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/IcLoinController.java @@ -29,7 +29,10 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; @RestController @RequestMapping("ic") diff --git a/epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java index 8f93ab52fb..2e8ecb456e 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java @@ -1,7 +1,6 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; -import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; @@ -13,11 +12,7 @@ import com.epmet.dto.form.PublicSendSmsCodeFormDTO; import com.epmet.dto.form.RegisterFormDTO; import com.epmet.dto.result.UserTokenResultDTO; import com.epmet.service.PublicUserLoginService; -import com.netflix.ribbon.proxy.annotation.Http; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpRequest; -import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.web.bind.annotation.*; /** diff --git a/epmet-auth/src/main/java/com/epmet/controller/SsoController.java b/epmet-auth/src/main/java/com/epmet/controller/SsoController.java index 59fd01d2c9..8dc85dacba 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/SsoController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/SsoController.java @@ -6,8 +6,8 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.SsoEnteOrgFormDTO; import com.epmet.dto.form.SsoLoginFormDTO; -import com.epmet.dto.form.SsoWorkLoginFormDTO; import com.epmet.dto.form.SsoLoginOperFormDTO; +import com.epmet.dto.form.SsoWorkLoginFormDTO; import com.epmet.dto.result.SsoLoginResultDTO; import com.epmet.dto.result.UserTokenResultDTO; import com.epmet.service.SsoService; diff --git a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java index 65e718aacf..144e18d024 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java @@ -1,10 +1,7 @@ package com.epmet.controller; -import com.epmet.commons.tools.annotation.LoginUser; -import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dto.UserDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.StaffOrgsResultDTO; import com.epmet.dto.result.UserTokenResultDTO; diff --git a/epmet-auth/src/main/java/com/epmet/jwt/JwtTokenUtils.java b/epmet-auth/src/main/java/com/epmet/jwt/JwtTokenUtils.java index 33baf31c52..05e5830e99 100644 --- a/epmet-auth/src/main/java/com/epmet/jwt/JwtTokenUtils.java +++ b/epmet-auth/src/main/java/com/epmet/jwt/JwtTokenUtils.java @@ -11,14 +11,12 @@ package com.epmet.jwt; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; -import org.apache.commons.codec.binary.Base64; import org.joda.time.DateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.Map; diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java index 8d78665550..cbc46e33f1 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java @@ -5,7 +5,6 @@ import com.epmet.common.token.constant.LoginConstant; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; -import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.ResultDataResolver; diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java index d6edfb8657..eab142e6a5 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java @@ -14,8 +14,6 @@ import com.epmet.commons.tools.security.password.PasswordUtils; import com.epmet.commons.tools.utils.CpUserDetailRedis; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.CustomerStaffDTO; -import com.epmet.dto.form.CustomerStaffFormDTO; import com.epmet.dto.form.GovWebLoginFormDTO; import com.epmet.dto.form.GovWebOperLoginFormDTO; import com.epmet.dto.result.GovWebOperLoginResultDTO; diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java index 1e1767070e..ea0ae6d5fb 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java @@ -29,7 +29,9 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; @Service @Slf4j diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java index 698118c5ce..d6e88bb66e 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java @@ -16,7 +16,10 @@ import com.epmet.dto.PaCustomerDTO; import com.epmet.dto.PaUserDTO; import com.epmet.dto.PaUserWechatDTO; import com.epmet.dto.form.*; -import com.epmet.dto.result.*; +import com.epmet.dto.result.RegisterResultDTO; +import com.epmet.dto.result.SaveUserResultDTO; +import com.epmet.dto.result.SendVerificationCodeResultDTO; +import com.epmet.dto.result.UserTokenResultDTO; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.jwt.JwtTokenProperties; import com.epmet.jwt.JwtTokenUtils; diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ResourceServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ResourceServiceImpl.java index 936d7dd2bb..27218b1bd7 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ResourceServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ResourceServiceImpl.java @@ -8,7 +8,6 @@ package com.epmet.service.impl; -import io.jsonwebtoken.Claims; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.enums.SuperAdminEnum; import com.epmet.commons.tools.exception.ErrorCode; @@ -23,6 +22,7 @@ import com.epmet.feign.ResourceFeignClient; import com.epmet.feign.UserFeignClient; import com.epmet.jwt.JwtUtils; import com.epmet.service.ResourceService; +import io.jsonwebtoken.Claims; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/epmet-auth/src/test/java/com/epmet/TokenGenTest.java b/epmet-auth/src/test/java/com/epmet/TokenGenTest.java index 578e7a6652..9783e5a013 100644 --- a/epmet-auth/src/test/java/com/epmet/TokenGenTest.java +++ b/epmet-auth/src/test/java/com/epmet/TokenGenTest.java @@ -1,12 +1,9 @@ package com.epmet; -import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import com.epmet.common.token.constant.LoginConstant; import com.epmet.commons.tools.security.dto.GovTokenDto; import com.epmet.commons.tools.utils.CpUserDetailRedis; -import com.epmet.commons.tools.utils.DateUtils; import com.epmet.dto.CustomerAgencyDTO; -import com.epmet.dto.result.StaffLatestAgencyResultDTO; import com.epmet.jwt.JwtTokenProperties; import com.epmet.jwt.JwtTokenUtils; import com.epmet.service.impl.GovLoginServiceImpl; diff --git a/epmet-cloud-generator/src/main/resources/template/add-or-update.vue.vm b/epmet-cloud-generator/src/main/resources/template/add-or-update.vue.vm index 435224d75b..2b277f4442 100644 --- a/epmet-cloud-generator/src/main/resources/template/add-or-update.vue.vm +++ b/epmet-cloud-generator/src/main/resources/template/add-or-update.vue.vm @@ -17,8 +17,9 @@