From 0a47cf70d23ce1e6bfb393a0ba8b44e04bbcb108 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 19 Aug 2022 13:45:41 +0800 Subject: [PATCH 01/84] someupdate --- .../controller/IcNeighborHoodController.java | 14 ++++++++++ .../epmet/service/IcNeighborHoodService.java | 13 +++++++++ .../impl/IcNeighborHoodServiceImpl.java | 27 +++++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java index 627b5a5d8b..b947f13004 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java @@ -150,6 +150,20 @@ public class IcNeighborHoodController { return new Result>().ok(icNeighborHoodService.getNeighborHoodOptions(dto.getAgencyId(), dto.getGridId(),tokenDto.getUserId(),tokenDto.getCustomerId())); } + /** + * 获取用户组织下小区列表 + * + * @param tokenDto + * @param dto + * @return com.epmet.commons.tools.utils.Result> + * @author zhy + * @date 2022/8/19 13:32 + */ + @PostMapping("neighborhoodlist") + public Result> getNeighborhoodList(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) { + return new Result>().ok(icNeighborHoodService.getNeighborhoodList(tokenDto, dto)); + } + /** * @Description 小区信息导入 * @param tokenDTO diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java index 085c363819..d5408e73af 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java @@ -20,6 +20,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.dto.result.OptionResultDTO; 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.IcNeighborHoodDTO; import com.epmet.dto.ImportGeneralDTO; @@ -30,6 +31,7 @@ import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.entity.IcNeighborHoodEntity; import com.epmet.entity.IcNeighborHoodPropertyEntity; import com.epmet.entity.IcPropertyManagementEntity; +import org.springframework.web.bind.annotation.RequestBody; import java.io.IOException; import java.io.InputStream; @@ -115,6 +117,17 @@ public interface IcNeighborHoodService extends BaseService */ List getNeighborHoodOptions(String agencyId, String gridId,String staffId,String customerId); + /** + * 获取用户组织下小区列表 + * + * @param tokenDto + * @param dto + * @return com.epmet.commons.tools.utils.Result> + * @author zhy + * @date 2022/8/19 13:32 + */ + List getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto); + /** * @Description 通过ID查询小区信息 * @Param ids diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index 14c9af3048..bbc85379ad 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -40,6 +40,7 @@ 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.redis.common.bean.GridInfoCache; +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; @@ -210,6 +211,32 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) { + if (StringUtils.isBlank(dto.getAgencyId()) && StringUtils.isEmpty(dto.getGridId())) { + log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区"); + CustomerStaffInfoCacheResult result= CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == result || StringUtils.isBlank(result.getAgencyId())) { + log.error(String.format("staffId:%s,工作人员缓存信息查询异常")); + return Collections.emptyList(); + } + dto.setAgencyId(result.getAgencyId()); + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(dto.getAgencyId()),IcNeighborHoodEntity::getAgencyId, dto.getAgencyId()); + wrapper.eq(StringUtils.isNotBlank(dto.getGridId()), IcNeighborHoodEntity::getGridId, dto.getGridId()); + wrapper.last("ORDER BY CONVERT ( NEIGHBOR_HOOD_NAME USING gbk ) ASC"); + List list = baseDao.selectList(wrapper); + if(CollectionUtils.isEmpty(list)) { + return Collections.emptyList(); + } + return list.stream().map(item -> { + OptionResultDTO result = new OptionResultDTO(); + result.setValue(item.getId()); + result.setLabel(item.getNeighborHoodName()); + return result; + }).collect(Collectors.toList()); + } + /** * @param ids * @Description 通过ID查询小区信息 From 3a0d23a91d3d8330000684b9712c57c700459b86 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 19 Aug 2022 14:18:49 +0800 Subject: [PATCH 02/84] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=B0=8F=E5=8C=BA-?= =?UTF-8?q?=E6=A5=BC=E6=A0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/IcNeighborHoodDao.java | 23 +++++++++++++ .../impl/IcNeighborHoodServiceImpl.java | 15 +-------- .../resources/mapper/IcNeighborHoodDao.xml | 33 +++++++++++++++++++ 3 files changed, 57 insertions(+), 14 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java index a1999a0ee6..a25bb785ef 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.NeighborHoodAndManagementDTO; @@ -211,4 +212,26 @@ public interface IcNeighborHoodDao extends BaseDao { * @Date 2022/6/29 16:48 */ List getHouseList(HouseInformationFormDTO formDTO); + + /** + * 小区-楼栋列表 + * + * @param formDTO + * @return java.util.List + * @author zhy + * @date 2022/8/19 14:01 + */ + List getNeighborhoodBuildingList(IcNeighborHoodDTO formDTO); + + + /** + * 楼栋列表 + * + * @param formDTO + * @return java.util.List + * @author zhy + * @date 2022/8/19 14:01 + */ + List selectBuildingList(IcNeighborHoodDTO formDTO); + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index bbc85379ad..2ddc07a897 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -221,20 +221,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(dto.getAgencyId()),IcNeighborHoodEntity::getAgencyId, dto.getAgencyId()); - wrapper.eq(StringUtils.isNotBlank(dto.getGridId()), IcNeighborHoodEntity::getGridId, dto.getGridId()); - wrapper.last("ORDER BY CONVERT ( NEIGHBOR_HOOD_NAME USING gbk ) ASC"); - List list = baseDao.selectList(wrapper); - if(CollectionUtils.isEmpty(list)) { - return Collections.emptyList(); - } - return list.stream().map(item -> { - OptionResultDTO result = new OptionResultDTO(); - result.setValue(item.getId()); - result.setLabel(item.getNeighborHoodName()); - return result; - }).collect(Collectors.toList()); + return baseDao.getNeighborhoodBuildingList(dto); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index 2f76bc1b7a..603947caf1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -25,6 +25,15 @@ + + + + + + + + + update ic_neighbor_hood @@ -663,5 +672,29 @@ SORT, DOOR_NAME+0 + + + From ce4295f1d1219adb790669ef40d3da068d7c121a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 19 Aug 2022 14:30:24 +0800 Subject: [PATCH 03/84] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BD=91=E6=A0=BCID?= =?UTF-8?q?=E5=92=8C=E5=AE=A2=E6=88=B7ID=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/IcNeighborHoodDao.java | 4 ++-- .../com/epmet/service/impl/IcNeighborHoodServiceImpl.java | 1 + .../src/main/resources/mapper/IcNeighborHoodDao.xml | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java index a25bb785ef..b3dd464835 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java @@ -227,11 +227,11 @@ public interface IcNeighborHoodDao extends BaseDao { /** * 楼栋列表 * - * @param formDTO + * @param neighborhoodId * @return java.util.List * @author zhy * @date 2022/8/19 14:01 */ - List selectBuildingList(IcNeighborHoodDTO formDTO); + List selectBuildingList(@Param("value") String neighborhoodId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index 2ddc07a897..85bd613f1d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -212,6 +212,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) { + dto.setCustomerId(tokenDto.getCustomerId()); if (StringUtils.isBlank(dto.getAgencyId()) && StringUtils.isEmpty(dto.getGridId())) { log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区"); CustomerStaffInfoCacheResult result= CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index 603947caf1..ada7bb8199 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -25,6 +25,7 @@ + @@ -681,6 +682,9 @@ WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} + + AND GRID_ID = #{gridId} + AND ( AGENCY_ID = #{agencyId} OR AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%')) From 426d3d003283dc43f7cdae3a3c700e5e7f6e693d Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 19 Aug 2022 16:03:00 +0800 Subject: [PATCH 04/84] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=B0=8F=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcNeighborHoodDTO.java | 5 +++ .../controller/IcNeighborHoodController.java | 8 ++-- .../java/com/epmet/dao/IcNeighborHoodDao.java | 20 ++------- .../epmet/service/IcNeighborHoodService.java | 6 +-- .../impl/IcNeighborHoodServiceImpl.java | 4 +- .../resources/mapper/IcNeighborHoodDao.xml | 42 ++++++------------- 6 files changed, 30 insertions(+), 55 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java index d50508c522..90ec898127 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java @@ -69,6 +69,11 @@ public class IcNeighborHoodDTO implements Serializable { */ private String gridId; + /** + * 网格 + */ + private String gridName; + /** * 详细地址 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java index b947f13004..183a8e3165 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java @@ -155,13 +155,13 @@ public class IcNeighborHoodController { * * @param tokenDto * @param dto - * @return com.epmet.commons.tools.utils.Result> + * @return com.epmet.commons.tools.utils.Result> * @author zhy - * @date 2022/8/19 13:32 + * @date 2022/8/19 15:56 */ @PostMapping("neighborhoodlist") - public Result> getNeighborhoodList(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) { - return new Result>().ok(icNeighborHoodService.getNeighborhoodList(tokenDto, dto)); + public Result> getNeighborhoodList(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) { + return new Result>().ok(icNeighborHoodService.getNeighborhoodList(tokenDto, dto)); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java index b3dd464835..cbb29806f4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java @@ -18,7 +18,6 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.NeighborHoodAndManagementDTO; @@ -214,24 +213,13 @@ public interface IcNeighborHoodDao extends BaseDao { List getHouseList(HouseInformationFormDTO formDTO); /** - * 小区-楼栋列表 + * 小区 * * @param formDTO - * @return java.util.List + * @return java.util.List * @author zhy - * @date 2022/8/19 14:01 + * @date 2022/8/19 15:57 */ - List getNeighborhoodBuildingList(IcNeighborHoodDTO formDTO); - - - /** - * 楼栋列表 - * - * @param neighborhoodId - * @return java.util.List - * @author zhy - * @date 2022/8/19 14:01 - */ - List selectBuildingList(@Param("value") String neighborhoodId); + List getNeighborhoodList(IcNeighborHoodDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java index d5408e73af..7a8105458c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java @@ -122,11 +122,11 @@ public interface IcNeighborHoodService extends BaseService * * @param tokenDto * @param dto - * @return com.epmet.commons.tools.utils.Result> + * @return java.util.List * @author zhy - * @date 2022/8/19 13:32 + * @date 2022/8/19 15:57 */ - List getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto); + List getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto); /** * @Description 通过ID查询小区信息 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index 85bd613f1d..327c472cc3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -211,7 +211,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) { + public List getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) { dto.setCustomerId(tokenDto.getCustomerId()); if (StringUtils.isBlank(dto.getAgencyId()) && StringUtils.isEmpty(dto.getGridId())) { log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区"); @@ -222,7 +222,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl - - - - - - - - - - update ic_neighbor_hood @@ -673,32 +663,24 @@ SORT, DOOR_NAME+0 - SELECT - id AS 'value', - NEIGHBOR_HOOD_NAME AS label + n.id, + n.NEIGHBOR_HOOD_NAME, + n.GRID_ID, + g.GRID_NAME FROM - ic_neighbor_hood + ic_neighbor_hood n + LEFT JOIN customer_grid g ON n.GRID_ID = g.id WHERE - DEL_FLAG = '0' - AND CUSTOMER_ID = #{customerId} + n.DEL_FLAG = '0' + AND n.CUSTOMER_ID = #{customerId} - AND GRID_ID = #{gridId} + AND n.GRID_ID = #{gridId} AND ( - AGENCY_ID = #{agencyId} - OR AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%')) - - - From d73c25869071396368e7c0cf62b583b158ea47b1 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 19 Aug 2022 16:23:02 +0800 Subject: [PATCH 05/84] =?UTF-8?q?=20=20=E8=A1=A5=E5=85=85=E5=AE=A2?= =?UTF-8?q?=E6=88=B7id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcNeighborHoodDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index 1f0386d3ca..d799b0873c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -667,6 +667,7 @@ SELECT n.id, n.NEIGHBOR_HOOD_NAME, + n.CUSTOMER_ID, n.GRID_ID, g.GRID_NAME FROM From 9043c65be1effda4562574a8961e8cf730e38c91 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 19 Aug 2022 17:44:27 +0800 Subject: [PATCH 06/84] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/BuildingResultDTO.java | 10 ++++++- .../controller/IcNeighborHoodController.java | 7 ++--- .../java/com/epmet/dao/IcBuildingDao.java | 11 ++++++++ .../java/com/epmet/dao/IcNeighborHoodDao.java | 10 ------- .../epmet/service/IcNeighborHoodService.java | 5 ++-- .../impl/IcNeighborHoodServiceImpl.java | 5 ++-- .../main/resources/mapper/IcBuildingDao.xml | 27 +++++++++++++++++++ .../resources/mapper/IcNeighborHoodDao.xml | 21 --------------- 8 files changed, 57 insertions(+), 39 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java index 212c85a700..dc2624e160 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java @@ -11,13 +11,21 @@ import java.io.Serializable; */ @Data public class BuildingResultDTO implements Serializable { + private static final long serialVersionUID = -2129418426919785999L; + private String buildingId; + private String buildingName; + + private String gridId; + private String gridName; + private String neighborhoodId; + private String neighborhoodName; - private String buildingName; + private String label; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java index 183a8e3165..f44e52c44f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java @@ -39,6 +39,7 @@ import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.ImportInfoFormDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.result.BuildingResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcNeighborHoodService; @@ -155,13 +156,13 @@ public class IcNeighborHoodController { * * @param tokenDto * @param dto - * @return com.epmet.commons.tools.utils.Result> + * @return com.epmet.commons.tools.utils.Result> * @author zhy * @date 2022/8/19 15:56 */ @PostMapping("neighborhoodlist") - public Result> getNeighborhoodList(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) { - return new Result>().ok(icNeighborHoodService.getNeighborhoodList(tokenDto, dto)); + public Result> getNeighborhoodList(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) { + return new Result>().ok(icNeighborHoodService.getNeighborhoodList(tokenDto, dto)); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java index 8b0cd3f470..d48d12b987 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java @@ -19,6 +19,7 @@ package com.epmet.dao; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.IcBuildingListFormDTO; import com.epmet.dto.result.*; @@ -224,4 +225,14 @@ public interface IcBuildingDao extends BaseDao { IcBuildingEntity selectByCoding(@Param("coding") String coding, @Param("id") String id); + /** + * 展示所有楼栋和小区信息 + * + * @param dto + * @return java.util.List + * @author zhy + * @date 2022/8/19 17:32 + */ + List listBuildingInfo(IcNeighborHoodDTO dto); + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java index cbb29806f4..ee7361724d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java @@ -212,14 +212,4 @@ public interface IcNeighborHoodDao extends BaseDao { */ List getHouseList(HouseInformationFormDTO formDTO); - /** - * 小区 - * - * @param formDTO - * @return java.util.List - * @author zhy - * @date 2022/8/19 15:57 - */ - List getNeighborhoodList(IcNeighborHoodDTO formDTO); - } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java index 7a8105458c..913b4496c4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java @@ -27,6 +27,7 @@ import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.NeighborHoodAndManagementDTO; import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.ImportInfoFormDTO; +import com.epmet.dto.result.BuildingResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.entity.IcNeighborHoodEntity; import com.epmet.entity.IcNeighborHoodPropertyEntity; @@ -122,11 +123,11 @@ public interface IcNeighborHoodService extends BaseService * * @param tokenDto * @param dto - * @return java.util.List + * @return java.util.List * @author zhy * @date 2022/8/19 15:57 */ - List getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto); + List getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto); /** * @Description 通过ID查询小区信息 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index 327c472cc3..3ca505d172 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -50,6 +50,7 @@ import com.epmet.dto.*; import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.ImportInfoFormDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.result.BuildingResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.InfoByNamesResultDTO; import com.epmet.dto.result.UploadImgResultDTO; @@ -211,7 +212,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) { + public List getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) { dto.setCustomerId(tokenDto.getCustomerId()); if (StringUtils.isBlank(dto.getAgencyId()) && StringUtils.isEmpty(dto.getGridId())) { log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区"); @@ -222,7 +223,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl + + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index d799b0873c..d972dd5e06 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -663,25 +663,4 @@ SORT, DOOR_NAME+0 - - From 9242d2fef64674d48c00c8ee5a0672092b8d8383 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 22 Aug 2022 09:08:50 +0800 Subject: [PATCH 07/84] =?UTF-8?q?=E3=80=90=E8=AF=81=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=91=E6=8A=A4=E7=85=A7-=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/enums/IdCardTypeEnum.java | 27 ++++++++ .../com/epmet/entity/IcResiUserEntity.java | 7 +- .../impl/IcResiUserImportServiceImpl.java | 66 ++++++++++++------- 3 files changed, 74 insertions(+), 26 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/IdCardTypeEnum.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/IdCardTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/IdCardTypeEnum.java new file mode 100644 index 0000000000..7ca7f04641 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/IdCardTypeEnum.java @@ -0,0 +1,27 @@ +package com.epmet.commons.tools.enums; + +/** + * 唯一整件类型 + */ +public enum IdCardTypeEnum { + + OTHERS("0", "其他"), + SFZH("1", "身份证号"), + PASSPORT("2", "护照"); + + private String type; + private String name; + + IdCardTypeEnum(String type, String name) { + this.type = type; + this.name = name; + } + + public String getType() { + return type; + } + + public String getName() { + return name; + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java index f787399b23..d7849f5592 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java @@ -96,10 +96,15 @@ public class IcResiUserEntity extends BaseEpmetEntity { private String gender; /** - * 身份证号 + * 证件号 */ private String idCard; + /** + * 证件类型。1：身份证号；2：护照 + */ + private String idCardType; + /** * 出生日期 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 7f8921443f..adc9a94eb4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -18,6 +18,7 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum; +import com.epmet.commons.tools.enums.IdCardTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -98,6 +99,11 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res */ private final Pattern PATTERN_18_ID = Pattern.compile("^\\d{6}(?\\d{4})(?0[1-9]|1[0-2])(?[0-2][0-9]|3[0-1])\\d{2}(?\\d)[0-9a-xA-X]$"); + /** + * 9位护照 + */ + private final Pattern PATTERN_9_PASSPORT = Pattern.compile("^\\w{2}\\d{7}|\\w{1}\\d{8}$"); + /** * 日期解析，不含时间 */ @@ -623,14 +629,10 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res if (StringUtils.isBlank(idCard)) { log.debug("【居民信息导入】specifiedCheck身份证号为空的：{},{}", mobile, name); - String errorMsg = "身份证号不能为空"; + String errorMsg = "证件号不能为空"; throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); } - if (idCard.length() != 18 && idCard.length() != 15) { - errors.add("身份证号长度错误"); - } - if (StringUtils.isNotBlank(mobile) && mobile.length() > 15) { errors.add("手机号长度错误"); } @@ -642,12 +644,13 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } // ================== 数据补充 =================== - String year; - String month; - String day; - String sex; + String year = null, month = null, day = null, sex = null; + + // 证件类型，默认是1身份证号 + String idCardType = IdCardTypeEnum.SFZH.getType(); if (idCard.length() == 15) { + // 身份证 Matcher matcher = PATTERN_15_ID.matcher(idCard); if (matcher.matches()) { year = "19".concat(matcher.group("year")); @@ -655,10 +658,11 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res day = matcher.group("day"); sex = matcher.group("sex"); } else { - String s = "身份证号解析错误"; + String s = "证件号解析错误"; throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); } } else if (idCard.length() == 18) { + // 身份证 Matcher matcher = PATTERN_18_ID.matcher(idCard); if (matcher.matches()) { year = matcher.group("year"); @@ -666,28 +670,40 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res day = matcher.group("day"); sex = matcher.group("sex"); } else { - String s = "身份证号解析错误"; + String s = "证件号解析错误"; throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); } + } else if (idCard.length() == 9) { + // 护照 + Matcher matcher = PATTERN_9_PASSPORT.matcher(idCard); + if (matcher.matches()) { + idCardType = IdCardTypeEnum.PASSPORT.getType(); + } } else { - String s = "身份证号位数错误"; + String s = "证件号解析错误"; throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); } - // 出生日期 & 年龄 - LocalDate birthday = null; - try { - birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day)); - } catch (DateTimeException e) { - throw new EpmetException("身份证号中日期信息错误"); - } - int age = Period.between(birthday, LocalDate.now()).getYears(); + // 存储证件类型 + columnAndValues.put("ID_CARD_TYPE", idCardType); - // 性别 & 生日 & 老年人 - Boolean isMale = (Integer.parseInt(sex) % 2) == 1; - columnAndValues.put("BIRTHDAY", String.join("-", Arrays.asList(year, month,day))); - columnAndValues.put("GENDER", isMale ? "1" : "2"); - columnAndValues.put("IS_OLD_PEOPLE", age >= 60 ? "1" : "0"); + if (idCardType.equals(IdCardTypeEnum.SFZH.getType())) { + //只有证件类型是身份证号才做相关解析 + // 出生日期 & 年龄 + LocalDate birthday = null; + try { + birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day)); + } catch (DateTimeException e) { + throw new EpmetException("身份证号中日期信息错误"); + } + int age = Period.between(birthday, LocalDate.now()).getYears(); + + // 性别 & 生日 & 老年人 + Boolean isMale = (Integer.parseInt(sex) % 2) == 1; + columnAndValues.put("BIRTHDAY", String.join("-", Arrays.asList(year, month, day))); + columnAndValues.put("GENDER", isMale ? "1" : "2"); + columnAndValues.put("IS_OLD_PEOPLE", age >= 60 ? "1" : "0"); + } } /** From e5a08afb8c2718aaff10b15ab5075b8c32660d96 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 22 Aug 2022 10:18:31 +0800 Subject: [PATCH 08/84] =?UTF-8?q?=E3=80=90=E8=AF=81=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=91=E6=8A=A4=E7=85=A7-=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=AD=A3=E5=88=99=E5=B7=A5=E5=85=B7=E7=B1=BB=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E4=BF=AE=E6=94=B9=E5=B1=85=E6=B0=91=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=B8=BA=E6=AD=A3=E5=88=99=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/utils/IdCardRegexUtils.java | 123 ++++++++++++++++++ .../impl/IcResiUserImportServiceImpl.java | 101 +++++++------- 2 files changed, 173 insertions(+), 51 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java new file mode 100644 index 0000000000..deaf9997c1 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java @@ -0,0 +1,123 @@ +package com.epmet.commons.tools.utils; + +import com.epmet.commons.tools.enums.IdCardTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * 唯一整件正则工具 + */ +public class IdCardRegexUtils { + + /** + * 15位身份证号的正则表达式 + */ + private static final Pattern PATTERN_15_ID = Pattern.compile("^\\d{6}(?\\d{2})(?0[1-9]|1[0-2])(?[0-2][0-9]|3[0-1])\\d{2}(?\\d)$"); + /** + * 18位身份证号的正则表达式 + */ + private static final Pattern PATTERN_18_ID = Pattern.compile("^\\d{6}(?\\d{4})(?0[1-9]|1[0-2])(?[0-2][0-9]|3[0-1])\\d{2}(?\\d)[0-9a-xA-X]$"); + + /** + * 9位护照 + */ + private static final Pattern PATTERN_9_PASSPORT = Pattern.compile("^\\w{2}\\d{7}$|^\\w{1}\\d{8}$"); + + private String inputText; + + private Matcher matcher; + + private IdCardTypeEnum idCardType; + + private IdCardRegexUtils(IdCardTypeEnum idCardType, Matcher matcher, String inputText) { + this.idCardType = idCardType; + this.matcher = matcher; + this.inputText = inputText; + } + + /** + * 正则解析结果 + */ + @Data + @AllArgsConstructor + @NoArgsConstructor + public static class ParsedContent { + private String birthdayYear; + private String birthdayMonth; + private String birthdayDay; + private String sex; + } + + /** + * 解析正则 + * @param input + * @return + */ + public static IdCardRegexUtils parse(String input) { + if (input == null) { + return null; + } + + if (input.length() == 15) { + Matcher matcher = PATTERN_15_ID.matcher(input); + if (matcher.matches()) { + return new IdCardRegexUtils(IdCardTypeEnum.SFZH, matcher, input); + } + } + + if (input.length() == 18) { + Matcher matcher = PATTERN_18_ID.matcher(input); + if (matcher.matches()) { + return new IdCardRegexUtils(IdCardTypeEnum.SFZH, matcher, input); + } + } + + if (input.length() == 9) { + Matcher matcher = PATTERN_9_PASSPORT.matcher(input); + if (matcher.matches()) { + return new IdCardRegexUtils(IdCardTypeEnum.PASSPORT, matcher, input); + } + } + return null; + } + + /** + * 获取解析结果 + * @return + */ + public ParsedContent getParsedResult() { + if (matcher == null || idCardType == null) { + return null; + } + + if (IdCardTypeEnum.SFZH == idCardType) { + //是身份证号，可以解析 + String year; + if (inputText.length() == 15) { + // 15位身份证号，years前需要拼上19 + year = "19".concat(matcher.group("year")); + } else { + year = matcher.group("year"); + } + String month = matcher.group("month"); + String day = matcher.group("day"); + String sex = matcher.group("sex"); + return new ParsedContent(year, month, day, sex); + } + + // 其他类型暂时不可解析 + return null; + } + + /** + * 获取类型枚举 + * @return + */ + public IdCardTypeEnum getTypeEnum() { + return idCardType; + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index adc9a94eb4..342fb23760 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -90,20 +90,6 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res public static final List controlGroup1 = Arrays.asList("input", "textarea", "datepicker", "daterange"); public static final List controlGroup2 = Arrays.asList("select", "radio", "cascader"); - /** - * 15位身份证号的正则表达式 - */ - private final Pattern PATTERN_15_ID = Pattern.compile("^\\d{6}(?\\d{2})(?0[1-9]|1[0-2])(?[0-2][0-9]|3[0-1])\\d{2}(?\\d)$"); - /** - * 18位身份证号的正则表达式 - */ - private final Pattern PATTERN_18_ID = Pattern.compile("^\\d{6}(?\\d{4})(?0[1-9]|1[0-2])(?[0-2][0-9]|3[0-1])\\d{2}(?\\d)[0-9a-xA-X]$"); - - /** - * 9位护照 - */ - private final Pattern PATTERN_9_PASSPORT = Pattern.compile("^\\w{2}\\d{7}|\\w{1}\\d{8}$"); - /** * 日期解析，不含时间 */ @@ -646,48 +632,61 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res // ================== 数据补充 =================== String year = null, month = null, day = null, sex = null; - // 证件类型，默认是1身份证号 - String idCardType = IdCardTypeEnum.SFZH.getType(); - - if (idCard.length() == 15) { - // 身份证 - Matcher matcher = PATTERN_15_ID.matcher(idCard); - if (matcher.matches()) { - year = "19".concat(matcher.group("year")); - month = matcher.group("month"); - day = matcher.group("day"); - sex = matcher.group("sex"); - } else { - String s = "证件号解析错误"; - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); - } - } else if (idCard.length() == 18) { - // 身份证 - Matcher matcher = PATTERN_18_ID.matcher(idCard); - if (matcher.matches()) { - year = matcher.group("year"); - month = matcher.group("month"); - day = matcher.group("day"); - sex = matcher.group("sex"); - } else { - String s = "证件号解析错误"; - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); - } - } else if (idCard.length() == 9) { - // 护照 - Matcher matcher = PATTERN_9_PASSPORT.matcher(idCard); - if (matcher.matches()) { - idCardType = IdCardTypeEnum.PASSPORT.getType(); - } - } else { - String s = "证件号解析错误"; + //if (idCard.length() == 15) { + // // 身份证 + // Matcher matcher = PATTERN_15_ID.matcher(idCard); + // if (matcher.matches()) { + // year = "19".concat(matcher.group("year")); + // month = matcher.group("month"); + // day = matcher.group("day"); + // sex = matcher.group("sex"); + // } else { + // String s = "证件号解析错误"; + // throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); + // } + //} else if (idCard.length() == 18) { + // // 身份证 + // Matcher matcher = PATTERN_18_ID.matcher(idCard); + // if (matcher.matches()) { + // year = matcher.group("year"); + // month = matcher.group("month"); + // day = matcher.group("day"); + // sex = matcher.group("sex"); + // } else { + // String s = "证件号解析错误"; + // throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); + // } + //} else if (idCard.length() == 9) { + // // 护照 + // Matcher matcher = PATTERN_9_PASSPORT.matcher(idCard); + // if (matcher.matches()) { + // idCardType = IdCardTypeEnum.PASSPORT.getType(); + // } + //} else { + // String s = "证件号解析错误"; + // throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); + //} + + IdCardRegexUtils regexUtilInstance = IdCardRegexUtils.parse(idCard); + IdCardTypeEnum idCardType = regexUtilInstance.getTypeEnum(); + + if (idCardType == null || IdCardTypeEnum.OTHERS == idCardType) { + String s = "证件号解析错误，或不支持的证件类型。(请使用身份证号或者护照号)"; throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); } + IdCardRegexUtils.ParsedContent parsedResult = regexUtilInstance.getParsedResult(); + if (parsedResult != null) { + year = parsedResult.getBirthdayYear(); + month = parsedResult.getBirthdayMonth(); + day = parsedResult.getBirthdayDay(); + sex = parsedResult.getSex(); + } + // 存储证件类型 - columnAndValues.put("ID_CARD_TYPE", idCardType); + columnAndValues.put("ID_CARD_TYPE", idCardType.getType()); - if (idCardType.equals(IdCardTypeEnum.SFZH.getType())) { + if (idCardType == IdCardTypeEnum.SFZH) { //只有证件类型是身份证号才做相关解析 // 出生日期 & 年龄 LocalDate birthday = null; From 9611fd719c2b882e44c6418afe7c75eec8f19cf5 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 22 Aug 2022 13:49:53 +0800 Subject: [PATCH 09/84] =?UTF-8?q?=E3=80=90=E8=AF=81=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=91=E6=8A=A4=E7=85=A7-=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E5=AF=BC=E5=85=A5=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiUserServiceImpl.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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 d8f57e4e81..3734309c8c 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 @@ -294,6 +294,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Mon, 22 Aug 2022 14:07:10 +0800 Subject: [PATCH 10/84] =?UTF-8?q?=E6=94=B9=E5=96=84=E5=8E=9F=E6=9D=A5?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcNeighborHoodDTO.java | 5 +++++ .../src/main/resources/mapper/IcBuildingDao.xml | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java index 90ec898127..67b2af7180 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java @@ -149,4 +149,9 @@ public class IcNeighborHoodDTO implements Serializable { */ private Integer realBuilding; + /** + * 楼栋名 + */ + private Integer buildingName; + } 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 514e9a5472..8d8cc4535e 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 @@ -452,12 +452,11 @@ + select + ID, + CUSTOMER_ID, + GRID_ID, + GRID_NAME, + AGENCY_ID, + PIDS, + VILLAGE_ID, + VILLAGE_NAME, + BUILD_ID, + BUILD_NAME, + UNIT_ID, + UNIT_NAME, + HOME_ID, + HOME_NAME, + HOUSEHOLD_TYPE, + NAME, + MOBILE, + ID_CARD, + IS_VACCINATION, + FIRST_VAC_TIME, + FIRST_VAC_SITE, + SECOND_VAC_TIME, + SECOND_VAC_SITE, + THIRD_VAC_TIME, + THIRD_VAC_SITE, + REASON, + NOTE, + DEL_FLAG, + REVISION, + CREATED_BY, + CREATED_TIME, + UPDATED_BY, + UPDATED_TIME + from ic_vaccine_prarmeter + where DEL_FLAG = 0 + + and NAME like CONCAT('%' ,#{name}, '%') + + + and MOBILE like CONCAT('%', #{mobile}, '%') + + + and (AGENCY_ID = #{orgId} or PIDS like CONCAT('%',#{orgId},'%')) + + order by CREATED_TIME desc + - \ No newline at end of file + + From a402d9e5b7ec99d14c7e9b4d6873d9ab50484cc2 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 22 Aug 2022 16:51:11 +0800 Subject: [PATCH 14/84] =?UTF-8?q?=E3=80=90=E8=AF=81=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=91=E6=8A=A4=E7=85=A7-=E8=AE=BF=E5=AE=A2?= =?UTF-8?q?=E3=80=81=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86=E3=80=81=E6=88=BF?= =?UTF-8?q?=E5=B1=8B=E7=A7=9F=E8=B5=81=E3=80=81=E5=85=9A=E5=91=98=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E3=80=81=E5=B1=85=E6=B0=91=E6=B3=A8=E5=86=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AE=8C=EF=BC=8C=E5=BE=85=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PartyMemberConfirmServiceImpl.java | 9 +++++++++ .../controller/IcResiCollectController.java | 16 ++++++++++++++++ .../IcResiCollectVisitorController.java | 9 +++++++++ .../controller/IcResiUserController.java | 18 ++++++++++++++++++ .../service/impl/UserResiInfoServiceImpl.java | 13 +++++++++++++ .../excel/ic_resi_import_template.xls | Bin 74240 -> 74240 bytes 6 files changed, 65 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 74b9ba9844..961197076d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -10,6 +10,7 @@ import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.IdCardRegexUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.*; import com.epmet.dto.*; @@ -167,6 +168,14 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService @Transactional(rollbackFor = Exception.class) public Result submit(PartymemberInfoDTO partyMemberInfoDTO) { log.info("submit param:{}",JSON.toJSONString(partyMemberInfoDTO)); + + // 证件类型判断----start---- + IdCardRegexUtils regex = IdCardRegexUtils.parse(partyMemberInfoDTO.getIdCard()); + if (regex == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "证件号解析错误", "证件号解析错误"); + } + // 证件类型判断----end---- + Result result = new Result(); //校验手机验证码是否正常 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 cca091439f..d508f670e8 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 @@ -4,15 +4,19 @@ 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.StrConstant; +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.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.IdCardRegexUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.service.IcResiCollectService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -180,6 +184,18 @@ public class IcResiCollectController { //效验数据 ValidatorUtils.validateEntity(formDTO); formDTO.setOrigin("internal");//固定为内部 + + // 证件类型判断----start---- + for (IcResiCollectMemFormDTO member : formDTO.getMemberList()) { + if (StringUtils.isNotBlank(member.getIdNum())) { + IdCardRegexUtils regex = IdCardRegexUtils.parse(member.getIdNum()); + if (regex == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "证件号解析错误", "证件号解析错误"); + } + } + } + // 证件类型判断----end---- + return icResiCollectService.saveCollectInfo(formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java index 60995a0211..a3f86c1c28 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java @@ -3,9 +3,12 @@ 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.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; 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.IdCardRegexUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -117,6 +120,12 @@ public class IcResiCollectVisitorController { public Result saveInfo(@RequestBody SaveCollectVisitorFormDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto); + // 证件类型判断----start---- + IdCardRegexUtils regex = IdCardRegexUtils.parse(dto.getIdCard()); + if (regex == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "证件号解析错误", "证件号解析错误"); + } + // 证件类型判断----end---- return icResiCollectVisitorService.saveInfo(dto); } 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 7604ebc5c7..7ac26844dd 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 @@ -307,12 +307,30 @@ public class IcResiUserController implements ResultDataResolver { */ @PostMapping("rent/updateimage") public Result updateImage(@LoginUser TokenDto tokenDto, @RequestBody RentTenantFormDTO formDTO) { + + // 身份证号验证 + if (StringUtils.isNotBlank(formDTO.getUser().getIdCard())) { + checkIdCard(formDTO.getUser().getIdCard()); + } + + if (StringUtils.isNotBlank(formDTO.getIdCard())) { + checkIdCard(formDTO.getIdCard()); + } + String resiUserId = icResiUserService.updateImage(tokenDto, formDTO); //推送MQ事件 editResiMq(formDTO.getCustomerId(), resiUserId); return new Result(); } + private void checkIdCard(String idCard) { + // 证件类型判断----start---- + IdCardRegexUtils regex = IdCardRegexUtils.parse(idCard); + if (regex == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "证件号解析错误", "证件号解析错误"); + } + } + private void editResiMq(String customerId, String userId) { //推送MQ事件 IcResiUserAddMQMsg mqMsg = new IcResiUserAddMQMsg(); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 44cd7c12a3..8e9af036e7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -26,10 +26,13 @@ import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; 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.enums.IdCardTypeEnum; 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.utils.ConvertUtils; +import com.epmet.commons.tools.utils.IdCardRegexUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.SmsTemplateConstant; import com.epmet.constant.UserConstant; @@ -243,6 +246,16 @@ public class UserResiInfoServiceImpl extends BaseServiceImplcms;EPk z@#w>-R!hQ-q_mTa8BMG8o-t7s>`=-yozPP42tD8K=F*OCX76`@-~W8)`=4{ayA#iG z*>hYjlXW@(Afs+nVy=YV@oB>oA&O@Jo)m3FF&6*tJgw99rfa$`)J5;2?{qH8;n6Ke z(IeSKFUm1w=W&tVPIi4f&6X4Brrey$d48b2Iql;6(R_bawySIOQF`iUbx}Wa1jShl zRIWtO6~z$QocF)~#1638;qaM#W{^A6RZDCjuAMn95I07Q7FXbYmpQN&yHTm)q|<^d zE{vplvs38CF7em6x+sbbcLs7iwi>V*4P)wLjWE6tQ0=rV+}WZ<)6V4p?s#`R$S()f z2-?r8wMk`P)h(-Af*cl59aIL1lNIiw-c|$MU?tz$9$g|^lTZ4Z`@=P067?}V)yLKYvV3XTor!8$xLgq{kIwe$|Ul;<1lMe zax9*pIKI|XPri<$Oul|bi;`oLP8|>#Ojw)UCs*%zHoFTZe;d@$Ge7HS>a$uj{79#h zVF`ZsYiJh?ax>yv3-f2|}{%a{3_TLPu?K8f4j_SW1RP%D5r|RqJ zqm&rQB~x{Z3%k=r-m`!nqzrSqBpX13T@tGe4Zn!<-2l*2&Fs4uTO^Cw&_^f^{)(}) zZ@CTIP}}~kjnfP}c&3C>``lSXIqQq^ulV^BJjsHP3`n$ST0FPd2uPy+jiQBhQBOj4LMCWoWzfdWd3NU*nK-^qmnQmpLs*zLf zNti>1sU<=4Nx7WlsrfvOg!zdY3G5&s?J<6O~%P|X|XTV zmML1iXiI@cB6FceA~V|zc@UYWX(ZY*T_e$!85)VUaA~1+kxa9gP%?l7dKd(#MlY#w z;41ap`gu(~@s<=SKWzrMz7-&S2lwP}_2I@G9nPkV%}uW7XgP)Jxf%)A^E48!=W8Tf zFVIN1ep4gidZ9+b^&*Xg>%~mZy56>>CQRwK8(`>OfU13L@}Zjh;d#mORwz)M-3&_f zFA28UwnR%O3@=r^Te_m!e$QGH=Bo$yhiczRPx2KyS!Pn^eF^YYHNV?6f%-2Vye8o? zI#Mp`A9=U~zD-LGr==H#l1jYUSnz0MVOp+{mFXRgY)pI-0#8H&JJU*y989a!HWh;- zm35~8Hk|{IF9d3v^?hrdr8pGG#~Vga!=yRE+HiHSni*$K8l{BG^m^@JF|4i~DkaEt zp?0kpaxQvskLtg;BKVX`r4yIcGkF71&8q7t-cbLIQmOuGV2ZNpCX;8w@z89m>%qWJ zuJ;H9Vt@6$pF=Gxl@{M-eJ~!n)4eIr&R?JAao-B&89=*#D^zyg2Wa~U;2io|8StTM zZ8$IC8uH&0@0sZ9TH5}5pQLqKN5Ww!cr~&xt=GuP^sYuWrVVQ3ANOsN`z-gMtFM=g zPI14wwxiD@V{6GB#ofs8HOjcv?B@RvL?5g0HF9{{`D*l-foCh@4Vcdz@)eu#hy+Sy zav07RTw!MJV$qoO5s_B@tr1zQ{AV(4<5%hj+EtR^TWG_A_wDGCKhRfKRL0n`m+a`5 gd$eNYd35svPsa9ZJu51wM&SknZms+)8jZ$(0MJ-;DF6Tf delta 2282 zcmZvc3s96*6vxl~_S^S+SzSPuhdP?3V2Kr$3W#q7-w#5>RS-l|O!9?+h6;j!9&N4B zMspk;^Fi~WC}U!cW|o>cHK-FQqvNDWQHqaD?c80wV7WWrcfa5FzvtZlIeYIGoRAAn z$d$56)edy1RgJ|sRUp3@;96CGyh`+qsuvc?fjFP8SlNjw>JU6HN8(_0dvwzCVzmvA zt8^RGP8?5Ds^k!SKw-T|?ji@{Hrb{Wshw&}umoa)(Sf064OST(_=`ak-~xc=r#66% zcDvW;HG&+4SIlnTye`I2-@J)@G*e=V`NZgpWqt5~!G-5InIo{-XyvN5SNK(MLIAo= zE?W$N;j!T$_w=b2+()YMnM$r|!)n7o*89|U zSZ{JM8=f_Hqbgp*E#xTDq`^7luGFH(on|X@a#b7Un{U9aG;_Z}gDIq{EmohaR8t`K zw`lOXIgqu-sg@{a=6Rnv#-r3Hs)ohj0HaHJV%aat<86++N@c)LJ=hnxIyRzjz*KSw zT9!O!^7w|Nd1(`-rH{!hS_Q$dGmR^HmY7tZRFn9;8Ui$f4!&30ob-Ou1# zbblR_>0X43WO_wx)oRyS?Hbag@7?13=olwV^73sY+n+iJmZ7|+GIrQ4UVF)oC9 zWQcdOXnZN&osxNt2kBW!_OaamS_+2J8-BIxl#?$|kKgpGp6M@AuiwV)@gdTE71qWF zG8bN?HHYB6_)#v9tN=|97?0L8o#*3qfEXot;4T)_j=ydBaK%m+A65A3pq^TfW(z?X zW(=y-%fLP>dz|=XiQ*otQ7MtbK9zK3FlHct3Gle53qBd4lTMGrCQqU=abyUSDox75 zQ6;+0l+6IKbe~BV|G2>lsvywOBZDCN>U2t{i7|SqPZ~w4x&*>maC8{GYg;b~$#zKF|0f*=vodp1# z=gDU)ls`Nu`3!|&V?$Rwot|YFG8-W29ZHnLEu$_iQHh@Qm&B%F*V*NM^D$|Zq}BX% zLEOAY5H~+V5H~+l3Cf;p&|@AzhYtW2DdoA@GE2utOS~;@$q@5-TV@I3nKK3P%vpkX zW-{I4h_@wM5O2#ILA)(<1qBdMp}-^!NT7ycz?3(a9kNR^*C|b&p$zluGf>}fqD_PL zmS-7iHUfOL86bKKHRx|8XnmTB&BLV|pOr9QEWk_15yVSaAc&Xnt{`5*LP5NQTtU2q z_XP10775}dEGBAOLd~YH^@dJ60AAh&uyqfae4wn{c0poGaKer?{ytlmiWJ=BGG*_k z-b@*~vsfo3>~Agp*i0w78!ANu-pB9^12$Ib3}X)id|V6g>q%b|9)5mRVtIJEiZ@}w z!ES6hZaFw^!uu_&NVLf(LB1d}QGp-}(F#FUqLqSdM6^?UzpX@PcoGyU35SLU7_!a+ z8aHfp9{D%LS@>5YE?f%)<5hcIAd)wD%uJ~U6ZRR8n0iAEO z1{`T@-BuOS!V$NgTR89bivqU(USZ5@29W;&sALTP^xRjXn&|gkgVG&-LV5p- z@aUZZF~y>DCKw581(}IT1X+km1zCyKDbaVEt&;OR^{TfwRc0>!yt}Tuce~6wN=_$r zZHhNk%{DWqw_44L*@5af4NIs067Mb@JEFRx=e{0Rrx@5$YJs=T$c`{;^?DP_ZJE;- zpH65W;Ar_60AHJ7VHY^ Date: Mon, 22 Aug 2022 16:54:46 +0800 Subject: [PATCH 15/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcVaccinePrarmeterController.java | 14 ++++++ .../epmet/excel/IcVaccinePrarmeterExcel.java | 41 ++---------------- .../excel/ic_vaccine_prarmeter_excel.xls | Bin 0 -> 75264 bytes 3 files changed, 17 insertions(+), 38 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index 4c7091ba20..d50fcfa1cb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -1,10 +1,12 @@ package com.epmet.controller; +import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; @@ -24,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -104,6 +107,17 @@ public class IcVaccinePrarmeterController { } + /** + * 导出模板 + * @param response + * @throws Exception + */ + @PostMapping("exporttemplate") + public void exportTemplate( HttpServletResponse response) throws Exception { + TemplateExportParams templatePath = new TemplateExportParams("excel/ic_vaccine_prarmeter_excel.xls"); + ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"新冠病毒疫苗接种人员信息台账",response); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index dc58b059b3..ac28c37a33 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -14,49 +14,32 @@ import java.util.Date; @Data public class IcVaccinePrarmeterExcel { - @Excel(name = "主键") - private String id; - @Excel(name = "客户Id customer.id") - private String customerId; - - @Excel(name = "网格ID") - private String gridId; @Excel(name = "网格名称") private String gridName; - @Excel(name = "组织Id") - private String agencyId; @Excel(name = "组织的pids") private String pids; - @Excel(name = "所属小区ID；") - private String villageId; @Excel(name = "所属小区名称") private String villageName; - @Excel(name = "所属楼宇Id") - private String buildId; @Excel(name = "所属楼宇名称") private String buildName; - @Excel(name = "单元id") - private String unitId; @Excel(name = "单元名") private String unitName; - @Excel(name = "所属家庭Id") - private String homeId; @Excel(name = "房间名") private String homeName; - @Excel(name = "户口性质：0户籍 1外来") + @Excel(name = "户口性质", replace = {"户籍_0","外来_1"}) private String householdType; @Excel(name = "姓名") @@ -89,29 +72,11 @@ public class IcVaccinePrarmeterExcel { @Excel(name = "第三次接种地点") private String thirdVacSite; - @Excel(name = "原因：禁忌症/拒绝接种/其他原因") + @Excel(name = "原因") private String reason; @Excel(name = "备注") private String note; - @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; - - @Excel(name = "更新时间") - private Date updatedTime; - -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls new file mode 100644 index 0000000000000000000000000000000000000000..23d4778dc4a09ffc912ddcc7cae7fd02e157551b GIT binary patch literal 75264 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 literal 0 HcmV?d00001 From 8fbe4bdd9bb00c1ebb84b0217fa79c4949347eb2 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 22 Aug 2022 17:45:20 +0800 Subject: [PATCH 16/84] =?UTF-8?q?=E3=80=90=E8=AF=81=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=91=E6=8A=A4=E7=85=A7=E6=AD=A3=E5=88=99=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/utils/IdCardRegexUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java index bc56e52604..d44e9bb3fb 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java @@ -25,7 +25,7 @@ public class IdCardRegexUtils { /** * 9位护照 */ - private static final Pattern PATTERN_9_PASSPORT = Pattern.compile("^\\w{2}\\d{7}$|^\\w{1}\\d{8}$"); + private static final Pattern PATTERN_9_PASSPORT = Pattern.compile("^[a-zA-Z]{2}\\d{7}$|^[a-zA-Z]{1}\\d{8}$"); private String inputText; From 671329c310d7904064823348cd7013cb71d283b0 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 23 Aug 2022 10:06:36 +0800 Subject: [PATCH 17/84] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcNeighborHoodDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java index 67b2af7180..dbf18ee25a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java @@ -152,6 +152,6 @@ public class IcNeighborHoodDTO implements Serializable { /** * 楼栋名 */ - private Integer buildingName; + private String buildingName; } From c518d4b5d816a515b6c811c75b2ed639b4d1f595 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 23 Aug 2022 10:43:48 +0800 Subject: [PATCH 18/84] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/AddSocietyOrgFormDTO.java | 9 +++++++-- .../com/epmet/dto/form/EditSocietyOrgFormDTO.java | 9 ++++++++- .../dto/result/GetListSocietyOrgResultDTO.java | 4 ++++ .../epmet/dto/result/SocietyOrgListResultDTO.java | 4 ++++ .../java/com/epmet/entity/IcSocietyOrgEntity.java | 4 ++++ .../epmet/service/impl/IcSocietyOrgServiceImpl.java | 13 +++++++++++-- .../src/main/resources/mapper/IcSocietyOrgDao.xml | 3 ++- 7 files changed, 40 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java index 1217c647c5..3473fde8c0 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java @@ -23,6 +23,7 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; @@ -48,6 +49,11 @@ public class AddSocietyOrgFormDTO implements Serializable { * agency_id的所有上级 */ private String pids; + /** + * 社会组织头像 + */ + @NotEmpty(message = "组织头像不能为空", groups = { AddSocietyOrgFormDTO.Add.class}) + private String[] imageList; /** * 社会组织名称 */ @@ -87,7 +93,6 @@ public class AddSocietyOrgFormDTO implements Serializable { /** * 绑定管理员[组织下录入的工作人员] */ - @NotBlank(message = "绑定管理员名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) private String adminStaffId; /** * 地址 @@ -106,4 +111,4 @@ public class AddSocietyOrgFormDTO implements Serializable { public interface Add extends CustomerClientShowGroup {} -} \ No newline at end of file +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java index 2acad633c0..044d8ae3f0 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java @@ -22,6 +22,7 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.Date; @@ -40,6 +41,12 @@ public class EditSocietyOrgFormDTO implements Serializable { */ @NotBlank(message = "社会组织Id不能为空", groups = { Edit.class, Del.class }) private String societyId; + + /** + * 社会组织头像 + */ + @NotEmpty(message = "组织头像不能为空", groups = { Edit.class}) + private String[] imageList; /** * 社会组织名称 */ @@ -92,4 +99,4 @@ public class EditSocietyOrgFormDTO implements Serializable { public interface Edit {} public interface Del {} -} \ No newline at end of file +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java index 0130b246a7..0edc99c42f 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java @@ -44,6 +44,10 @@ public class GetListSocietyOrgResultDTO implements Serializable { private String agencyId; //社会组织Id private String societyId; + /** + * 社会组织头像 + */ + private String imgUrl; //社会组织名称 private String societyName; //服务事项 diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java index 38a081d2bc..b5ed492b5d 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java @@ -35,6 +35,10 @@ public class SocietyOrgListResultDTO implements Serializable { private String agencyName; //社会组织Id private String societyId; + /** + * 图像 + */ + private String imgUrl; //社会组织名称 private String societyName; //服务事项 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java index 7c6dcc0316..cc694cd625 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java @@ -87,6 +87,10 @@ public class IcSocietyOrgEntity extends BaseEpmetEntity { */ private String adminStaffId; + /** + * 地址 + */ + private String imgUrl; /** * 地址 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index 6542740821..08725a6a1c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -80,6 +80,10 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl%s", formDTO.getSocietyId())); } + //图片必填 + if(formDTO.getImageList() != null&& StringUtils.isNotBlank(formDTO.getImageList()[0])){ + entity.setImgUrl(formDTO.getImageList()[0]); + } entity = ConvertUtils.sourceToTarget(formDTO, IcSocietyOrgEntity.class); entity.setId(formDTO.getSocietyId()); baseDao.updateById(entity); @@ -115,7 +123,8 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl - \ No newline at end of file + From 45788748033717b86b78871d999b1b32633a5e75 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 23 Aug 2022 10:55:55 +0800 Subject: [PATCH 19/84] =?UTF-8?q?=E3=80=90=E8=AF=81=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=91=E6=8A=A4=E7=85=A7-=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=AF=BC=E5=85=A5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcResiUserImportServiceImpl.java | 43 +++---------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 342fb23760..0b10e9fc61 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -630,44 +630,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } // ================== 数据补充 =================== - String year = null, month = null, day = null, sex = null; - - //if (idCard.length() == 15) { - // // 身份证 - // Matcher matcher = PATTERN_15_ID.matcher(idCard); - // if (matcher.matches()) { - // year = "19".concat(matcher.group("year")); - // month = matcher.group("month"); - // day = matcher.group("day"); - // sex = matcher.group("sex"); - // } else { - // String s = "证件号解析错误"; - // throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); - // } - //} else if (idCard.length() == 18) { - // // 身份证 - // Matcher matcher = PATTERN_18_ID.matcher(idCard); - // if (matcher.matches()) { - // year = matcher.group("year"); - // month = matcher.group("month"); - // day = matcher.group("day"); - // sex = matcher.group("sex"); - // } else { - // String s = "证件号解析错误"; - // throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); - // } - //} else if (idCard.length() == 9) { - // // 护照 - // Matcher matcher = PATTERN_9_PASSPORT.matcher(idCard); - // if (matcher.matches()) { - // idCardType = IdCardTypeEnum.PASSPORT.getType(); - // } - //} else { - // String s = "证件号解析错误"; - // throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); - //} - IdCardRegexUtils regexUtilInstance = IdCardRegexUtils.parse(idCard); + if (regexUtilInstance == null) { + String s = "请输入正确的证件号"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); + } + IdCardTypeEnum idCardType = regexUtilInstance.getTypeEnum(); if (idCardType == null || IdCardTypeEnum.OTHERS == idCardType) { @@ -676,6 +644,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } IdCardRegexUtils.ParsedContent parsedResult = regexUtilInstance.getParsedResult(); + String year = null, month = null, day = null, sex = null; if (parsedResult != null) { year = parsedResult.getBirthdayYear(); month = parsedResult.getBirthdayMonth(); From 1db5a91cfc7af2a3f10557d9d6ec0cefa054eac5 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 23 Aug 2022 14:15:59 +0800 Subject: [PATCH 20/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/constants/ImportTaskConstants.java | 2 + .../dto/result/GridInfoByNameResultDTO.java | 41 +++ .../controller/CustomerAgencyController.java | 12 + .../java/com/epmet/dao/CustomerAgencyDao.java | 3 + .../epmet/service/CustomerAgencyService.java | 9 + .../impl/CustomerAgencyServiceImpl.java | 7 + .../resources/mapper/CustomerAgencyDao.xml | 14 + .../form/GridInfoVaccinePrarmeterFormDTO.java | 31 ++ .../IcVaccinePrarmeterController.java | 54 +++ .../epmet/excel/IcVaccinePrarmeterExcel.java | 6 +- .../excel/IcVaccinePrarmeterImportExcel.java | 95 ++++++ .../com/epmet/feign/GovOrgFeignClient.java | 11 + .../fallback/GovOrgFeignClientFallBack.java | 6 + .../IcPointNucleicMonitoringService.java | 4 +- .../service/IcVaccinePrarmeterService.java | 13 +- .../impl/IcVaccinePrarmeterServiceImpl.java | 323 +++++++++++++++++- 16 files changed, 619 insertions(+), 12 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoByNameResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GridInfoVaccinePrarmeterFormDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java index 2108042cd6..3136aea839 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java @@ -23,6 +23,8 @@ public interface ImportTaskConstants { String BIZ_TYPE_IC_ENTERPRISE="ic_enterprise"; String IC_POINT_NUCLEIC_MONITORING = "ic_point_nucleic_monitoring"; String IC_POINT_VACCINES_INOCULATION = "ic_point_vaccines_inoculation"; + // 新冠病毒疫苗接种人员信息台账 + String IC_VACCINE_PRARMETER = "ic_vaccine_prarmeter"; /** * 核酸检测 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoByNameResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoByNameResultDTO.java new file mode 100644 index 0000000000..fd91d086b5 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoByNameResultDTO.java @@ -0,0 +1,41 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 网格所属组织基本信息 + * @Author wgf + * @Date 2020/4/26 22:35 + */ +@Data +public class GridInfoByNameResultDTO implements Serializable { + private static final long serialVersionUID = 4360690752084258055L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 网格组织ID + */ + private String deptId; + + /** + * 网格名称 + */ + private String deptName; + + /** + * 网格的上级组织 + */ + private String pid; + + /** + * 网格的所有上级组织 + */ + private String pids; +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index 73316bad52..c1aba9bb3c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -475,6 +475,18 @@ public class CustomerAgencyController { return customerAgencyService.getCommunityInfo(formDTO); } + /** + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @Author wgf + * @Description 根据网格名称查询所属组织信息 + * @Date 2022/6/21 22:41 + **/ + @PostMapping("getGridInfoByGridName") + public Result getGridInfoByGridName(@RequestBody GridInfoVaccinePrarmeterFormDTO formDTO) { + return customerAgencyService.getGridInfoByGridName(formDTO); + } + /** * @param userId * @return com.epmet.commons.tools.utils.Result diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index b54b4a28b7..37e8d93c98 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -19,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.CustomerAgencyDTO; +import com.epmet.dto.form.GridInfoVaccinePrarmeterFormDTO; import com.epmet.dto.form.OrgInfoPointFormDTO; import com.epmet.dto.form.OrgTreeByUserAndTypeFormDTO; import com.epmet.dto.result.*; @@ -352,6 +353,8 @@ public interface CustomerAgencyDao extends BaseDao { CommunityInfoResultDTO getCommunityInfo(OrgInfoPointFormDTO formDTO); + GridInfoByNameResultDTO getGridInfoByGridName(GridInfoVaccinePrarmeterFormDTO formDTO); + CommunityInfoResultDTO getCommunityInfoByUserId(@Param("userId") String userId); /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index bec4188167..e71189e0ad 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -327,6 +327,15 @@ public interface CustomerAgencyService extends BaseService **/ Result getCommunityInfo(OrgInfoPointFormDTO formDTO); + /** + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @Author wgf + * @Description 根据网格名称查询所属组织信息 + * @Date 2022/6/21 22:41 + **/ + Result getGridInfoByGridName(GridInfoVaccinePrarmeterFormDTO formDTO); + /** * @param userId * @return com.epmet.commons.tools.utils.Result diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index f2c0392dc7..760f9690ad 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1580,6 +1580,13 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl().ok(communityInfoResultDTO); } + @Override + public Result getGridInfoByGridName(GridInfoVaccinePrarmeterFormDTO formDTO) { + GridInfoByNameResultDTO gridInfoByNameResultDTO = baseDao.getGridInfoByGridName(formDTO); + + return new Result().ok(gridInfoByNameResultDTO); + } + @Override public Result getCommunityInfoByUserId(String userId) { CommunityInfoResultDTO communityInfoResultDTO = baseDao.getCommunityInfoByUserId(userId); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index acf894391f..42cb8d69dc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -916,6 +916,20 @@ limit 1 + + select id, NAME,MOBILE from ic_resi_user - WHERE DEL_FLAG = '0' + WHERE 1=1 id = #{icResiUserId} From bc731678671b9fe06368a70e4aad600fcb243032 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 24 Aug 2022 13:47:54 +0800 Subject: [PATCH 35/84] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9end?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcSocietyOrgController.java | 1 - .../java/com/epmet/dao/IcSocietyOrgDao.java | 4 + .../excel/IcSocietyOrgImportExcelDTO.java | 13 +- .../IcSocietyOrgExcelImportListener.java | 157 ++++++++++++++++++ .../service/impl/IcSocietyOrgServiceImpl.java | 50 ++++-- .../main/resources/mapper/IcSocietyOrgDao.xml | 9 + .../impl/CustomerStaffServiceImpl.java | 34 ++-- 7 files changed, 231 insertions(+), 37 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/handler/IcSocietyOrgExcelImportListener.java diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java index 8c30990fc9..a5123e155a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java @@ -268,7 +268,6 @@ public class IcSocietyOrgController implements ResultDataResolver { @PostMapping("importV2") public Result importExcelV2(@LoginUser TokenDto tokenDto, @RequestPart("file") MultipartFile file) { String userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID); - // 1.暂存文件 String originalFilename = file.getOriginalFilename(); String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcSocietyOrgDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcSocietyOrgDao.java index 0e78731571..5580421547 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcSocietyOrgDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcSocietyOrgDao.java @@ -59,4 +59,8 @@ public interface IcSocietyOrgDao extends BaseDao { * @Description 查询当前组织下的社会组织数据 **/ List getByAgencyId(@Param("agencyId") String agencyId); + + List selectListForUniqueName(@Param("agencyId") String agencyId, + @Param("societyName") String societyName, + @Param("id") String id); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgImportExcelDTO.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgImportExcelDTO.java index 284f6d024d..bc14e774a0 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgImportExcelDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgImportExcelDTO.java @@ -16,22 +16,21 @@ import javax.validation.constraints.NotBlank; public class IcSocietyOrgImportExcelDTO { @ExcelProperty(value = "组织名称") - @NotBlank(message = "不能为空") - @Length(max=50,message = "不能超过50个字") + @NotBlank(message = "组织名称不能为空") + @Length(max=50,message = "组织名称不能超过50个字") private String societyName; @ExcelProperty(value = "服务内容") - @NotBlank(message = "不能为空") - @Length(max=1000,message = "不能超过1000个字") + @NotBlank(message = "服务内容不能为空") + @Length(max=1000,message = "服务内容不能超过1000个字") private String serviceMatters; @ExcelProperty(value = "服务电话") - @NotBlank(message = "不能为空") - @Length(max=11,message = "不能超过11个字") + @NotBlank(message = "服务电话不能为空") private String mobile; @ExcelProperty(value = "服务时间") - @NotBlank(message = "不能为空") + @NotBlank(message = "服务时间不能为空") private String serviceTimeStr; @ExcelProperty(value = "管理员姓名") diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/handler/IcSocietyOrgExcelImportListener.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/handler/IcSocietyOrgExcelImportListener.java new file mode 100644 index 0000000000..54b23d8fd2 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/handler/IcSocietyOrgExcelImportListener.java @@ -0,0 +1,157 @@ +package com.epmet.excel.handler; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.read.listener.ReadListener; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +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.ValidateException; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.ObjectUtil; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.entity.IcSocietyOrgEntity; +import com.epmet.excel.IcSocietyOrgImportExcelDTO; +import com.epmet.service.impl.IcSocietyOrgServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Description + * @Author yzm + * @Date 2022/8/24 11:42 + */ +@Slf4j +public class IcSocietyOrgExcelImportListener implements ReadListener { + // 最大条数阈值 + public static final int MAX_THRESHOLD = 2; + private String currentCustomerId; + /** + * 当前操作用户 + */ + private CustomerStaffInfoCacheResult staffInfo; + private IcSocietyOrgServiceImpl icSocietyOrgService; + private List errorRows = new ArrayList<>(); + /** + * 要插入的数据 + */ + private List insertDatas = new ArrayList<>(); + /** + * 根据组织名称更新的数据 + */ + private List updateDatas = new ArrayList<>(); + private Map staffMap=new HashMap<>(); + public IcSocietyOrgExcelImportListener(String customerId, CustomerStaffInfoCacheResult staffInfo, IcSocietyOrgServiceImpl icSocietyOrgService, Map staffMap) { + this.currentCustomerId = customerId; + this.staffInfo = staffInfo; + this.icSocietyOrgService = icSocietyOrgService; + this.staffMap=staffMap; + } + + @Override + public void invoke(IcSocietyOrgImportExcelDTO data, AnalysisContext analysisContext) { + try { + // log.warn("有数据吗？"+JSON.toJSONString(data)); + // 不能为空先校验数据 + ValidatorUtils.validateEntity(data); + // 去除空格 + ObjectUtil.objectToTrim(data); + IcSocietyOrgEntity icSocietyOrgEntity = ConvertUtils.sourceToTarget(data, IcSocietyOrgEntity.class); + icSocietyOrgEntity.setCustomerId(currentCustomerId); + icSocietyOrgEntity.setAgencyId(staffInfo.getAgencyId()); + icSocietyOrgEntity.setPids(staffInfo.getAgencyPIds()); + if(StringUtils.isNotBlank(data.getAdminStaffName())){ + String adminStaffId = null; + for(String key:staffMap.keySet()){ + if (data.getAdminStaffName().equals(staffMap.get(key))) { + adminStaffId=key; + break; + } + } + if (StringUtils.isBlank(adminStaffId)) { + String msg = String.format("当前组织下没有【%s】", data.getAdminStaffName()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); + } + icSocietyOrgEntity.setAdminStaffId(adminStaffId); + } + //网格id+场所名称 + List originList = icSocietyOrgService.selectForUniqueName(icSocietyOrgEntity.getAgencyId(), icSocietyOrgEntity.getSocietyName(), null); + if(CollectionUtils.isEmpty(originList)){ + insertDatas.add(icSocietyOrgEntity); + }else{ + IcSocietyOrgEntity origin=originList.get(NumConstant.ZERO); + icSocietyOrgEntity.setId(origin.getId()); + updateDatas.add(icSocietyOrgEntity); + } + + + if (insertDatas.size() == MAX_THRESHOLD) { + execPersist(); + } + if (updateDatas.size() == MAX_THRESHOLD) { + execPersist(); + } + } catch (Exception e) { + String errorMsg = null; + if (e instanceof ValidateException) { + errorMsg = ((ValidateException) e).getMsg(); + }else if(e instanceof EpmetException){ + errorMsg = ((EpmetException) e).getMsg(); + }else { + errorMsg = "未知错误"; + log.error("【社会组织导入】出错:{}", ExceptionUtils.getErrorStackTrace(e)); + } + IcSocietyOrgImportExcelDTO.ErrorRow errorRow = new IcSocietyOrgImportExcelDTO.ErrorRow(); + errorRow.setSocietyName(data.getSocietyName()); + errorRow.setServiceMatters(data.getServiceMatters()); + errorRow.setMobile(data.getMobile()); + errorRow.setServiceTimeStr(data.getServiceTimeStr()); + errorRow.setAdminStaffName(data.getAdminStaffName()); + errorRow.setAddress(data.getAddress()); + errorRow.setErrorInfo(errorMsg); + errorRows.add(errorRow); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext analysisContext) { + log.info("☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆"); + // 最后几条达不到阈值，这里必须再调用一次 + execPersist(); + } + + /** + * 执行持久化 + */ + private void execPersist() { + try { + if (CollectionUtils.isNotEmpty(insertDatas)) { + icSocietyOrgService.insertBatch(insertDatas); + } + + if (CollectionUtils.isNotEmpty(updateDatas)) { + icSocietyOrgService.updateBatchById(updateDatas); + } + } finally { + insertDatas.clear(); + updateDatas.clear(); + } + } + + /** + * 获取错误行 + * + * @return + */ + public List getErrorRows() { + return errorRows; + } +} + diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index 332db0bae7..be5ccf565b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -41,6 +41,7 @@ import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcSocietyOrgEntity; import com.epmet.excel.IcSocietyOrgExcel; import com.epmet.excel.IcSocietyOrgImportExcelDTO; +import com.epmet.excel.handler.IcSocietyOrgExcelImportListener; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; @@ -164,14 +165,23 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl pointMap = icUserDemandRecService.getServicePoint(formDTO.getCustomerId(), UserDemandConstant.SOCIAL_ORG); //2.查询被绑定管理员信息 UserIdsFormDTO dto = new UserIdsFormDTO(); - List staffIdList = result.getList().stream().map(SocietyOrgListResultDTO::getAdminStaffId).collect(Collectors.toList()); - staffIdList = staffIdList.stream().distinct().collect(Collectors.toList()); - dto.setUserIds(staffIdList); - Result> listResult = epmetUserOpenFeignClient.getStaffInfoList(dto); - if (!listResult.success()) { - throw new RenException("获取工作人员基本信息失败......"); + List staffIdList = result.getList().stream().filter(u->StringUtils.isNotBlank(u.getAdminStaffId())).map(SocietyOrgListResultDTO::getAdminStaffId).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(staffIdList)){ + staffIdList = staffIdList.stream().distinct().collect(Collectors.toList()); + dto.setUserIds(staffIdList); + Result> listResult = epmetUserOpenFeignClient.getStaffInfoList(dto); + if (!listResult.success()) { + throw new RenException("获取工作人员基本信息失败......"); + } + result.getList().stream().filter(f->StringUtils.isNotBlank(f.getAdminStaffId())).forEach(r -> listResult.getData().stream().filter(u -> r.getAdminStaffId().equals(u.getStaffId())).forEach(u -> r.setAdminStaffName(u.getStaffName()))); + /* result.getList().forEach(dto1->{ + listResult.getData().forEach(staff->{ + if(dto1.getAdminStaffId().equals(staff.getStaffId())){ + dto1.setAdminStaffName(staff.getStaffName()); + } + }); + });*/ } - result.getList().forEach(r -> listResult.getData().stream().filter(u -> r.getAdminStaffId().equals(u.getStaffId())).forEach(u -> r.setAdminStaffName(u.getStaffName()))); //3.查询被绑定管理员信息 OrgInfoFormDTO org = new OrgInfoFormDTO(); @@ -340,14 +350,28 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl> staffIdsRes=govOrgOpenFeignClient.getAgencyStaffs(agencyIdFormDTO); + if (!staffIdsRes.success() || CollectionUtils.isEmpty(staffIdsRes.getData())) { + String msg = "查询当前组织下工作人员列表异常"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); + } + Result currentAgencyStaffs=epmetUserOpenFeignClient.getCustomerStaffList(staffIdsRes.getData()); + if (!currentAgencyStaffs.success() || null == currentAgencyStaffs.getData() || CollectionUtils.isEmpty(currentAgencyStaffs.getData().getStaffList())) { + String msg = "查询当前组织下工作人员信息异常"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); + } + List staffList=currentAgencyStaffs.getData().getStaffList(); + Map staffMap=staffList.stream().collect(Collectors.toMap(StaffListResultDTO::getStaffId, StaffListResultDTO::getStaffName)); - // todo - /*IcEnterpriseExcelImportListener listener = new IcEnterpriseExcelImportListener(customerId,staffInfo, this); - EasyExcel.read(filePath.toFile(), IcSocietyOrgImportExcelDTO.class, listener).headRowNumber(1).sheet(0).doRead();*/ + IcSocietyOrgExcelImportListener listener = new IcSocietyOrgExcelImportListener(customerId,staffInfo, this,staffMap); + EasyExcel.read(filePath.toFile(), IcSocietyOrgImportExcelDTO.class, listener).headRowNumber(1).sheet(0).doRead(); Path errorDescFile = null; String errorDesFileUrl = null; - List errorRows = null;// todo listener.getErrorRows(); + List errorRows = listener.getErrorRows(); boolean failed = errorRows.size() > 0; if (failed) { @@ -420,4 +444,8 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl selectForUniqueName(String agencyId, String societyName, String id) { + return baseDao.selectListForUniqueName(agencyId,societyName,id); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml index 4939225de6..9fc03ab87d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml @@ -92,4 +92,13 @@ AND agency_id = #{agencyId} + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 3f9abd5e70..ecfcade3fd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -617,25 +617,23 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl staffInfoList = new ArrayList<>(); userIds.forEach(staffId -> { CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), staffId); - if (staffInfo == null) { - log.error("getStaffInfoList fail customerId:{}, staffId:{} not exist in db", formDTO.getCustomerId(), staffId); - return; + if (null != staffInfo) { + StaffSinGridResultDTO resultDTO = new StaffSinGridResultDTO(); + resultDTO.setStaffId(staffId); + resultDTO.setStaffName(staffInfo.getRealName()); + resultDTO.setHeadPhoto(staffInfo.getHeadPhoto()); + resultDTO.setGender(staffInfo.getGender()); + + List roleInfoList = new ArrayList<>(); + staffInfo.getRoleMap().forEach((key, value) -> { + RoleResultDTO dto = new RoleResultDTO(); + dto.setRoleKey(key); + dto.setRoleName(value); + roleInfoList.add(dto); + }); + resultDTO.setRoleList(roleInfoList); + staffInfoList.add(resultDTO); } - StaffSinGridResultDTO resultDTO = new StaffSinGridResultDTO(); - resultDTO.setStaffId(staffId); - resultDTO.setStaffName(staffInfo.getRealName()); - resultDTO.setHeadPhoto(staffInfo.getHeadPhoto()); - resultDTO.setGender(staffInfo.getGender()); - - List roleInfoList = new ArrayList<>(); - staffInfo.getRoleMap().forEach((key, value) -> { - RoleResultDTO dto = new RoleResultDTO(); - dto.setRoleKey(key); - dto.setRoleName(value); - roleInfoList.add(dto); - }); - resultDTO.setRoleList(roleInfoList); - staffInfoList.add(resultDTO); }); /*List staffInfoList = customerStaffDao.getStaffInfoList(userIds); From 89fbd663dfd75507d55e2335ca856e4340bb01b3 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 24 Aug 2022 14:03:34 +0800 Subject: [PATCH 36/84] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/ChangeDeathExcel.java | 2 +- .../src/main/java/com/epmet/excel/ChangeRelocationExcel.java | 2 +- .../src/main/java/com/epmet/excel/ChangeWelfareExcel.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeDeathExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeDeathExcel.java index a198ceee2d..5ad2165e88 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeDeathExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeDeathExcel.java @@ -23,7 +23,7 @@ public class ChangeDeathExcel { @Excel(name = "姓名") private String name; - @Excel(name = "身份证") + @Excel(name = "证件号") private String idCard; @Excel(name = "手机号") diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java index 1823d569e2..554d776ac9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java @@ -32,7 +32,7 @@ public class ChangeRelocationExcel { @Excel(name = "手机号") private String mobile; - @Excel(name = "身份证号") + @Excel(name = "证件号号") private String idCard; @Excel(name = "性别") diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java index 99437aa726..acb7705b2f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java @@ -24,7 +24,7 @@ public class ChangeWelfareExcel { @Excel(name = "姓名") private String name; - @Excel(name = "身份证") + @Excel(name = "证件号") private String idCard; @Excel(name = "手机号") From b3316e2209be51514bca08b704d6873c35a94252 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 24 Aug 2022 14:50:56 +0800 Subject: [PATCH 37/84] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/CollectListMemberExcelResultDTO.java | 2 +- .../src/main/java/com/epmet/excel/ChangeRelocationExcel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java index 89742845fa..f94a7dc803 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java @@ -24,7 +24,7 @@ public class CollectListMemberExcelResultDTO implements Serializable { /** * 成员身份证 */ - @Excel(name = "成员身份证号", width = 30) + @Excel(name = "成员证件号", width = 30) private String memberIdNum; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java index 554d776ac9..3b875fd0cd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java @@ -32,7 +32,7 @@ public class ChangeRelocationExcel { @Excel(name = "手机号") private String mobile; - @Excel(name = "证件号号") + @Excel(name = "证件号") private String idCard; @Excel(name = "性别") From 71020ef0d201163a3efad340eb25f28c370ba658 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 24 Aug 2022 15:01:52 +0800 Subject: [PATCH 38/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6------=E5=AE=A1=E6=A0=B8=E5=89=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/CheckHouseInfoFormDTO.java | 31 +++++++ .../dto/result/CheckHomeInfoResultInfo.java | 38 ++++++++ .../epmet/controller/IcHouseController.java | 20 +++++ .../java/com/epmet/dao/IcBuildingDao.java | 9 ++ .../java/com/epmet/dao/IcBuildingUnitDao.java | 8 ++ .../main/java/com/epmet/dao/IcHouseDao.java | 8 ++ .../java/com/epmet/dao/IcNeighborHoodDao.java | 8 ++ .../com/epmet/service/IcHouseService.java | 9 ++ .../service/impl/IcHouseServiceImpl.java | 59 ++++++++++-- .../main/resources/mapper/IcBuildingDao.xml | 11 +++ .../resources/mapper/IcBuildingUnitDao.xml | 11 +++ .../src/main/resources/mapper/IcHouseDao.xml | 9 ++ .../resources/mapper/IcNeighborHoodDao.xml | 10 +++ .../IcVaccinePrarmeterController.java | 5 +- .../com/epmet/dao/IcVaccinePrarmeterDao.java | 8 ++ .../service/IcVaccinePrarmeterService.java | 7 ++ .../impl/IcVaccinePrarmeterServiceImpl.java | 12 +++ .../mapper/IcVaccinePrarmeterDao.xml | 89 ++++++++++++++++++- 18 files changed, 344 insertions(+), 8 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CheckHouseInfoFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CheckHomeInfoResultInfo.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CheckHouseInfoFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CheckHouseInfoFormDTO.java new file mode 100644 index 0000000000..106952e90c --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CheckHouseInfoFormDTO.java @@ -0,0 +1,31 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 根据小区，楼宇，单元名称校验是否存在 + * @Author wgf + * @Date 2022/8/24 9:03 + */ +@Data +public class CheckHouseInfoFormDTO implements Serializable { + private static final long serialVersionUID = 2636608477324780974L; + + private String customerId; + + private String gridId; + private String gridName; + + private String villageId; + private String buildId; + private String unitId; + private String homeId; + + + private String villageName; + private String buildName; + private String unitName; + private String homeName; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CheckHomeInfoResultInfo.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CheckHomeInfoResultInfo.java new file mode 100644 index 0000000000..ab4bc4d963 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CheckHomeInfoResultInfo.java @@ -0,0 +1,38 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 房屋信息 + * + * @author wgf + * @date 2022/8/23 20:58 + */ +@Data +public class CheckHomeInfoResultInfo implements Serializable { + private static final long serialVersionUID = -2797565581047800011L; + + // 0：校验成功；1：校验失败； + private String code; + // 提示信息 + private String msg; + // 是否新增房屋：0：否；1：是 + private String isAdd; + + private String gridId; + private String gridName; + + private String villageId; + private String villageName; + + private String buildId; + private String buildName; + + private String unitId; + private String unitName; + + private String homeId; + private String homeName; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java index 49e3f15f92..6d828df25a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java @@ -18,11 +18,16 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.dto.form.PageFormDTO; 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.commons.tools.validator.ValidatorUtils; import com.epmet.dto.IcHouseDTO; +import com.epmet.dto.IcVaccinePrarmeterDTO; +import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.HouseFormDTO; +import com.epmet.dto.form.VaccinePrarmeterListFormDTO; import com.epmet.dto.result.HouseAgencyInfoResultDTO; import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.HouseListResultDTO; @@ -136,4 +141,19 @@ public class IcHouseController { public Result> getOwnerHouseList(@RequestBody IcHouseDTO formDTO){ return new Result>().ok(icHouseService.getOwnerHouseList(formDTO)); } + + /** + * Desc: 根据小区，楼宇，单元名称校验是否存在 + * @param formDTO + * @param tokenDto + * @author wgf + * @date 2022/8/24 13:57 + */ + @PostMapping("checkHomeInfo") + public Result checkHomeInfo(@RequestBody CheckHouseInfoFormDTO formDTO, @LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return icHouseService.checkHomeInfo(formDTO); + + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java index 8b0cd3f470..fd53deb80d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java @@ -20,6 +20,7 @@ package com.epmet.dao; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.ImportGeneralDTO; +import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.IcBuildingListFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.CustomerAgencyEntity; @@ -224,4 +225,12 @@ public interface IcBuildingDao extends BaseDao { IcBuildingEntity selectByCoding(@Param("coding") String coding, @Param("id") String id); + + /** + * 根据楼宇名称查询楼宇信息 + * @param formDTO + * @return + */ + IcBuildingEntity getBuildingInfoByName(CheckHouseInfoFormDTO formDTO); + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java index 09c40920ed..ebc8c2f888 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.result.HouseInfoResultDTO; import com.epmet.dto.result.OrganizationCommunityDTO; import com.epmet.entity.IcBuildingUnitEntity; @@ -78,4 +79,11 @@ public interface IcBuildingUnitDao extends BaseDao { * @return com.epmet.dto.result.OrganizationCommunityDTO */ OrganizationCommunityDTO selectCommunityByUnitId(@Param("unitId") String unitId); + + /** + * 根据单元名称查询单元信息 + * @param formDTO + * @return + */ + IcBuildingUnitEntity getbuildingUnitInfoByName(CheckHouseInfoFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 3ae10791bf..e8e8157256 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -2,6 +2,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.ImportGeneralDTO; +import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.GetHouseInfoToCollectFormDTO; import com.epmet.dto.form.IcHouseListFormDTO; import com.epmet.dto.result.*; @@ -201,4 +202,11 @@ public interface IcHouseDao extends BaseDao { */ IcHouseInfoCollectResultDTO getHouseInfoToCollect(GetHouseInfoToCollectFormDTO formDTO); + /** + * 校验房屋 + * @param formDTO + * @return + */ + IcHouseEntity getHouseInfoByName(CheckHouseInfoFormDTO formDTO); + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java index a1999a0ee6..8d1e8628f6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.NeighborHoodAndManagementDTO; +import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.HouseInformationFormDTO; import com.epmet.dto.form.IcNeighborHoodListFormDTO; import com.epmet.dto.result.*; @@ -211,4 +212,11 @@ public interface IcNeighborHoodDao extends BaseDao { * @Date 2022/6/29 16:48 */ List getHouseList(HouseInformationFormDTO formDTO); + + /** + * 根据名称查小区信息 + * @param formDTO + * @return + */ + IcNeighborHoodEntity getNeighborHoodInfoByName(CheckHouseInfoFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java index 522acba117..77a5bdd4ad 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java @@ -3,8 +3,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; 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.IcHouseDTO; import com.epmet.dto.ImportGeneralDTO; +import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.HouseFormDTO; import com.epmet.dto.result.HouseAgencyInfoResultDTO; import com.epmet.dto.result.HouseInfoDTO; @@ -130,4 +132,11 @@ public interface IcHouseService extends BaseService { * @Date 2022/7/19 17:41 */ List getOwnerHouseList(IcHouseDTO formDTO); + + /** + * 根据小区，楼宇，单元名称校验是否存在 + * @param formDTO + * @return + */ + Result checkHomeInfo(CheckHouseInfoFormDTO formDTO); } 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 d31a2cbb54..385f90f60d 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 @@ -20,12 +20,9 @@ import com.epmet.dto.IcHouseDTO; import com.epmet.dto.IcResiCategoryStatsConfigDTO; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.ImportGeneralDTO; +import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.HouseFormDTO; -import com.epmet.dto.result.HouseAgencyInfoResultDTO; -import com.epmet.dto.result.HomeInfoResultDTO; -import com.epmet.dto.result.HouseInfoDTO; -import com.epmet.dto.result.HouseListResultDTO; -import com.epmet.dto.result.HousesNameResultDTO; +import com.epmet.dto.result.*; import com.epmet.entity.IcBuildingEntity; import com.epmet.entity.IcBuildingUnitEntity; import com.epmet.entity.IcHouseEntity; @@ -339,4 +336,56 @@ public class IcHouseServiceImpl extends BaseServiceImpl icHouseRedis.getHouseInfo(item.getId(), item.getCustomerId())).collect(Collectors.toList()); } + + @Override + public Result checkHomeInfo(CheckHouseInfoFormDTO formDTO) { + CheckHomeInfoResultInfo checkHomeInfoResultInfo = ConvertUtils.sourceToTarget(formDTO, CheckHomeInfoResultInfo.class); + + // 校验小区 + IcNeighborHoodEntity icNeighborHoodEntity = icNeighborHoodDao.getNeighborHoodInfoByName(formDTO); + if(StringUtils.isNotBlank(icNeighborHoodEntity.getId())){ + formDTO.setVillageId(icNeighborHoodEntity.getId()); + checkHomeInfoResultInfo.setVillageId(icNeighborHoodEntity.getId()); + }else{ + checkHomeInfoResultInfo.setCode("1"); + checkHomeInfoResultInfo.setMsg("小区名称未匹配到数据"); + return new Result().ok(checkHomeInfoResultInfo); + } + + // 校验楼宇 + IcBuildingEntity icBuildingEntity = icBuildingDao.getBuildingInfoByName(formDTO); + if(StringUtils.isNotBlank(icBuildingEntity.getId())){ + formDTO.setBuildId(icBuildingEntity.getId()); + checkHomeInfoResultInfo.setBuildId(icBuildingEntity.getId()); + }else{ + checkHomeInfoResultInfo.setCode("1"); + checkHomeInfoResultInfo.setMsg("楼宇名称未匹配到数据"); + return new Result().ok(checkHomeInfoResultInfo); + } + + // 校验单元 + IcBuildingUnitEntity icBuildingUnitEntity = buildingUnitDao.getbuildingUnitInfoByName(formDTO); + if(StringUtils.isNotBlank(icBuildingUnitEntity.getId())){ + formDTO.setUnitId(icBuildingUnitEntity.getId()); + checkHomeInfoResultInfo.setUnitId(icBuildingUnitEntity.getId()); + }else{ + checkHomeInfoResultInfo.setCode("1"); + checkHomeInfoResultInfo.setMsg("单元名称未匹配到数据"); + return new Result().ok(checkHomeInfoResultInfo); + } + + // 校验房屋 + IcHouseEntity icHouseEntity = baseDao.getHouseInfoByName(formDTO); + checkHomeInfoResultInfo.setCode("0"); + if(StringUtils.isNotBlank(icHouseEntity.getId())){ + checkHomeInfoResultInfo.setHomeId(icHouseEntity.getId()); + checkHomeInfoResultInfo.setMsg("该房屋为已存在房屋"); + checkHomeInfoResultInfo.setIsAdd("0"); + }else{ + checkHomeInfoResultInfo.setMsg("该房屋暂不存在"); + checkHomeInfoResultInfo.setIsAdd("1"); + } + + return new Result().ok(checkHomeInfoResultInfo); + } } 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 5f825edc25..2fce8b1cf2 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 @@ -450,4 +450,15 @@ + + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml index fe5a0ef73b..c46c387e01 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml @@ -59,5 +59,16 @@ and u.id=#{unitId} + + 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 8b900c90dd..6c8b094f67 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 @@ -549,5 +549,14 @@ and DOOR_NAME = #{doorName} + + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index 2f76bc1b7a..d1c0168b4e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -662,6 +662,16 @@ ORDER BY SORT, DOOR_NAME+0 + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index 48574b4867..9ef386164e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -63,7 +63,8 @@ public class IcVaccinePrarmeterController { @RequestMapping("page") public Result> page(@RequestParam Map params){ - PageData page = icVaccinePrarmeterService.page(params); +// PageData page = icVaccinePrarmeterService.page(params); + PageData page = icVaccinePrarmeterService.getPhrasePage(params); return new Result>().ok(page); } @@ -174,4 +175,6 @@ public class IcVaccinePrarmeterController { + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java index cbe6c686b4..c5bdfcdbf7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java @@ -8,6 +8,7 @@ import com.epmet.entity.IcVaccinePrarmeterEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; +import java.util.Map; /** * 新冠病毒疫苗接种人员信息台账 @@ -20,4 +21,11 @@ public interface IcVaccinePrarmeterDao extends BaseDao List vaccineExport(VaccinePrarmeterListFormDTO formDTO); + /** + * 条件查询 + * @param params + * @return + */ + List getPhrasePage(Map params); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java index c259ba43c2..a298a3e165 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java @@ -28,6 +28,13 @@ public interface IcVaccinePrarmeterService extends BaseService page(Map params); + /** + * 分页条件查询 + * @param params + * @return + */ + PageData getPhrasePage(Map params); + /** * 默认查询 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 9b3ad7dc8e..2f5cdc2a83 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -83,6 +83,18 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl getPhrasePage(Map params) { + IPage page = getPage(params); + List list = baseDao.getPhrasePage(params); + return new PageData<>(list, page.getTotal()); + } + @Override public List list(Map params) { List entityList = baseDao.selectList(getWrapper(params)); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index 68fffc3f4b..b1eb484110 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -82,8 +82,93 @@ and MOBILE like CONCAT('%', #{mobile}, '%') - - and (AGENCY_ID = #{orgId} or PIDS like CONCAT('%',#{orgId},'%')) + + and ID_CARD like CONCAT('%', #{idCard}, '%') + + + and (IS_VACCINATION = #{isVaccination} + + + and (GRID_ID = #{gridId} + + + and (VILLAGE_ID = #{villageId} + + + and (BUILD_ID = #{buildId} + + + and (UNIT_ID = #{unitId} + + + and (HOME_ID = #{homeId} + + order by CREATED_TIME desc + + + From 521345a403e6bf5fce22469083d7d55f8b051d4e Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 24 Aug 2022 15:04:48 +0800 Subject: [PATCH 39/84] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java | 2 +- .../java/com/epmet/dto/form/EditSocietyOrgFormDTO.java | 2 +- .../main/java/com/epmet/excel/IcSocietyOrgExportExcel.java | 4 ++-- .../com/epmet/service/impl/IcSocietyOrgServiceImpl.java | 7 ------- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java index 391652762d..a78b42a471 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java @@ -68,7 +68,7 @@ public class AddSocietyOrgFormDTO implements Serializable { /** * 负责人 */ - @NotBlank(message = "负责人名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) + //@NotBlank(message = "负责人名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) @Length(max = 20, message = "负责人名称不能超过20个字符",groups = {Add.class}) private String personInCharge; /** diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java index 4dfe1df9b2..1e65306066 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java @@ -60,7 +60,7 @@ public class EditSocietyOrgFormDTO implements Serializable { /** * 负责人 */ - @Length(max = 20, message = "负责人名称不能超过20个字符",groups = {Edit.class}) + //@Length(max = 20, message = "负责人名称不能超过20个字符",groups = {Edit.class}) private String personInCharge; /** * 负责人电话 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java index bf914d42d6..5f0c8bdb79 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java @@ -35,8 +35,8 @@ public class IcSocietyOrgExportExcel { @ExcelProperty(value = "管理员姓名") private String adminStaffName; - @ColumnWidth(30) + /*@ColumnWidth(30) @ExcelProperty(value = "地址") - private String address; + private String address;*/ } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index be5ccf565b..ebbc75615b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -174,13 +174,6 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImplStringUtils.isNotBlank(f.getAdminStaffId())).forEach(r -> listResult.getData().stream().filter(u -> r.getAdminStaffId().equals(u.getStaffId())).forEach(u -> r.setAdminStaffName(u.getStaffName()))); - /* result.getList().forEach(dto1->{ - listResult.getData().forEach(staff->{ - if(dto1.getAdminStaffId().equals(staff.getStaffId())){ - dto1.setAdminStaffName(staff.getStaffName()); - } - }); - });*/ } //3.查询被绑定管理员信息 From 8aa1a5cf149a9b1fb792c437d5e74776ec2d3a23 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 24 Aug 2022 15:20:02 +0800 Subject: [PATCH 40/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6------=E5=AE=A1=E6=A0=B8=E5=89=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcHouseServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 385f90f60d..76df21476b 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 @@ -343,7 +343,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl Date: Wed, 24 Aug 2022 16:37:00 +0800 Subject: [PATCH 41/84] =?UTF-8?q?=E3=80=90=E8=AF=81=E4=BB=B6=E3=80=91fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiUserServiceImpl.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) 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 2ec5c5d783..0f55cab634 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 @@ -631,14 +631,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Wed, 24 Aug 2022 17:45:55 +0800 Subject: [PATCH 42/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6------=E6=B7=BB=E5=8A=A0=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcVaccinePrarmeterDTO.java | 15 ++++++++++++++- .../epmet/entity/IcVaccinePrarmeterEntity.java | 10 ++++++++++ .../com/epmet/excel/IcVaccinePrarmeterExcel.java | 7 +++++++ .../impl/IcVaccinePrarmeterServiceImpl.java | 2 ++ .../resources/mapper/IcVaccinePrarmeterDao.xml | 11 +++++++++-- 5 files changed, 42 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java index 08c5da3ce1..a7d56eeec7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java @@ -90,6 +90,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { * 户口性质：0户籍 1外来 */ private String householdType; + private String householdTypeName; /** * 姓名 @@ -110,6 +111,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { * 是否接种：0否1是 */ private String isVaccination; + private String isVaccinationName; /** * 第一次接种时间 @@ -181,4 +183,15 @@ public class IcVaccinePrarmeterDTO implements Serializable { */ private Date updatedTime; -} \ No newline at end of file + /** + * 审核状态：0待审核 1审核不通过 2审核通过 + */ + private String checkState; + private String checkStateName; + + /** + * 审核理由 + */ + private String checkReason; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java index c5dde0c103..c6b982f80d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java @@ -151,4 +151,14 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { */ private String note; + /** + * 审核状态：0待审核 1审核不通过 2审核通过 + */ + private String checkState; + + /** + * 审核理由 + */ + private String checkReason; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index 02f144d189..01200bb938 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -74,5 +74,12 @@ public class IcVaccinePrarmeterExcel { @Excel(name = "备注") private String note; + @Excel(name = "审核状态", replace = {"待审核_0","审核不通过_1","审核通过_2"}) + private String checkState; + + @Excel(name = "审核理由") + private String checkReason; + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 2f5cdc2a83..44050f3a6e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -190,6 +190,8 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl { // 设置客户ID e.setCustomerId(tokenDto.getCustomerId()); + // 设置审核状态为待审核 + e.setCheckState("0"); }); insertBatch(entities); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index b1eb484110..3441859c38 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -73,7 +73,9 @@ CREATED_BY, CREATED_TIME, UPDATED_BY, - UPDATED_TIME + UPDATED_TIME, + CHECK_STATE, + CHECK_REASON from ic_vaccine_prarmeter where DEL_FLAG = 0 @@ -123,10 +125,12 @@ HOME_ID, HOME_NAME, HOUSEHOLD_TYPE, + (case HOUSEHOLD_TYPE when '0' then '户籍' when '1' then '外来' else '' end) as householdTypeName, NAME, MOBILE, ID_CARD, IS_VACCINATION, + (case IS_VACCINATION when '0' then '否' when '1' then '是' else '' end) as isVaccinationName, FIRST_VAC_TIME, FIRST_VAC_SITE, SECOND_VAC_TIME, @@ -140,7 +144,10 @@ CREATED_BY, CREATED_TIME, UPDATED_BY, - UPDATED_TIME + UPDATED_TIME, + CHECK_STATE, + (case CHECK_STATE when '0' then '待审核' when '1' then '审核不通过' when '2' then '审核通过' else '' end) as checkStateName, + CHECK_REASON from ic_vaccine_prarmeter where DEL_FLAG = 0 From f87604fbb3393e4ea9fd1f9f770be10f95f966eb Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 25 Aug 2022 13:50:30 +0800 Subject: [PATCH 43/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6------=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcVaccinePrarmeterDTO.java | 6 +- .../epmet/dto/form/IcVaccineCheckFormDTO.java | 79 ++++++ .../IcVaccinePrarmeterController.java | 19 +- .../entity/IcVaccinePrarmeterEntity.java | 6 +- .../epmet/excel/IcVaccinePrarmeterExcel.java | 12 +- .../excel/IcVaccinePrarmeterImportExcel.java | 18 +- .../IcVaccinePrarmeterImportErrorModel.java | 14 +- .../service/IcVaccinePrarmeterService.java | 9 + .../impl/IcVaccinePrarmeterServiceImpl.java | 237 +++++++++++++++++- 9 files changed, 365 insertions(+), 35 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java index a7d56eeec7..55991fe87d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java @@ -116,7 +116,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第一次接种时间 */ - private String firstVacTime; + private Date firstVacTime; /** * 第一次接种地点 @@ -126,7 +126,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第二次接种时间 */ - private String secondVacTime; + private Date secondVacTime; /** * 第二次接种地点 @@ -136,7 +136,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第三次接种时间 */ - private String thirdVacTime; + private Date thirdVacTime; /** * 第三次接种地点 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java new file mode 100644 index 0000000000..8edf20194d --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java @@ -0,0 +1,79 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +/** + * 新冠病毒疫苗接种人员信息台账-审核入参 + * + * @author wgf + * @since v1.0.0 2022-08-25 + */ +@Data +public class IcVaccineCheckFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @NotBlank(message = "Id不能为空") + private String id; + + /** + * 审核状态：0待审核 1未通过 2已通过 + */ + @NotBlank(message = "审核状态不能为空") + private String checkState; + + /** + * 审核原因 + */ + private String checkReason; + + /** + * 所属小区ID； + */ + private String villageId; + + /** + * 所属楼宇Id + */ + private String buildId; + + /** + * 单元号 + */ + private String unitId; + + /** + * 房间ID + */ + private String homeId; + + /** + * 房间号 + */ + private String doorName; + + /** + * 客户ID(审核人) + */ + private String customerId; + + /** + * 员工ID(审核人) + */ + private String userId; + + /** + * 员工姓名(审核人) + */ + private String realName; + + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index 9ef386164e..6627be1966 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -19,9 +19,7 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcVaccinePrarmeterDao; import com.epmet.dto.IcPointNucleicMonitoringDTO; import com.epmet.dto.IcVaccinePrarmeterDTO; -import com.epmet.dto.form.ImportTaskCommonFormDTO; -import com.epmet.dto.form.PointHSYMFormDTO; -import com.epmet.dto.form.VaccinePrarmeterListFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.excel.IcPointNucleicMonitoringExcel; import com.epmet.excel.IcVaccinePrarmeterExcel; @@ -173,6 +171,21 @@ public class IcVaccinePrarmeterController { return new Result(); } + /** + * 信息采集-审核 + * @param formDTO + * @param tokenDto + * @return + */ + @PostMapping("vaccineCheck") + public Result vaccineCheck(@RequestBody IcVaccineCheckFormDTO formDTO, @LoginUser TokenDto tokenDto) { + formDTO.setUserId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + icVaccinePrarmeterService.vaccineCheck(formDTO,tokenDto); + + return new Result(); + } + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java index c6b982f80d..e0331229c4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java @@ -114,7 +114,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第一次接种时间 */ - private String firstVacTime; + private Date firstVacTime; /** * 第一次接种地点 @@ -124,7 +124,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第二次接种时间 */ - private String secondVacTime; + private Date secondVacTime; /** * 第二次接种地点 @@ -134,7 +134,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第三次接种时间 */ - private String thirdVacTime; + private Date thirdVacTime; /** * 第三次接种地点 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index 01200bb938..bb6b9c5d15 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -50,20 +50,20 @@ public class IcVaccinePrarmeterExcel { @Excel(name = "是否接种", replace = {"否_0","是_1"}) private String isVaccination; - @Excel(name = "第一次接种时间") - private String firstVacTime; + @Excel(name = "第一次接种时间", format = "yyyy-MM-dd HH:mm:ss") + private Date firstVacTime; @Excel(name = "第一次接种地点") private String firstVacSite; - @Excel(name = "第二次接种时间") - private String secondVacTime; + @Excel(name = "第二次接种时间", format = "yyyy-MM-dd HH:mm:ss") + private Date secondVacTime; @Excel(name = "第二次接种地点") private String secondVacSite; - @Excel(name = "第三次接种时间") - private String thirdVacTime; + @Excel(name = "第三次接种时间", format = "yyyy-MM-dd HH:mm:ss") + private Date thirdVacTime; @Excel(name = "第三次接种地点") private String thirdVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java index 4eb027872b..daecc97e0e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java @@ -4,6 +4,8 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.annotation.ExcelIgnore; import lombok.Data; +import java.util.Date; + /** * 新冠病毒疫苗接种人员信息台账 * @@ -43,20 +45,20 @@ public class IcVaccinePrarmeterImportExcel { @Excel(name = "是否接种", replace = {"否_0","是_1"}) private String isVaccination; - @Excel(name = "第一次接种时间") - private String firstVacTime; + @Excel(name = "第一次接种时间", format = "yyyy-MM-dd HH:mm:ss") + private Date firstVacTime; @Excel(name = "第一次接种地点") private String firstVacSite; - @Excel(name = "第二次接种时间") - private String secondVacTime; + @Excel(name = "第二次接种时间", format = "yyyy-MM-dd HH:mm:ss") + private Date secondVacTime; @Excel(name = "第二次接种地点") private String secondVacSite; - @Excel(name = "第三次接种时间") - private String thirdVacTime; + @Excel(name = "第三次接种时间", format = "yyyy-MM-dd HH:mm:ss") + private Date thirdVacTime; @Excel(name = "第三次接种地点") private String thirdVacSite; @@ -80,10 +82,10 @@ public class IcVaccinePrarmeterImportExcel { private String gridId; /** - * 组织ID上级 + * 组织ID */ @ExcelIgnore - private String pid; + private String agencyId; /** * 组织ID所有上级 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java index f720b878c9..04768bb90e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java @@ -3,6 +3,8 @@ package com.epmet.excel.error; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; +import java.util.Date; + /** * @Author wgf * @DateTime 2022/6/21 16:57 @@ -45,20 +47,20 @@ public class IcVaccinePrarmeterImportErrorModel { @Excel(name = "是否接种", width = 30, replace = {"否_0","是_1"}) private String isVaccination; - @Excel(name = "第一次接种时间",width = 30) - private String firstVacTime; + @Excel(name = "第一次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") + private Date firstVacTime; @Excel(name = "第一次接种地点",width = 30) private String firstVacSite; - @Excel(name = "第二次接种时间",width = 30) - private String secondVacTime; + @Excel(name = "第二次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") + private Date secondVacTime; @Excel(name = "第二次接种地点",width = 30) private String secondVacSite; - @Excel(name = "第三次接种时间",width = 30) - private String thirdVacTime; + @Excel(name = "第三次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") + private Date thirdVacTime; @Excel(name = "第三次接种地点",width = 30) private String thirdVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java index a298a3e165..41137212df 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java @@ -4,6 +4,8 @@ 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.IcVaccinePrarmeterDTO; +import com.epmet.dto.form.IcResiCollectCheckFormDTO; +import com.epmet.dto.form.IcVaccineCheckFormDTO; import com.epmet.entity.IcVaccinePrarmeterEntity; import java.io.InputStream; @@ -93,4 +95,11 @@ public interface IcVaccinePrarmeterService extends BaseService page(Map params) { IPage page = baseDao.selectPage( @@ -279,7 +294,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl userMap = queryOriginUserByHomeId(icResiCollectEntity.getHomeId(),icResiCollectEntity.getCustomerId()); + if(userIdCardEntity != null){ + // 已存在人员 + if(userMap.containsKey(icResiCollectEntity.getIdCard())){ + // 人员房屋一致（只更新人员信息） + updateUserInfo(icResiCollectEntity,false,formDTO,userIdCardEntity); + }else{ + // 人员房屋不一致（更新人员信息和变更记录） + updateUserInfo(icResiCollectEntity,true,formDTO,userIdCardEntity); + } + }else{ + // 不存在人员 + insertUserInfo(icResiCollectEntity,formDTO); + } + } + } + } + + /** + * 更新新冠病毒疫苗接种人员信息台账表房屋ID + * @param icResiCollectEntity + * @param formDTO + * @return + */ + private IcVaccinePrarmeterEntity updateHomeId(IcVaccinePrarmeterEntity icResiCollectEntity,IcVaccineCheckFormDTO formDTO){ + + // fegin获取房屋信息 + GetHouseInfoToCollectFormDTO getHouseInfoToCollectFormDTO = new GetHouseInfoToCollectFormDTO(); + getHouseInfoToCollectFormDTO.setBuildingUnitId(formDTO.getUnitId()); + getHouseInfoToCollectFormDTO.setDoorName(formDTO.getDoorName()); + Result resultDTOResult = govOrgFeignClient.getHouseInfoToCollect(getHouseInfoToCollectFormDTO); + IcHouseInfoCollectResultDTO icHouseInfoCollectResultDTO = resultDTOResult.getData(); + + // 新增房屋后需要collect更新上房屋ID + // log + icResiCollectEntity.setHomeId(icHouseInfoCollectResultDTO.getId()); + baseDao.updateById(icResiCollectEntity); + return icResiCollectEntity; + + } + + /** + * 更新房屋信息 + * @param icResiCollectEntity + */ + private void updateHouseInfo(IcVaccinePrarmeterEntity icResiCollectEntity){ + CollectHouseFormDTO collectHouseFormDTO = new CollectHouseFormDTO(); + collectHouseFormDTO.setId(icResiCollectEntity.getHomeId()); + + + // fegin获取房屋信息 + GetHouseInfoToCollectFormDTO getHouseInfoToCollectFormDTO = new GetHouseInfoToCollectFormDTO(); + getHouseInfoToCollectFormDTO.setBuildingUnitId(icResiCollectEntity.getUnitId()); + getHouseInfoToCollectFormDTO.setDoorName(icResiCollectEntity.getHomeName()); + Result resultDTOResult = govOrgFeignClient.getHouseInfoToCollect(getHouseInfoToCollectFormDTO); + IcHouseInfoCollectResultDTO icHouseInfoCollectResultDTO = resultDTOResult.getData(); + + collectHouseFormDTO.setCustomerId(icResiCollectEntity.getCustomerId()); + collectHouseFormDTO.setResiNumber((icHouseInfoCollectResultDTO.getResiNumber() + 1)); + govOrgFeignClient.updateCollect(collectHouseFormDTO); + + } + + /** + * 获取人员信息 + * @param idCard + * @return + */ + private IcResiUserEntity queryOriginUserByIdCard(String idCard,String customerId) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcResiUserEntity::getIdCard, idCard); + query.eq(IcResiUserEntity::getCustomerId, customerId); + IcResiUserEntity originUser = icResiUserDao.selectOne(query); + return originUser; + } + + private Map queryOriginUserByHomeId(String homeId,String customerId) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcResiUserEntity::getHomeId, homeId); + query.eq(IcResiUserEntity::getCustomerId, customerId); + List originUserList = icResiUserDao.selectList(query); + Map memMap = originUserList.stream().collect(Collectors.toMap(IcResiUserEntity::getIdCard, Function.identity())); + return memMap; + } + + /** + * 更新人员信息 + * @param icResiCollectEntity 登记信息 + * @param isUpdateLog 是否更新记录 + * @param formDTO 入参 + * @param userEntity 根据身份证号查询到的user信息 + */ + private void updateUserInfo(IcVaccinePrarmeterEntity icResiCollectEntity,Boolean isUpdateLog, + IcVaccineCheckFormDTO formDTO,IcResiUserEntity userEntity){ + + userEntity.setPids(icResiCollectEntity.getPids()); // ic_resi_user表的组织的pids 含agencyId本身 + userEntity.setAgencyId(icResiCollectEntity.getAgencyId()); + userEntity.setGridId(icResiCollectEntity.getGridId()); + userEntity.setVillageId(icResiCollectEntity.getVillageId()); + userEntity.setBuildId(icResiCollectEntity.getBuildId()); + userEntity.setUnitId(icResiCollectEntity.getUnitId()); + userEntity.setHomeId(icResiCollectEntity.getHomeId()); + userEntity.setName(icResiCollectEntity.getName()); + userEntity.setMobile(icResiCollectEntity.getMobile()); + userEntity.setIdCard(icResiCollectEntity.getIdCard()); + icResiUserDao.updateById(userEntity); + + // 判断是否需要更新记录 + if(isUpdateLog){ + //变更记录表 + IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity(); + changeRecordEntity.setCustomerId(icResiCollectEntity.getCustomerId()); + changeRecordEntity.setOperatorId(formDTO.getUserId()); + changeRecordEntity.setIcUserId(userEntity.getId()); + changeRecordEntity.setOperatorName(formDTO.getRealName()); + changeRecordEntity.setIcUserName(userEntity.getName()); + changeRecordEntity.setType("update"); + changeRecordEntity.setTypeName("修改"); + changeRecordEntity.setBeforeChangeName("-"); + changeRecordEntity.setAfterChangeName("-"); + changeRecordEntity.setChangeTime(new java.util.Date()); + icUserChangeRecordService.insert(changeRecordEntity); + } + + } + + /** + * 新增人员信息 + * @param icResiCollectEntity + * @param formDTO + */ + private void insertUserInfo(IcVaccinePrarmeterEntity icResiCollectEntity,IcVaccineCheckFormDTO formDTO){ + + // 新增人员 + IcResiUserEntity userEntity = new IcResiUserEntity(); + userEntity.setPids(icResiCollectEntity.getPids()); // ic_resi_user表的组织的pids 含agencyId本身 + userEntity.setAgencyId(icResiCollectEntity.getAgencyId()); + userEntity.setGridId(icResiCollectEntity.getGridId()); + userEntity.setVillageId(icResiCollectEntity.getVillageId()); + userEntity.setBuildId(icResiCollectEntity.getBuildId()); + userEntity.setUnitId(icResiCollectEntity.getUnitId()); + userEntity.setHomeId(icResiCollectEntity.getHomeId()); + userEntity.setName(icResiCollectEntity.getName()); + userEntity.setMobile(icResiCollectEntity.getMobile()); + userEntity.setIdCard(icResiCollectEntity.getIdCard()); + userEntity.setCustomerId(icResiCollectEntity.getCustomerId()); + icResiUserDao.insert(userEntity); + + //变更记录表 + IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity(); + changeRecordEntity.setCustomerId(icResiCollectEntity.getCustomerId()); + changeRecordEntity.setOperatorId(formDTO.getUserId()); + changeRecordEntity.setIcUserId(userEntity.getId()); + changeRecordEntity.setOperatorName(formDTO.getRealName()); + changeRecordEntity.setIcUserName(userEntity.getName()); + changeRecordEntity.setType("add"); + changeRecordEntity.setTypeName("新增"); + changeRecordEntity.setBeforeChangeName("-"); + changeRecordEntity.setAfterChangeName("-"); + changeRecordEntity.setChangeTime(new java.util.Date()); + icUserChangeRecordService.insert(changeRecordEntity); + + } + } From 77872e57f04729755813ef8336aae0031505d896 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 25 Aug 2022 14:48:01 +0800 Subject: [PATCH 44/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcVaccinePrarmeterDTO.java | 6 +++--- .../com/epmet/entity/IcVaccinePrarmeterEntity.java | 6 +++--- .../com/epmet/excel/IcVaccinePrarmeterExcel.java | 10 +++++----- .../epmet/excel/IcVaccinePrarmeterImportExcel.java | 6 +++--- .../error/IcVaccinePrarmeterImportErrorModel.java | 12 ++++++------ .../service/impl/IcVaccinePrarmeterServiceImpl.java | 6 +++--- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java index 55991fe87d..a7d56eeec7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java @@ -116,7 +116,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第一次接种时间 */ - private Date firstVacTime; + private String firstVacTime; /** * 第一次接种地点 @@ -126,7 +126,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第二次接种时间 */ - private Date secondVacTime; + private String secondVacTime; /** * 第二次接种地点 @@ -136,7 +136,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第三次接种时间 */ - private Date thirdVacTime; + private String thirdVacTime; /** * 第三次接种地点 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java index e0331229c4..c6b982f80d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java @@ -114,7 +114,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第一次接种时间 */ - private Date firstVacTime; + private String firstVacTime; /** * 第一次接种地点 @@ -124,7 +124,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第二次接种时间 */ - private Date secondVacTime; + private String secondVacTime; /** * 第二次接种地点 @@ -134,7 +134,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第三次接种时间 */ - private Date thirdVacTime; + private String thirdVacTime; /** * 第三次接种地点 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index bb6b9c5d15..fd95325e80 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -50,20 +50,20 @@ public class IcVaccinePrarmeterExcel { @Excel(name = "是否接种", replace = {"否_0","是_1"}) private String isVaccination; - @Excel(name = "第一次接种时间", format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "第一次接种时间") private Date firstVacTime; @Excel(name = "第一次接种地点") private String firstVacSite; - @Excel(name = "第二次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date secondVacTime; + @Excel(name = "第二次接种时间") + private String secondVacTime; @Excel(name = "第二次接种地点") private String secondVacSite; - @Excel(name = "第三次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date thirdVacTime; + @Excel(name = "第三次接种时间") + private String thirdVacTime; @Excel(name = "第三次接种地点") private String thirdVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java index daecc97e0e..893531a4d2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java @@ -46,19 +46,19 @@ public class IcVaccinePrarmeterImportExcel { private String isVaccination; @Excel(name = "第一次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date firstVacTime; + private String firstVacTime; @Excel(name = "第一次接种地点") private String firstVacSite; @Excel(name = "第二次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date secondVacTime; + private String secondVacTime; @Excel(name = "第二次接种地点") private String secondVacSite; @Excel(name = "第三次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date thirdVacTime; + private String thirdVacTime; @Excel(name = "第三次接种地点") private String thirdVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java index 04768bb90e..7d34af62aa 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java @@ -47,20 +47,20 @@ public class IcVaccinePrarmeterImportErrorModel { @Excel(name = "是否接种", width = 30, replace = {"否_0","是_1"}) private String isVaccination; - @Excel(name = "第一次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") - private Date firstVacTime; + @Excel(name = "第一次接种时间",width = 30) + private String firstVacTime; @Excel(name = "第一次接种地点",width = 30) private String firstVacSite; - @Excel(name = "第二次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") - private Date secondVacTime; + @Excel(name = "第二次接种时间",width = 30) + private String secondVacTime; @Excel(name = "第二次接种地点",width = 30) private String secondVacSite; - @Excel(name = "第三次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") - private Date thirdVacTime; + @Excel(name = "第三次接种时间",width = 30) + private String thirdVacTime; @Excel(name = "第三次接种地点",width = 30) private String thirdVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 28b8c65906..83cb4a4f29 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -294,7 +294,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Thu, 25 Aug 2022 14:50:50 +0800 Subject: [PATCH 45/84] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcVaccinePrarmeterServiceImpl.java | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 83cb4a4f29..b7b681f6d1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -6,8 +6,9 @@ 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.RelationshipEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -17,7 +18,6 @@ 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.constant.FieldConstant; import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constants.ImportTaskConstants; @@ -28,7 +28,6 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.GridInfoByNameResultDTO; import com.epmet.dto.result.IcHouseInfoCollectResultDTO; import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.entity.IcResiCollectEntity; import com.epmet.entity.IcResiUserEntity; import com.epmet.entity.IcUserChangeRecordEntity; import com.epmet.entity.IcVaccinePrarmeterEntity; @@ -48,12 +47,12 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; import org.apache.poi.ss.usermodel.Workbook; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.commons.CommonsMultipartFile; +import javax.annotation.Resource; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -71,22 +70,22 @@ import java.util.stream.Collectors; @Slf4j public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl implements IcVaccinePrarmeterService { - @Autowired + @Resource private IcVaccinePrarmeterRedis icVaccinePrarmeterRedis; - @Autowired + @Resource private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; - @Autowired + @Resource private OssFeignClient ossFeignClient; - @Autowired + @Resource private GovOrgFeignClient govOrgFeignClient; - @Autowired + @Resource private IcResiUserDao icResiUserDao; - @Autowired + @Resource private IcUserChangeRecordService icUserChangeRecordService; @Override @@ -135,7 +134,14 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Thu, 25 Aug 2022 16:13:12 +0800 Subject: [PATCH 46/84] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcVaccinePrarmeterController.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index 6627be1966..5edd0e0749 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -13,18 +13,17 @@ 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.constants.ImportTaskConstants; import com.epmet.dao.IcVaccinePrarmeterDao; -import com.epmet.dto.IcPointNucleicMonitoringDTO; import com.epmet.dto.IcVaccinePrarmeterDTO; -import com.epmet.dto.form.*; +import com.epmet.dto.form.IcVaccineCheckFormDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.form.VaccinePrarmeterListFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; -import com.epmet.excel.IcPointNucleicMonitoringExcel; import com.epmet.excel.IcVaccinePrarmeterExcel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; -import com.epmet.service.IcPointNucleicMonitoringService; import com.epmet.service.IcVaccinePrarmeterService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FilenameUtils; @@ -82,7 +81,7 @@ public class IcVaccinePrarmeterController { } @NoRepeatSubmit - @PutMapping("update") + @PostMapping("update") public Result update(@RequestBody IcVaccinePrarmeterDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); From 3c12af0ee8c9078b25435aec40de41858097322e Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 25 Aug 2022 16:26:46 +0800 Subject: [PATCH 47/84] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=84=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/grid/controller/ResiMineGridController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java index e39bd2182c..c9a2f9996e 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java @@ -7,6 +7,7 @@ import com.epmet.dto.form.LatestGridInfoFormDTO; import com.epmet.dto.result.AllGridsByUserIdResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.modules.grid.service.ResiMineGridService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -63,7 +64,12 @@ public class ResiMineGridController { //formDTO.setAppId(appId); formDTO.setCustomerId(token.getCustomerId()); formDTO.setUserId(token.getUserId()); - return new Result().ok(resiMineGridService.latestGridInfo(formDTO)); + LatestGridInfoResultDTO data = resiMineGridService.latestGridInfo(formDTO); + //todo 兼容 一个老的 等删除这个if就行 + if ((data == null || StringUtils.isBlank(data.getGridId())&&"c2527f3d5cb8958583cc1348c328a784".equals(token.getCustomerId()))){ + return new Result().ok(null); + } + return new Result().ok(data); } /** From 1fb64291c04ba40551d34aeeef28c4e5cf60b315 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 25 Aug 2022 16:27:53 +0800 Subject: [PATCH 48/84] =?UTF-8?q?bugfix=EF=BC=8C=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B7=AF=E7=89=8C=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/IssueDetailResultDTO.java | 2 +- .../src/main/java/com/epmet/service/impl/IssueServiceImpl.java | 2 +- .../src/main/java/com/epmet/dto/form/EditInfoFormDTO.java | 2 +- .../src/main/resources/mapper/UserResiInfoDao.xml | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java index 69ebc4476c..27478b1f63 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java @@ -43,7 +43,7 @@ public class IssueDetailResultDTO implements Serializable { private String belongsGridName; /** - * 议题发起人（山东路168-尹女士） + * 议题发起人（尹女士） */ private String issueInitiator; diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 2156bddd41..2e5a394688 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -106,7 +106,7 @@ public class IssueServiceImpl implements IssueService { //话题发起人 String street = re.getStreet() == null ? "" : re.getStreet() + "-"; String realName = re.getRealName() == null ? "" : re.getRealName(); - issueDetailResult.setIssueInitiator(street + realName); + issueDetailResult.setIssueInitiator(realName); } }); } else { diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java index 6ef7eb715e..5cc4b7ea6a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java @@ -54,7 +54,7 @@ public class EditInfoFormDTO implements Serializable { /** * 路牌号 */ - @NotBlank(message = "路牌号不能为空",groups = AddUserShowGroup.class) +// @NotBlank(message = "路牌号不能为空",groups = AddUserShowGroup.class) private String street; /** * 小区名称 diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml index d308058d06..999b63af7f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml @@ -171,8 +171,6 @@ SELECT CONCAT( - uri.street, - '-', uri.surname, CASE WHEN uw.sex = '1' THEN @@ -154,8 +146,6 @@ END ) AS issueInitiator, CONCAT( - uri.street, - '-', uri.surname, uri.NAME ) AS realUserName @@ -182,8 +172,6 @@ END ) AS issueInitiator, CONCAT( - uri.street, - '-', uri.surname, uri.NAME ) AS realUserName From 2b54859af14f55d5fd7ff2ccd4991728cf748f23 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 25 Aug 2022 16:59:33 +0800 Subject: [PATCH 51/84] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=B7=AF=E7=89=8C?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml | 4 ++-- .../src/main/resources/mapper/user/UserDao.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml index 9ba9386fb3..49dad70cf7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml @@ -7,13 +7,13 @@ SELECT - CONCAT( STREET, '-', SURNAME, CASE WHEN GENDER = '1' THEN '先生' WHEN GENDER = '2' THEN '女士' ELSE '先生/女士' END ) AS linkName, + CONCAT( SURNAME, CASE WHEN GENDER = '1' THEN '先生' WHEN GENDER = '2' THEN '女士' ELSE '先生/女士' END ) AS linkName, MOBILE AS linkMobile, USER_ID as topicId FROM From de4cfa69970f64ca01b90dfa9bbb7d1693a57b31 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 25 Aug 2022 17:01:49 +0800 Subject: [PATCH 52/84] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcVaccinePrarmeterServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 3bbc148588..5858b4b9aa 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -149,7 +149,12 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Thu, 25 Aug 2022 17:14:54 +0800 Subject: [PATCH 53/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/IcVaccineDao.java | 8 + .../com/epmet/dao/IcVaccineRelationDao.java | 6 +- .../impl/IcVaccinePrarmeterServiceImpl.java | 156 ++++++++++++++++-- .../excel/ic_vaccine_prarmeter_excel.xls | Bin 19968 -> 19968 bytes .../main/resources/mapper/IcVaccineDao.xml | 9 + .../resources/mapper/IcVaccineRelationDao.xml | 7 +- 6 files changed, 172 insertions(+), 14 deletions(-) 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 d4db61ad5b..55b4591be3 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 @@ -64,4 +64,12 @@ public interface IcVaccineDao extends BaseDao { IcVaccineDTO getVaccineDTO(@Param("customerId") String customerId, @Param("icVaccineId") String icVaccineId, @Param("idCard") String idCard, @Param("inoculateTime") String inoculateTime); + /** + * 根据身份证号以及接种时间查询接种信息 + * @param idCard + * @param time + * @return + */ + List getVaccineListByIdCard(@Param("idCard") String idCard,@Param("time") String time); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java index 60d80b3f61..6d087a1055 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java @@ -14,4 +14,8 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface IcVaccineRelationDao extends BaseDao { int delRelation(@Param("icVaccineId") String icNatId, @Param("agencyId") String agencyId); -} \ No newline at end of file + + void updateRelationInfoByVaccineId(IcVaccineRelationEntity icVaccineRelationEntity); + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 83cb4a4f29..6c68f85c19 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -22,16 +22,15 @@ import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcResiUserDao; +import com.epmet.dao.IcVaccineDao; import com.epmet.dao.IcVaccinePrarmeterDao; +import com.epmet.dao.IcVaccineRelationDao; import com.epmet.dto.IcVaccinePrarmeterDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.GridInfoByNameResultDTO; import com.epmet.dto.result.IcHouseInfoCollectResultDTO; import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.entity.IcResiCollectEntity; -import com.epmet.entity.IcResiUserEntity; -import com.epmet.entity.IcUserChangeRecordEntity; -import com.epmet.entity.IcVaccinePrarmeterEntity; +import com.epmet.entity.*; import com.epmet.excel.IcVaccinePrarmeterImportExcel; import com.epmet.excel.error.IcVaccinePrarmeterImportErrorModel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; @@ -40,6 +39,7 @@ import com.epmet.feign.OssFeignClient; import com.epmet.redis.IcVaccinePrarmeterRedis; import com.epmet.service.IcUserChangeRecordService; import com.epmet.service.IcVaccinePrarmeterService; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.fileupload.FileItem; @@ -57,6 +57,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.text.SimpleDateFormat; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -89,6 +90,12 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -447,31 +454,31 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl userMap = queryOriginUserByHomeId(icResiCollectEntity.getHomeId(),icResiCollectEntity.getCustomerId()); if(userIdCardEntity != null){ + icResiUserId = userIdCardEntity.getId(); // 已存在人员 if(userMap.containsKey(icResiCollectEntity.getIdCard())){ // 人员房屋一致（只更新人员信息） @@ -482,12 +489,135 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl icVaccineEntityFirstList = icVaccineDao.getVaccineListByIdCard(icResiCollectEntity.getIdCard(),sdf.format(firstDate)); + if(icVaccineEntityFirstList.size() > 0){ + // 更新疫苗接种记录 and 疫苗接种记录关系 + for(IcVaccineEntity entity : icVaccineEntityFirstList){ + updateVaccineInfo(entity,icResiCollectEntity); + + } + + }else{ + // 新增疫苗接种记录 and 疫苗接种记录关系 + insertVaccineInfo(icResiCollectEntity,icResiUserId,firstDate); + + } + + // 查询第二次接种信息 + List icVaccineEntitySecondList = icVaccineDao.getVaccineListByIdCard(icResiCollectEntity.getIdCard(),sdf.format(secondDate)); + if(icVaccineEntitySecondList.size() > 0){ + // 更新疫苗接种记录 and 疫苗接种记录关系 + for(IcVaccineEntity entity : icVaccineEntitySecondList){ + updateVaccineInfo(entity,icResiCollectEntity); + + } + + }else{ + // 新增疫苗接种记录 and 疫苗接种记录关系 + insertVaccineInfo(icResiCollectEntity,icResiUserId,firstDate); + + } + + // 查询第三次接种信息 + List icVaccineEntityThirdList = icVaccineDao.getVaccineListByIdCard(icResiCollectEntity.getIdCard(),sdf.format(thirdDate)); + if(icVaccineEntityThirdList.size() > 0){ + // 更新疫苗接种记录 and 疫苗接种记录关系 + for(IcVaccineEntity entity : icVaccineEntityThirdList){ + updateVaccineInfo(entity,icResiCollectEntity); + + } + + }else{ + // 新增疫苗接种记录 and 疫苗接种记录关系 + insertVaccineInfo(icResiCollectEntity,icResiUserId,firstDate); + + } + } + + /** + * 更新疫苗接种记录 and 疫苗接种记录关系 + * @param entity + * @param icResiCollectEntity + */ + private void updateVaccineInfo(IcVaccineEntity entity,IcVaccinePrarmeterEntity icResiCollectEntity){ + // 更新疫苗接种记录 + entity.setInoculateAddress(icResiCollectEntity.getFirstVacSite()); + entity.setUserType("prarmeter"); + entity.setCustomerId(icResiCollectEntity.getCustomerId()); + icVaccineDao.updateById(entity); + + // 更新疫苗接种记录关系 + IcVaccineRelationEntity icVaccineRelationEntity = new IcVaccineRelationEntity(); + icVaccineRelationEntity.setIcVaccineId(entity.getId()); + icVaccineRelationEntity.setUserType("prarmeter"); + icVaccineRelationEntity.setCustomerId(icResiCollectEntity.getCustomerId()); + icVaccineRelationDao.updateRelationInfoByVaccineId(icVaccineRelationEntity); + + } + + /** + * 新增疫苗接种记录 and 疫苗接种记录关系 + * @param icResiCollectEntity + * @param icResiUserId + * @param time + */ + private void insertVaccineInfo(IcVaccinePrarmeterEntity icResiCollectEntity,String icResiUserId,Date time){ + IcVaccineEntity icVaccineEntity = new IcVaccineEntity(); + icVaccineEntity.setCustomerId(icResiCollectEntity.getCustomerId()); + icVaccineEntity.setName(icResiCollectEntity.getName()); + icVaccineEntity.setMobile(icResiCollectEntity.getMobile()); + icVaccineEntity.setIdCard(icResiCollectEntity.getIdCard()); + icVaccineEntity.setIsResiUser("1"); + icVaccineEntity.setUserType("prarmeter"); + icVaccineEntity.setUserId(icResiUserId); + icVaccineEntity.setInoculateTime(time); + icVaccineEntity.setInoculateAddress(icResiCollectEntity.getFirstVacSite()); + icVaccineDao.insert(icVaccineEntity); + + // 新增关系 + IcVaccineRelationEntity icVaccineRelationEntity = new IcVaccineRelationEntity(); + icVaccineRelationEntity.setCustomerId(icResiCollectEntity.getCustomerId()); + icVaccineRelationEntity.setAgencyId(icResiCollectEntity.getAgencyId()); + icVaccineRelationEntity.setPids(icResiCollectEntity.getPids()); + icVaccineRelationEntity.setIcVaccineId(icVaccineEntity.getId()); + icVaccineRelationEntity.setUserType("prarmeter"); + icVaccineRelationDao.insert(icVaccineRelationEntity); + } + /** * 更新新冠病毒疫苗接种人员信息台账表房屋ID * @param icResiCollectEntity @@ -601,7 +731,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl3ZHAIrZ$6AzHG=Rk;+`?3HuM@5W#2+Px{$$=J9~id`Ia2M_Up{TXiHHMiSp%Kapj zpUDqrau)C)!E!_FTQ!}`$%n-=ap&KxS1=JRL$lOZ^l;fHqR_BM+yA-`|AHPMxS)sf zZa&G1qJclC@T-t=oRcPLLqnt?Ll&vHuzs9PD(A zMn8>9SJ!ABHP4Vw%{LTK3k-$SLPJ#&A9qk%M2bjXSYWj{Ddc3~`c&9Utr*6Yw^N+D zysv8iehGBh@+*tqE!j&q_giDSG^Ia(Jjz=6<<+ttWujiT-`y^k$6d}!uC1*~XYG@N Odv71N5AyW(q4gIUifv{9 delta 777 zcmX|Wq|#7ZM-?lfoO5prN5UMF0mCx|GB*jOckij_qM zMI^-u7IuCtTxsqKOA9MOtSoHwaIq6S}~Tm!7}a@*#9v9Wmf+>ZeKL2 zbB`J{!%=IvhO2z;;20jDg36Np)M&5$zy%b6pes>uf_V`+AVHz|s>$n8PS-hPgIU5o z#gy(ydGN5U&Qc#M7p^TW?yAIKsjfesw6*2m_R#64Hh<<+PYML~km0V-3eS#6lO$V2 z36kWG$dF7-Nm4QtIOm;098ibe&>*MI?gz)Qd1djZz^Ucy_^* zdm5QAQidR%OT>A~K`ye(*V0R!w^E|ogHc9}*t?4n$0)hI(4)fgq!}qp+MpK5zK#y| zp~T-J1+^fS>B=3Uak@6b!=!kH^2Dy7cmtZry0FX5dLbWXQ5+gI&-R-YBbVYoYko8D vR;oHx)i++P@3s8{owPQ8$79&VZpYqQtqoR;9dU;Aa7v6c@ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml index 0ed766fb77..b8113074cf 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml @@ -174,4 +174,13 @@ m.ID_CARD = t.ID_CARD AND m.DEL_FLAG = '0' + + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml index 011c1c7de1..acaf54c95f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml @@ -12,5 +12,10 @@ AND AGENCY_ID = #{agencyId} + + update ic_vaccine_relation + set CUSTOMER_ID = #{customerId},USER_TYPE = #{userType} + where IC_VACCINE_ID = #{icVaccineId} + - \ No newline at end of file + From 14aa8de2daf83adfc9ff82ac843b8a6380321b0b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 25 Aug 2022 17:31:39 +0800 Subject: [PATCH 54/84] =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=8E=A5=E5=88=B0=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 4 ++-- .../main/java/com/epmet/service/impl/IssueServiceImpl.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 48b68b15d5..f7bd3df1be 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -2754,7 +2754,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl{ if(issueResult.getUserId().equals(re.getUserId())){ //话题发起人 - String street = re.getStreet() == null ? "" : re.getStreet() + "-"; String realName = re.getRealName() == null ? "" : re.getRealName(); issueDetailResult.setIssueInitiator(realName); } From 8101b0985bdcbb26eb27d3480086f671a301ca8d Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 25 Aug 2022 17:56:04 +0800 Subject: [PATCH 55/84] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=A1=97=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/group/service/impl/ResiGroupServiceImpl.java | 6 +++--- .../com/epmet/service/impl/UserResiInfoServiceImpl.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 3bb3a435d7..b5aed3822e 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -403,7 +403,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 09:17:35 +0800 Subject: [PATCH 56/84] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=A1=97=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/UserBaseInfoServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index 4cccbd7bf4..7f9b4077d9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -197,13 +197,13 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 09:23:25 +0800 Subject: [PATCH 57/84] =?UTF-8?q?=E4=B8=8D=E5=88=A4=E6=96=AD=E8=A1=97?= =?UTF-8?q?=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index f7bd3df1be..21398d37e4 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -2775,8 +2775,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 09:38:58 +0800 Subject: [PATCH 58/84] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=97=B6=20=E6=B3=A8=E5=86=8C=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E8=A1=A8=20=E8=A1=A5=E5=85=85=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/RegisterRelationServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index bf7f42d6f9..d853d884dc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java @@ -37,10 +37,10 @@ import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.RegisterRelationDTO; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.*; +import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; -import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.entity.RegisterRelationEntity; import com.epmet.entity.UserCustomerEntity; import com.epmet.feign.GovOrgFeignClient; @@ -212,8 +212,14 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl registerRecordWithDiffCustAndGrid = From 814a52507546de50014f9eb331de3273fb7cd5ce Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 26 Aug 2022 09:58:46 +0800 Subject: [PATCH 59/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index d0aef2f917..c87d9d58ac 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -349,7 +349,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 10:13:49 +0800 Subject: [PATCH 60/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6c8b094f67..d08b68a8dc 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 @@ -554,7 +554,7 @@ from ic_house where del_flag = '0' and CUSTOMER_ID = #{customerId} - and BUILDING_UNIT_ID = #{buildingUnitId} + and BUILDING_UNIT_ID = #{unitId} and DOOR_NAME = #{homeName} From 87b66611d6e82e137815e16565439524fa10534a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 26 Aug 2022 10:32:29 +0800 Subject: [PATCH 61/84] =?UTF-8?q?=E6=B8=85=E9=99=A4=E8=A1=97=E9=81=93?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/redis/UserBaseInfoRedis.java | 2 +- .../java/com/epmet/service/impl/UserBaseInfoServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java index 435b99f213..83b08d384e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java @@ -135,7 +135,7 @@ public class UserBaseInfoRedis { && StringUtils.isNotBlank(gridResult.getData().getBelongsGridName())){ String gridFullName = gridResult.getData().getBelongsGridName(); baseInfo.setRegisteredGridName(gridFullName); - StringBuffer buffer = new StringBuffer(gridFullName.split(ModuleConstant.DASH)[NumConstant.ONE]).append(ModuleConstant.DASH).append(baseInfo.getSurname()); + StringBuffer buffer = new StringBuffer(baseInfo.getSurname()); switch (baseInfo.getGender()) { case NumConstant.ONE_STR: buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_MALE); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index 7f9b4077d9..56a5f56400 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -194,7 +194,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 11:10:31 +0800 Subject: [PATCH 62/84] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=A1=97=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/group/service/impl/ResiGroupServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index b5aed3822e..8d502c339d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -1022,10 +1022,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 14:05:09 +0800 Subject: [PATCH 63/84] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E8=A1=97=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/UserResiInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 7ff2a2b5e8..f6395793e7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -176,7 +176,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 14:25:18 +0800 Subject: [PATCH 64/84] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/societyorg_import_template.xlsx | Bin 8928 -> 8977 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/societyorg_import_template.xlsx b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/societyorg_import_template.xlsx index a5562c9247c0f6f5d763faa99fbefc3f2ccd1f07..9ca4a73e2ff45ff4064c93823d38f0441b04667f 100644 GIT binary patch delta 4982 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 delta 4937 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 From d8f8b66ebeb1b3eecb620651c788af079e36cac9 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 26 Aug 2022 14:35:42 +0800 Subject: [PATCH 65/84] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=A1=97=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 21398d37e4..244bec4d5d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -1559,9 +1559,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl{ if(topicInfo.getPublishedUser().equals(re.getUserId())){ //话题发起人 - String street = re.getStreet() == null ? "" : re.getStreet() + "-"; +// String street = re.getStreet() == null ? "" : re.getStreet() + "-"; String realName = re.getRealName() == null ? "" : re.getRealName(); - topicInfo.setPublishedUser(street + realName); + topicInfo.setPublishedUser(realName); } }); } else { From 9063b1542f5d5c0d509596e2642cafec3545f7bb Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 26 Aug 2022 14:52:16 +0800 Subject: [PATCH 66/84] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index ebbc75615b..063064f9cd 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -120,11 +120,11 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl%s", formDTO.getSocietyId())); } + entity = ConvertUtils.sourceToTarget(formDTO, IcSocietyOrgEntity.class); //图片必填 - if(formDTO.getImageList() != null&& StringUtils.isNotBlank(formDTO.getImageList()[0])){ + if(formDTO.getImageList() != null && StringUtils.isNotBlank(formDTO.getImageList()[0])){ entity.setImgUrl(formDTO.getImageList()[0]); } - entity = ConvertUtils.sourceToTarget(formDTO, IcSocietyOrgEntity.class); entity.setId(formDTO.getSocietyId()); baseDao.updateById(entity); } From c69e69b65c6fe206de0f3dcdc610e53d79ee729f Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 26 Aug 2022 15:27:03 +0800 Subject: [PATCH 67/84] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87=20=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/IcSocietyOrgController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java index a5123e155a..1d34519a54 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java @@ -50,6 +50,7 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcSocietyOrgService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.util.CollectionUtils; @@ -79,6 +80,7 @@ import java.util.stream.Collectors; @RestController @RequestMapping("societyorg") public class IcSocietyOrgController implements ResultDataResolver { + private static final String DEFAULT_NO_IMG = "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20220826/38eb186191ab48fe8d3920b642b56e64.png"; @Autowired private IcSocietyOrgService societyOrgService; @@ -115,6 +117,9 @@ public class IcSocietyOrgController implements ResultDataResolver { @RequestMapping("detail/{id}") public Result detail(@LoginUser TokenDto tokenDto, @PathVariable(value = "id") String id) { IcSocietyOrgDTO icSocietyOrgDTO = societyOrgService.get(id); + if (StringUtils.isNotBlank(icSocietyOrgDTO.getImgUrl())){ + icSocietyOrgDTO.setImgUrl(DEFAULT_NO_IMG); + } return new Result().ok(icSocietyOrgDTO); } From ec0a6b1aad5e4c2b10926171af2b36db686dd6cf Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 26 Aug 2022 15:48:30 +0800 Subject: [PATCH 68/84] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87=20=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcSocietyOrgController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java index 1d34519a54..3267ef36bb 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java @@ -117,7 +117,7 @@ public class IcSocietyOrgController implements ResultDataResolver { @RequestMapping("detail/{id}") public Result detail(@LoginUser TokenDto tokenDto, @PathVariable(value = "id") String id) { IcSocietyOrgDTO icSocietyOrgDTO = societyOrgService.get(id); - if (StringUtils.isNotBlank(icSocietyOrgDTO.getImgUrl())){ + if (StringUtils.isBlank(icSocietyOrgDTO.getImgUrl())){ icSocietyOrgDTO.setImgUrl(DEFAULT_NO_IMG); } return new Result().ok(icSocietyOrgDTO); From cc4decc8061b2b9bbbd0ee438038955c9aec4944 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 26 Aug 2022 16:21:34 +0800 Subject: [PATCH 69/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java | 2 +- .../com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java index 8edf20194d..7eb317b62e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineCheckFormDTO.java @@ -57,7 +57,7 @@ public class IcVaccineCheckFormDTO implements Serializable { /** * 房间号 */ - private String doorName; + private String homeName; /** * 客户ID(审核人) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index c87d9d58ac..61f838ec3a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -645,7 +645,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl resultDTOResult = govOrgFeignClient.getHouseInfoToCollect(getHouseInfoToCollectFormDTO); IcHouseInfoCollectResultDTO icHouseInfoCollectResultDTO = resultDTOResult.getData(); From 0030c5e820c17be24de560314af47019d49cc947 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 26 Aug 2022 18:12:14 +0800 Subject: [PATCH 70/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E6=A8=A1=E6=9D=BF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_vaccine_prarmeter_excel.xls | Bin 19968 -> 19968 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls index 903b0091aeef39a3a972f194d0543d61f51e8258..638f6b57bb119a4980f8383bedf910a47422232e 100644 GIT binary patch delta 515 zcmYLFzb`{k6#mY8_qDGS)hZ$uB#1?56Thl{M1){sF^EJIgF(b1k*EZJfIDh1FcVEA zmSQyeI~Z;Z1`FSPtvEN|Ip=-%d*{c^7bIVhyKNQPxeYg_AN8&}bsk2G-|8kUbNXti zspVoAw2&-f3pt)W^y35#=*j4}p~>-gWKai~v{fNwn&};%u#u1oY~F!t6JEo)iL;n1%luh%kmR4O2aDU`1&IpJA3}BwA2We0>%{Ru#?>zqowebhrLZZpn9gS#s_olx zER-arFSE(^8s<%&46H320FBGJO5k!jT*;n^| RYSi<-u9NA<;^b^e{Q?yHPn7@w delta 179 zcmZpe!`Lu~aYGIZ+k}} Date: Fri, 26 Aug 2022 19:19:21 +0800 Subject: [PATCH 71/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E6=A8=A1=E6=9D=BF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/IcVaccinePrarmeterDao.xml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index 3441859c38..7b7b6c4d95 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -88,22 +88,22 @@ and ID_CARD like CONCAT('%', #{idCard}, '%') - and (IS_VACCINATION = #{isVaccination} + and IS_VACCINATION = #{isVaccination} - and (GRID_ID = #{gridId} + and GRID_ID = #{gridId} - and (VILLAGE_ID = #{villageId} + and VILLAGE_ID = #{villageId} - and (BUILD_ID = #{buildId} + and BUILD_ID = #{buildId} - and (UNIT_ID = #{unitId} + and UNIT_ID = #{unitId} - and (HOME_ID = #{homeId} + and HOME_ID = #{homeId} order by CREATED_TIME desc @@ -160,22 +160,22 @@ and ID_CARD like CONCAT('%', #{idCard}, '%') - and (IS_VACCINATION = #{isVaccination} + and IS_VACCINATION = #{isVaccination} - and (GRID_ID = #{gridId} + and GRID_ID = #{gridId} - and (VILLAGE_ID = #{villageId} + and VILLAGE_ID = #{villageId} - and (BUILD_ID = #{buildId} + and BUILD_ID = #{buildId} - and (UNIT_ID = #{unitId} + and UNIT_ID = #{unitId} - and (HOME_ID = #{homeId} + and HOME_ID = #{homeId} order by CREATED_TIME desc From c07a650d80fb618fdb6c2e16edc61401096aa1b6 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 26 Aug 2022 19:20:30 +0800 Subject: [PATCH 72/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E6=A8=A1=E6=9D=BF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcVaccinePrarmeterDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index 7b7b6c4d95..fe457a1225 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -177,6 +177,7 @@ and HOME_ID = #{homeId} + order by CREATED_TIME desc From 49ef464dfccb8d7361150c7efaa4aee66078cd0a Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 26 Aug 2022 20:10:34 +0800 Subject: [PATCH 73/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E6=A8=A1=E6=9D=BF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index fd95325e80..d98e8c5080 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -44,7 +44,7 @@ public class IcVaccinePrarmeterExcel { @Excel(name = "联系电话") private String mobile; - @Excel(name = "身份证号") + @Excel(name = "证件号") private String idCard; @Excel(name = "是否接种", replace = {"否_0","是_1"}) From 893e078818020de765d4b3fded626d23c1e33c78 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 26 Aug 2022 21:13:13 +0800 Subject: [PATCH 74/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6---=E6=A8=A1=E6=9D=BF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/VaccinePrarmeterListFormDTO.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java index 6f77ae6b3b..4fbc71217b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java @@ -26,7 +26,17 @@ public class VaccinePrarmeterListFormDTO extends PageFormDTO implements Serializ private String name; /** - * user所属组织ID + * 证件号 */ - private String orgId; + private String idCard; + + private String isVaccination; + private String gridId; + private String villageId; + private String buildId; + private String unitId; + private String homeId; + + + } From 99b9d0b46d82e8b8a132d64113e5b66bfff5043e Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 29 Aug 2022 10:49:42 +0800 Subject: [PATCH 75/84] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=91=E6=8A=A4=E7=85=A7=E6=AD=A3=E5=88=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=9A8-9=E4=BD=8D=E5=AD=97=E6=AF=8D=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E7=9A=84=E7=BB=84=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/utils/IdCardRegexUtils.java | 4 ++-- .../com/epmet/service/impl/IcResiUserImportServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java index d44e9bb3fb..96d7d02a62 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java @@ -25,7 +25,7 @@ public class IdCardRegexUtils { /** * 9位护照 */ - private static final Pattern PATTERN_9_PASSPORT = Pattern.compile("^[a-zA-Z]{2}\\d{7}$|^[a-zA-Z]{1}\\d{8}$"); + private static final Pattern PATTERN_9_PASSPORT = Pattern.compile("^[a-zA-Z0-9]{8,9}$"); private String inputText; @@ -86,7 +86,7 @@ public class IdCardRegexUtils { } } - if (input.length() == 9) { + if (input.length() == 9 || input.length() == 8) { Matcher matcher = PATTERN_9_PASSPORT.matcher(input); if (matcher.matches()) { return new IdCardRegexUtils(IdCardTypeEnum.PASSPORT, matcher, input); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 3976b304fc..2a57869b36 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -632,7 +632,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res // ================== 数据补充 =================== IdCardRegexUtils regexUtilInstance = IdCardRegexUtils.parse(idCard); if (regexUtilInstance == null) { - String s = "请输入正确的证件号"; + String s = "证件号解析错误，或不支持的证件类型。(请使用身份证号或者护照号)"; throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); } From 70c1645ea19492afda914b0f1d728fd7d174b1c5 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 10:52:59 +0800 Subject: [PATCH 76/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6--bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcVaccinePrarmeterServiceImpl.java | 182 +++++++++--------- 1 file changed, 92 insertions(+), 90 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 61f838ec3a..60c17c8a0e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -455,17 +455,17 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl userMap = queryOriginUserByHomeId(icResiCollectEntity.getHomeId(),icResiCollectEntity.getCustomerId()); + Map userMap = queryOriginUserByHomeId(icVaccinePrarmeterEntity.getHomeId(),icVaccinePrarmeterEntity.getCustomerId()); if(userIdCardEntity != null){ icResiUserId = userIdCardEntity.getId(); // 已存在人员 - if(userMap.containsKey(icResiCollectEntity.getIdCard())){ + if(userMap.containsKey(icVaccinePrarmeterEntity.getIdCard())){ // 人员房屋一致（只更新人员信息） - updateUserInfo(icResiCollectEntity,false,formDTO,userIdCardEntity); + updateUserInfo(icVaccinePrarmeterEntity,false,formDTO,userIdCardEntity); }else{ // 人员房屋不一致（更新人员信息和变更记录） - updateUserInfo(icResiCollectEntity,true,formDTO,userIdCardEntity); + updateUserInfo(icVaccinePrarmeterEntity,true,formDTO,userIdCardEntity); } }else{ // 不存在人员 - icResiUserId = insertUserInfo(icResiCollectEntity,formDTO); + icResiUserId = insertUserInfo(icVaccinePrarmeterEntity,formDTO); } } // 同步接种记录 and 疫苗接种记录关系 - synchronizationVaccineInfo(icResiCollectEntity,icResiUserId); + synchronizationVaccineInfo(icVaccinePrarmeterEntity,icResiUserId); } @@ -518,68 +518,68 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl icVaccineEntityFirstList = icVaccineDao.getVaccineListByIdCard(icResiCollectEntity.getIdCard(),sdf.format(firstDate)); + List icVaccineEntityFirstList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(firstDate)); if(icVaccineEntityFirstList.size() > 0){ // 更新疫苗接种记录 and 疫苗接种记录关系 for(IcVaccineEntity entity : icVaccineEntityFirstList){ - updateVaccineInfo(entity,icResiCollectEntity); + updateVaccineInfo(entity,icVaccinePrarmeterEntity); } }else{ // 新增疫苗接种记录 and 疫苗接种记录关系 - insertVaccineInfo(icResiCollectEntity,icResiUserId,firstDate); + insertVaccineInfo(icVaccinePrarmeterEntity,icResiUserId,firstDate); } // 查询第二次接种信息 - List icVaccineEntitySecondList = icVaccineDao.getVaccineListByIdCard(icResiCollectEntity.getIdCard(),sdf.format(secondDate)); + List icVaccineEntitySecondList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(secondDate)); if(icVaccineEntitySecondList.size() > 0){ // 更新疫苗接种记录 and 疫苗接种记录关系 for(IcVaccineEntity entity : icVaccineEntitySecondList){ - updateVaccineInfo(entity,icResiCollectEntity); + updateVaccineInfo(entity,icVaccinePrarmeterEntity); } }else{ // 新增疫苗接种记录 and 疫苗接种记录关系 - insertVaccineInfo(icResiCollectEntity,icResiUserId,firstDate); + insertVaccineInfo(icVaccinePrarmeterEntity,icResiUserId,firstDate); } // 查询第三次接种信息 - List icVaccineEntityThirdList = icVaccineDao.getVaccineListByIdCard(icResiCollectEntity.getIdCard(),sdf.format(thirdDate)); + List icVaccineEntityThirdList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(thirdDate)); if(icVaccineEntityThirdList.size() > 0){ // 更新疫苗接种记录 and 疫苗接种记录关系 for(IcVaccineEntity entity : icVaccineEntityThirdList){ - updateVaccineInfo(entity,icResiCollectEntity); + updateVaccineInfo(entity,icVaccinePrarmeterEntity); } }else{ // 新增疫苗接种记录 and 疫苗接种记录关系 - insertVaccineInfo(icResiCollectEntity,icResiUserId,firstDate); + insertVaccineInfo(icVaccinePrarmeterEntity,icResiUserId,firstDate); } } @@ -587,48 +587,48 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl resultDTOResult = govOrgFeignClient.getHouseInfoToCollect(getHouseInfoToCollectFormDTO); IcHouseInfoCollectResultDTO icHouseInfoCollectResultDTO = resultDTOResult.getData(); - collectHouseFormDTO.setCustomerId(icResiCollectEntity.getCustomerId()); + collectHouseFormDTO.setCustomerId(icVaccinePrarmeterEntity.getCustomerId()); collectHouseFormDTO.setResiNumber((icHouseInfoCollectResultDTO.getResiNumber() + 1)); + collectHouseFormDTO.setRentFlag(icHouseInfoCollectResultDTO.getRentFlag()); + collectHouseFormDTO.setOwnerName(icHouseInfoCollectResultDTO.getOwnerName()); govOrgFeignClient.updateCollect(collectHouseFormDTO); } @@ -703,31 +705,31 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Mon, 29 Aug 2022 12:41:01 +0800 Subject: [PATCH 77/84] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=91=E6=8A=A4=E7=85=A7=EF=BC=8C=E6=8E=A9=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/processor/MaskProcessor.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 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 24bce5bff3..11b5c5ce4f 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 @@ -161,12 +161,15 @@ public class MaskProcessor { return originString.replaceAll("^(\\d{10})\\d+([a-zA-Z0-9]{2})$", new StringBuilder("$1").append(maskStr).append("$2").toString()); } else if (regexUtil.getTypeEnum() == IdCardTypeEnum.PASSPORT) { // 护照，前两位，后两位为明文，其他* - String maskStr = StrUtil.repeatByLength("*", originString.length() - 4); - return originString.replaceAll("^([a-zA-Z0-9]{2})\\d+(\\d{2})$", new StringBuilder("$1").append(maskStr).append("$2").toString()); - } else { - // 其他情况，不码 - return originString; + int clearLength = 4; + int maskedLength = 0; + if ((maskedLength = originString.length() - clearLength) > 0) { + String maskStr = StrUtil.repeatByLength("*", maskedLength); + return originString.replaceAll("^([a-zA-Z0-9]{2})[a-zA-Z0-9]+([a-zA-Z0-9]{2})$", new StringBuilder("$1").append(maskStr).append("$2").toString()); + } } + + return originString; } /** From aa016f922247159480e49e851824c73a8d53f051 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 14:26:24 +0800 Subject: [PATCH 78/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6--bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/HouseServiceImpl.java | 4 ++- .../impl/IcVaccinePrarmeterServiceImpl.java | 29 +++++++++++++------ 2 files changed, 23 insertions(+), 10 deletions(-) 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 e8de32ecce..933a07daeb 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 @@ -264,8 +264,10 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { houseChangeRecordCollect(formDTO.getId(), formDTO.getCustomerId(), icHouseDTO); icHouseDao.updateById(entity); + IcHouseDTO houseDTO = icHouseService.get(formDTO.getId()); + //删除房屋缓存 - icHouseRedis.delHouseInfo(formDTO.getId(), entity.getCustomerId()); + icHouseRedis.delHouseInfo(formDTO.getId(), houseDTO.getCustomerId()); } /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 60c17c8a0e..89dc8a65de 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -523,21 +523,18 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl icVaccineEntityFirstList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(firstDate)); if(icVaccineEntityFirstList.size() > 0){ @@ -553,6 +550,13 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl icVaccineEntitySecondList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(secondDate)); if(icVaccineEntitySecondList.size() > 0){ @@ -568,6 +572,13 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl icVaccineEntityThirdList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(thirdDate)); if(icVaccineEntityThirdList.size() > 0){ From 028105a50cb0719fefd9b54a78200b29e055dbf6 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 14:56:39 +0800 Subject: [PATCH 79/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6--bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/IcVaccinePrarmeterController.java | 2 ++ .../src/main/resources/mapper/IcVaccinePrarmeterDao.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index 5edd0e0749..674686ca73 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -2,6 +2,7 @@ package com.epmet.controller; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; 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.dto.form.PageFormDTO; import com.epmet.commons.tools.exception.EpmetException; @@ -59,6 +60,7 @@ public class IcVaccinePrarmeterController { private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; @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 = icVaccinePrarmeterService.page(params); PageData page = icVaccinePrarmeterService.getPhrasePage(params); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index fe457a1225..b06633761b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -127,8 +127,8 @@ HOUSEHOLD_TYPE, (case HOUSEHOLD_TYPE when '0' then '户籍' when '1' then '外来' else '' end) as householdTypeName, NAME, - MOBILE, - ID_CARD, + CONCAT(LEFT(MOBILE,3),'****',RIGHT(MOBILE ,4)) as MOBILE, + CONCAT(LEFT(ID_CARD,6),'********',RIGHT(ID_CARD ,4)) as ID_CARD, IS_VACCINATION, (case IS_VACCINATION when '0' then '否' when '1' then '是' else '' end) as isVaccinationName, FIRST_VAC_TIME, From ed7abb7ea52c27f502e8420bd367058f04a1be43 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 16:27:20 +0800 Subject: [PATCH 80/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6--bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/CustomerAgencyDao.xml | 1 + .../form/GridInfoVaccinePrarmeterFormDTO.java | 5 +++++ .../epmet/excel/IcVaccinePrarmeterExcel.java | 2 +- .../impl/IcVaccinePrarmeterServiceImpl.java | 21 +++++++++++++++++++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 42cb8d69dc..8493df5d81 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -926,6 +926,7 @@ from customer_grid where DEL_FLAG = '0' and GRID_NAME = #{gridName} + and PID = #{agencyId} and CUSTOMER_ID = #{customerId} limit 1 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GridInfoVaccinePrarmeterFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GridInfoVaccinePrarmeterFormDTO.java index c218212f37..18e124e529 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GridInfoVaccinePrarmeterFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GridInfoVaccinePrarmeterFormDTO.java @@ -26,6 +26,11 @@ public class GridInfoVaccinePrarmeterFormDTO implements Serializable { */ private String gridName; + /** + * 当前登录人组织ID + */ + private String agencyId; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index d98e8c5080..06cb0b9e15 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -51,7 +51,7 @@ public class IcVaccinePrarmeterExcel { private String isVaccination; @Excel(name = "第一次接种时间") - private Date firstVacTime; + private String firstVacTime; @Excel(name = "第一次接种地点") private String firstVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 89dc8a65de..79a65aa263 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -8,10 +8,12 @@ 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.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; 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.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; @@ -30,6 +32,7 @@ import com.epmet.dto.IcVaccinePrarmeterDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.GridInfoByNameResultDTO; import com.epmet.dto.result.IcHouseInfoCollectResultDTO; +import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.entity.*; import com.epmet.entity.IcResiUserEntity; @@ -38,6 +41,7 @@ import com.epmet.entity.IcVaccinePrarmeterEntity; import com.epmet.excel.IcVaccinePrarmeterImportExcel; import com.epmet.excel.error.IcVaccinePrarmeterImportErrorModel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgFeignClient; import com.epmet.feign.OssFeignClient; import com.epmet.redis.IcVaccinePrarmeterRedis; @@ -52,6 +56,7 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; import org.apache.poi.ss.usermodel.Workbook; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -100,6 +105,12 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -252,6 +263,15 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl list, List errorInfo, TokenDto tokenDto){ + LoginUserDetailsFormDTO form = new LoginUserDetailsFormDTO(); + form.setUserId(tokenDto.getUserId()); + form.setClient(tokenDto.getClient()); + form.setApp(tokenDto.getApp()); + LoginUserDetailsResultDTO userDetailsResultDTO = resultDataResolver.getResultDataOrThrowsException(userOpenFeignClient.getLoginUserDetails(form), ServiceConstant.EPMET_USER_SERVER, + EpmetErrorCode.SERVER_ERROR.getCode(), + "获取当前登录人组织id失败", + null); + for (int i = 0; i < list.size(); i++) { list.get(i).setNum(i+1); if (StringUtils.isBlank(list.get(i).getGridName()) && !list.get(i).getAddStatus()){ @@ -353,6 +373,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl resultDTOResult = govOrgFeignClient.getGridInfoByGridName(formDTO); GridInfoByNameResultDTO gridInfoByNameResultDTO = resultDTOResult.getData(); if(gridInfoByNameResultDTO == null && !list.get(i).getAddStatus()){ From a7692bf393888db483adca51757acaa072a316bc Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 16:50:53 +0800 Subject: [PATCH 81/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6--bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V0.0.67__add_ic_vaccine_prarmeter.sql | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.67__add_ic_vaccine_prarmeter.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.67__add_ic_vaccine_prarmeter.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.67__add_ic_vaccine_prarmeter.sql new file mode 100644 index 0000000000..f009d72b0a --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.67__add_ic_vaccine_prarmeter.sql @@ -0,0 +1,38 @@ +CREATE TABLE `ic_vaccine_prarmeter` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id customer.id', + `GRID_ID` varchar(64) DEFAULT NULL COMMENT '网格ID', + `GRID_NAME` varchar(255) DEFAULT NULL COMMENT '网格名称', + `AGENCY_ID` varchar(64) DEFAULT NULL COMMENT '组织Id', + `PIDS` varchar(255) DEFAULT NULL COMMENT '组织的pids', + `VILLAGE_ID` varchar(64) DEFAULT NULL COMMENT '所属小区ID；', + `VILLAGE_NAME` varchar(64) DEFAULT NULL COMMENT '所属小区名称', + `BUILD_ID` varchar(64) DEFAULT NULL COMMENT '所属楼宇Id', + `BUILD_NAME` varchar(64) DEFAULT NULL COMMENT '所属楼宇名称', + `UNIT_ID` varchar(64) DEFAULT NULL COMMENT '单元id', + `UNIT_NAME` varchar(64) DEFAULT NULL COMMENT '单元名', + `HOME_ID` varchar(64) DEFAULT NULL COMMENT '所属家庭Id', + `HOME_NAME` varchar(64) DEFAULT NULL COMMENT '房间名', + `HOUSEHOLD_TYPE` varchar(255) DEFAULT NULL COMMENT '户口性质：0户籍 1外来', + `NAME` varchar(64) NOT NULL COMMENT '姓名', + `MOBILE` varchar(15) DEFAULT NULL COMMENT '联系电话', + `ID_CARD` varchar(18) NOT NULL COMMENT '身份证号', + `IS_VACCINATION` varchar(1) DEFAULT NULL COMMENT '是否接种：0否1是', + `FIRST_VAC_TIME` varchar(64) DEFAULT NULL COMMENT '第一次接种时间', + `FIRST_VAC_SITE` varchar(10) DEFAULT NULL COMMENT '第一次接种地点', + `SECOND_VAC_TIME` varchar(64) DEFAULT NULL COMMENT '第二次接种时间', + `SECOND_VAC_SITE` varchar(10) DEFAULT NULL COMMENT '第二次接种地点', + `THIRD_VAC_TIME` varchar(64) DEFAULT NULL COMMENT '第三次接种时间', + `THIRD_VAC_SITE` varchar(10) DEFAULT NULL COMMENT '第三次接种地点', + `REASON` varchar(255) DEFAULT NULL COMMENT '原因：禁忌症/拒绝接种/其他原因', + `NOTE` varchar(255) 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 '更新时间', + `CHECK_STATE` varchar(1) DEFAULT NULL COMMENT '审核状态：0待审核 1审核不通过 2审核通过', + `CHECK_REASON` varchar(255) DEFAULT NULL COMMENT '审核理由', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='新冠病毒疫苗接种人员信息台账'; From efa3cc002e577d99990539d769bf5b6bc54d64a0 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 16:57:21 +0800 Subject: [PATCH 82/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6--bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_vaccine_prarmeter_excel.xls | Bin 19968 -> 20480 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls index 638f6b57bb119a4980f8383bedf910a47422232e..52b29028aec920e29760ecac68f74fe93bb8a511 100644 GIT binary patch delta 430 zcmZpe!`QHZae@t_(nj0kjEt(2S(&N@6&V;9{{8>|AB0taY_-k3O!rBZgK65r);1FIc(; z1u*b4FnsU;DPdsypa7zH7#Ns=6cZ3LLNSOB1I`TGA0&XBMn*>l29EuV0t^BS2N)fI z?Ej1$3>*xTgRR~$7EgAtHfHLzm>l5rX>+=b2@@mJyzW?wKGbaBgB0VqgJ^LIB87Al^Pk{mB>YMJLNT$WFdsZ_bzr z;zbw(WyB>Ib<)E-f+w^FE=@jL$-rP0+!|OGc+C$a1``pB1c?}gTLnWzKt5(<`2U|9 x=l~GS%fJh!`GKLckI@-q_~rnI4a}1jd>;Vu{7o*ltgMrsnY8ZS?BuzR1pukXYM=lB delta 324 zcmZozz}PT{ae@t_;zrx!jEpLiS(&PN|NZ~}AB2?|7#LJHPh`qxoS48ei6w`#U_HB- z$<7;$N|Q@jnwhrQZvMrx)P&J{@&Ze7$$3^l)eLNm!3-G;sX$o5V8qbMAi|(E`GTdZ zoecv&1H%UskP-&A4-!C~ zu{LI^w3vL+>C@(F8xtl*#>pG(yn*B&J8fkFpcZx@76f9T$spDT5E;wh#vsZd1at`F zWH0+XU3LbLN=BesAWL8-$a>CAj6w`7AjMz+att#N?_)Hc?C&5tS=T{v@)LVwMrROj Z^F@aZ%$wY7Sy{g=5jEMl*~xn!3jk(aNZbGb From bb9b4f3ff53f22120f6f6e314b57deb3f219dad5 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 29 Aug 2022 17:24:29 +0800 Subject: [PATCH 83/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcVaccinePrarmeterServiceImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 79a65aa263..a5600b7f77 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -79,7 +79,7 @@ import java.util.stream.Collectors; */ @Service @Slf4j -public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl implements IcVaccinePrarmeterService { +public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl implements IcVaccinePrarmeterService,ResultDataResolver { @Resource private IcVaccinePrarmeterRedis icVaccinePrarmeterRedis; @@ -108,8 +108,6 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl page(Map params) { @@ -267,7 +265,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl Date: Mon, 29 Aug 2022 18:11:44 +0800 Subject: [PATCH 84/84] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/IcVaccinePrarmeterImportExcel.java | 2 +- .../IcVaccinePrarmeterImportErrorModel.java | 2 +- .../impl/IcVaccinePrarmeterServiceImpl.java | 2 +- .../excel/ic_vaccine_prarmeter_excel.xls | Bin 20480 -> 19968 bytes 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java index 893531a4d2..3d9ed7a6a7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java @@ -39,7 +39,7 @@ public class IcVaccinePrarmeterImportExcel { @Excel(name = "联系电话") private String mobile; - @Excel(name = "身份证号") + @Excel(name = "证件号") private String idCard; @Excel(name = "是否接种", replace = {"否_0","是_1"}) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java index 7d34af62aa..8cce05d852 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java @@ -41,7 +41,7 @@ public class IcVaccinePrarmeterImportErrorModel { @Excel(name = "联系电话",width = 30) private String mobile; - @Excel(name = "身份证号",width = 30) + @Excel(name = "证件号",width = 30) private String idCard; @Excel(name = "是否接种", width = 30, replace = {"否_0","是_1"}) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index a5600b7f77..08e03f063f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -303,7 +303,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl5TQC;K~yPS$l$WON3zE;{H>eq?Vt+0P++ XlcNXACO2DF7M(vl{hJ-V_p<;1j5p_9f|jrlRLXato)htfe@6od*6(Jl@u8afn3 zawj2!gHBHMErLUIa!n?k9lGdnaTGP4`;0x0^SBZ8Cex*aFt+{x2~9AEC!$Z=5I6rG2SxFbQO{$m3c1