From 61807e3b9f7f39bacad5b2be66273a964b82dd19 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 12 May 2022 09:56:04 +0800 Subject: [PATCH 1/8] =?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 2/8] =?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 3/8] =?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 4/8] =?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 5/8] =?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 740109af5459446aeb2b2ba8067227a0465e84db Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 12 May 2022 14:33:44 +0800 Subject: [PATCH 6/8] =?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 7/8] =?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 8/8] =?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;