From ca15b91c9150eb4666ab2f2e1254c8f6a2e609a3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 7 Apr 2022 10:35:52 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=88=9D=E5=A7=8B=E5=8C=96=E6=98=8E=E5=A4=A9=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/task/WorkDayInitTask.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java index 45f2a8de7f..b1e6673044 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java @@ -1,5 +1,6 @@ package com.epmet.task; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.service.WorkDayInitService; @@ -27,7 +28,8 @@ public class WorkDayInitTask implements ITask { public void run(String params) { log.info("WorkDayInitTask定时任务正在执行，参数为：{}", params); if (StringUtils.isBlank(params)){ - params = DateUtils.format(new Date(),DateUtils.DATE_PATTERN_YYYYMMDD); + //没有参数默认 初始化明天的 + params = DateUtils.format(DateUtils.addDateDays(new Date(), NumConstant.ONE),DateUtils.DATE_PATTERN_YYYYMMDD); } Result result = workDayInitService.workDayInit(params); if (result.success()) { From 1cda42a52b2536180bbb5a96a459a68235646084 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 7 Apr 2022 10:46:07 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=88=9D=E5=A7=8B=E5=8C=96=E6=98=8E=E5=A4=A9=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ShowApiServiceImpl.java | 43 ++++++++++--------- .../java/com/epmet/utils/ShowApiUtil.java | 8 +++- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java index 369c0b9753..7d2aadcc2d 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java @@ -128,34 +128,37 @@ public class ShowApiServiceImpl implements ShowApiService { DayDetailResultDTO dayDetailResultDTO = null; try { dayDetailResultDTO = ShowApiUtil.queryHolidayV2020(currentDate); + if (dayDetailResultDTO == null){ + logger.warn("initWorkDay howApiUtil.queryHolidayV2020 return null"); + return; + } } catch (Exception e) { logger.error("queryHolidayV2020 exception", e); return; } List list = calenderDao.selectByDay(currentDate); if(null!=list&&list.size()>0){ - if (0 == dayDetailResultDTO.getRet_code()) { - for (CalenderEntity calenderEntity : list) { - calenderEntity.setRetCode(dayDetailResultDTO.getRet_code()); - calenderEntity.setWeekday(dayDetailResultDTO.getWeekDay()); - calenderEntity.setBegin(dayDetailResultDTO.getBegin()); - calenderEntity.setEnd(dayDetailResultDTO.getEnd()); - calenderEntity.setHoliday(dayDetailResultDTO.getHoliday()); - calenderEntity.setHolidayRemark(dayDetailResultDTO.getHoliday_remark()); - calenderEntity.setEn(dayDetailResultDTO.getEn()); - calenderEntity.setCn(dayDetailResultDTO.getCn()); - calenderEntity.setType(dayDetailResultDTO.getType()); - //1为工作日，2为周末，3为节假日 - if ("1".equals(dayDetailResultDTO.getType())) { - calenderEntity.setTypeName("工作日"); - } else if ("2".equals(dayDetailResultDTO.getType())) { - calenderEntity.setTypeName("周末"); - } else if ("3".equals(dayDetailResultDTO.getType())) { - calenderEntity.setTypeName("节假日"); - } - calenderDao.updateById(calenderEntity); + for (CalenderEntity calenderEntity : list) { + calenderEntity.setRetCode(dayDetailResultDTO.getRet_code()); + calenderEntity.setWeekday(dayDetailResultDTO.getWeekDay()); + calenderEntity.setBegin(dayDetailResultDTO.getBegin()); + calenderEntity.setEnd(dayDetailResultDTO.getEnd()); + calenderEntity.setHoliday(dayDetailResultDTO.getHoliday()); + calenderEntity.setHolidayRemark(dayDetailResultDTO.getHoliday_remark()); + calenderEntity.setEn(dayDetailResultDTO.getEn()); + calenderEntity.setCn(dayDetailResultDTO.getCn()); + calenderEntity.setType(dayDetailResultDTO.getType()); + //1为工作日，2为周末，3为节假日 + if ("1".equals(dayDetailResultDTO.getType())) { + calenderEntity.setTypeName("工作日"); + } else if ("2".equals(dayDetailResultDTO.getType())) { + calenderEntity.setTypeName("周末"); + } else if ("3".equals(dayDetailResultDTO.getType())) { + calenderEntity.setTypeName("节假日"); } + calenderDao.updateById(calenderEntity); } + }else { calenderDao.insert(getCalenderEntity(dayDetailResultDTO)); } diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/ShowApiUtil.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/ShowApiUtil.java index ad097e5c7c..6b9052cbcb 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/ShowApiUtil.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/ShowApiUtil.java @@ -1,10 +1,13 @@ package com.epmet.utils; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.constant.ShowApiConstant; import com.epmet.result.DayDetailResultDTO; import com.epmet.result.HolidayResultDTO; import com.epmet.result.ShowApiResult; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,7 +54,10 @@ public class ShowApiUtil { JSONObject jsonobject = JSONObject.parseObject(resultStr); ShowApiResult showApiResult= JSONObject.toJavaObject(jsonobject, ShowApiResult.class); logger.info(showApiResult.toString()); - + if (showApiResult.getShowapi_res_code() != NumConstant.ZERO || StringUtils.isBlank(showApiResult.getShowapi_res_body())) { + logger.error("获取工作日失败,result:{}", JSON.toJSONString(showApiResult)); + return null; + } JSONObject holidayJsonObject = JSONObject.parseObject(showApiResult.getShowapi_res_body()); DayDetailResultDTO dayDetailResultDTO= JSONObject.toJavaObject(holidayJsonObject, DayDetailResultDTO.class); logger.info(String.format("(3)QUERY_HOLIDAY_V2020返参:%s",dayDetailResultDTO.toString())); From a270c45bff057427b8347e4cca664d24e62f076f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 7 Apr 2022 11:05:37 +0800 Subject: [PATCH 03/20] commonservice/areacode/areacodedicttree --- .../epmet/dto/form/AreaCodeDictFormDTO.java | 1 + .../java/com/epmet/dao/AreaCodeChildDao.java | 2 +- .../service/impl/AreaCodeServiceImpl.java | 22 +++++++++---------- .../resources/mapper/AreaCodeChildDao.xml | 4 +++- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AreaCodeDictFormDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AreaCodeDictFormDTO.java index 4340d4d015..47d915cd4c 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AreaCodeDictFormDTO.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AreaCodeDictFormDTO.java @@ -13,6 +13,7 @@ public class AreaCodeDictFormDTO implements Serializable { private static final long serialVersionUID = 5780301376757138238L; + //平阴传参：rootAreaCode=370124, rootAreaLevel=district /** * 根结点code 不传，则返回全部 */ diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeChildDao.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeChildDao.java index 24339f6397..169449fc2f 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeChildDao.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeChildDao.java @@ -34,7 +34,7 @@ import java.util.List; @Mapper public interface AreaCodeChildDao extends BaseDao { - List selectAllChild(); + List selectAllChild(String areaCode); AreaCodeChildDTO selectByCode(@Param("code") String code); diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java index 6f4ad9f000..4d873b333e 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java @@ -137,7 +137,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl areaCodeDictResultDTOS = disposeTree(); + List areaCodeDictResultDTOS = disposeTree(formDTO); areaCodeRedis.set(AreaCodeConstant.SCREEN_TREE,areaCodeDictResultDTOS); tree = areaCodeDictResultDTOS; } @@ -154,11 +154,11 @@ public class AreaCodeServiceImpl extends BaseServiceImpl disposeTree(){ + public List disposeTree(AreaCodeDictFormDTO formDTO){ // 查询所有省市区 List areaCodeDTOS = baseDao.selectAllArea(); // 查询所有街道、社区 - List areaCodeChildDTOS = childDao.selectAllChild(); + List areaCodeChildDTOS = childDao.selectAllChild(formDTO.getRootAreaCode()); List result = new ArrayList<>(); List fourResult = new ArrayList<>(); List cityResult = new ArrayList<>(); @@ -388,21 +388,21 @@ public class AreaCodeServiceImpl extends BaseServiceImpl afterTwoTree(){ + public List afterTwoTree(AreaCodeDictFormDTO form){ // 查询所有街道、社区 - List areaCodeChildDTOS = childDao.selectAllChild(); + List areaCodeChildDTOS = childDao.selectAllChild(form.getRootAreaCode()); List fourResult = new ArrayList<>(); List fiveResult = new ArrayList<>(); // 街道-社区 Map> groupByLevel = areaCodeChildDTOS.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getLevel)); //社区 - List levelFive = groupByLevel.get(NumConstant.FIVE); - Map> groupByPCode = levelFive.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getPCode)); + List levelFive = org.apache.commons.collections4.CollectionUtils.isNotEmpty(groupByLevel.get(NumConstant.FIVE)) ? groupByLevel.get(NumConstant.FIVE) : new ArrayList<>(); + Map> groupByPCode = CollectionUtils.isEmpty(levelFive) ? new HashMap<>() : levelFive.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getPCode)); //街道 - List levelFour = groupByLevel.get(NumConstant.FOUR); + List levelFour = org.apache.commons.collections4.CollectionUtils.isNotEmpty(groupByLevel.get(NumConstant.FOUR)) ?groupByLevel.get(NumConstant.FOUR):new ArrayList<>(); // 6级 List levelSix = groupByLevel.get(NumConstant.SIX); - Map> groupBySixPCode = levelSix.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getPCode)); + Map> groupBySixPCode = CollectionUtils.isEmpty(levelSix) ? new HashMap<>() : levelSix.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getPCode)); levelFive.forEach(f -> { AreaCodeDictResultDTO dto = new AreaCodeDictResultDTO(); @@ -450,7 +450,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl disposeAfterTwoLevel(AreaCodeDictFormDTO form){ List result = new ArrayList<>(); - List areaCodeDictResultDTOS = afterTwoTree(); + List areaCodeDictResultDTOS = afterTwoTree(form); if (CollectionUtils.isEmpty(areaCodeDictResultDTOS)){ return new ArrayList<>(); } @@ -532,7 +532,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl disposeBeforeThreeLevelFinal(AreaCodeDictFormDTO form,List tree){ List threeDto = disposeBeforeThreeLevel(form, tree); - List twoDto = afterTwoTree(); + List twoDto = afterTwoTree(form); if (CollectionUtils.isEmpty(threeDto)){ return new ArrayList<>(); } diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml index c918bb7702..34877f6c08 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml +++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml @@ -5,7 +5,9 @@ From 347a4b10a9eb9eb013bc80827c23c1f7a8311879 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 7 Apr 2022 16:35:29 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9org=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=9A=84=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E9=99=90=E5=88=B6?= =?UTF-8?q?=E4=B8=BA100M?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/src/main/resources/bootstrap.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml index c3883055da..1fda630da8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml @@ -79,6 +79,12 @@ spring: namespace: @nacos.config.namespace@ group: @nacos.config.group@ file-extension: yaml + servlet: +# 上传文件限制 + multipart: + max-file-size: 100MB + max-request-size: 100MB + management: endpoints: web: From ca4e5bcd426d43ef0343de7311b8daec7db45892 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 7 Apr 2022 17:25:55 +0800 Subject: [PATCH 10/20] - --- .../gov-org/gov-org-server/src/main/resources/bootstrap.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml index 1fda630da8..5a6a066a1b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml @@ -79,6 +79,7 @@ spring: namespace: @nacos.config.namespace@ group: @nacos.config.group@ file-extension: yaml + servlet: # 上传文件限制 multipart: From 839eb5403e4fecd676d9618f95826a8ade7307e5 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 7 Apr 2022 17:57:38 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E9=98=B2=E7=96=AB=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/EpidemicPreventionFormDTO.java | 1 + .../com/epmet/controller/IcEpidemicPreventionController.java | 1 + .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 4 ++++ .../src/main/resources/mapper/IcResiUserDao.xml | 1 + 4 files changed, 7 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java index 83d22c6a13..345d7496b0 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java @@ -28,6 +28,7 @@ public class EpidemicPreventionFormDTO extends PageFormDTO implements Serializab * 网格ID */ private String gridId; + private String staffId; /** * 小区ID */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java index de3612756d..507aea1a65 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java @@ -60,6 +60,7 @@ public class IcEpidemicPreventionController{ @PostMapping("page") public Result> search(@LoginUser TokenDto tokenDto, @RequestBody EpidemicPreventionFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); PageData result = icResiUserService.epidemicPreventionList(formDTO); return new Result>().ok(result); } 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 57547b226e..c5f39ab387 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 @@ -1250,6 +1250,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl epidemicPreventionList(EpidemicPreventionFormDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null != staffInfo) { + formDTO.setAgencyId(staffInfo.getAgencyId()); + } PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); List list = baseDao.getEpidemicPreventionList(formDTO); PageInfo pageInfo = new PageInfo<>(list); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index a38f1ae5df..416d423a37 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -680,6 +680,7 @@ GROUP BY ID_CARD ) c ON a.ID_CARD = c.ID_CARD WHERE a.DEL_FLAG = '0' + AND a.`STATUS` = '0' AND a.CUSTOMER_ID = #{customerId} From 8d489bc0e5ea07099fa0a69e5b06e696fb33e9df Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 7 Apr 2022 21:08:38 +0800 Subject: [PATCH 12/20] =?UTF-8?q?entity=E7=9A=84customer=5Fid=E8=A6=81?= =?UTF-8?q?=E8=AE=B0=E5=BE=97=E5=8A=A0@TableField=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/entity/IcVaccineRelationEntity.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java index b20ce6dc69..0c1b6c88ac 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java @@ -1,5 +1,7 @@ package com.epmet.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.epmet.commons.mybatis.entity.BaseEpmetEntity; @@ -24,6 +26,7 @@ public class IcVaccineRelationEntity extends BaseEpmetEntity { /** * 客户Id */ + @TableField(fill = FieldFill.INSERT) private String customerId; /** From 9121ccc52fe39e7ac591ddf97b0eb995940da4e5 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 7 Apr 2022 21:37:51 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E8=A7=A3=E5=86=B3service=E5=90=8C?= =?UTF-8?q?=E7=BA=A7=E5=BE=AA=E7=8E=AF=E5=BC=95=E7=94=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 c5f39ab387..abfa49ba17 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 @@ -43,6 +43,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.constant.IcPlatformConstant; import com.epmet.constant.IcResiUserConstant; import com.epmet.constant.UserConstant; @@ -121,8 +122,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl natList = icNatService.getNatList(formDTO.getCustomerId(), icResiUser.getIdCard()); result.setNatList(natList); //疫苗接种 - List vaccineList = icVaccineService.getVaccineList(formDTO.getCustomerId(), icResiUser.getIdCard()); + List vaccineList = SpringContextUtils.getBean(IcVaccineService.class).getVaccineList(formDTO.getCustomerId(), icResiUser.getIdCard()); result.setVaccineList(vaccineList); //行程信息 List tripList = icTripReportRecordService.tripList(formDTO.getCustomerId(), icResiUser.getIdCard()); From 4259f9299a3bf734b7a867b27667a3906b37d068 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 7 Apr 2022 22:37:36 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=A0=B8?= =?UTF-8?q?=E9=85=B8=E6=A3=80=E6=B5=8B&=E7=96=AB=E8=8B=97=E6=8E=A5?= =?UTF-8?q?=E7=A7=8D=EF=BC=8C=E5=BB=BA=E7=AB=8B=E5=85=B3=E7=B3=BB=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcNatServiceImpl.java | 13 +++++++------ .../service/impl/IcVaccineServiceImpl.java | 17 +++++++++-------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index a7ef88d5ec..b6a82a1543 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -488,6 +488,9 @@ public class IcNatServiceImpl extends BaseServiceImpl imp String natResult = e.getNatResult(); String natAddress = e.getNatAddress(); + // 居民信息 + IcResiUserEntity resi = getResi(customerId, idCard, null); + //1.先看客户下有没有这个人 IcNatEntity resiNat = getResiNat(customerId, idCard, natTime); if (resiNat != null && !"import".equals(resiNat.getUserType())) { @@ -547,7 +550,6 @@ public class IcNatServiceImpl extends BaseServiceImpl imp resiNat.setUpdatedBy(currentUserId); resiNat.setUpdatedTime(new Date()); - IcResiUserEntity resi = getResi(customerId, idCard, null); resiNat.setIsResiUser(resi != null ? "1" : "0"); resiNat.setUserId(resi != null ? resi.getId() : ""); @@ -555,15 +557,14 @@ public class IcNatServiceImpl extends BaseServiceImpl imp } // 还要创建关系。只有本辖区及下级居民，才建立关系 - if (getResi(customerId, idCard, String.join(":", Arrays.asList(agencyPids, agencyId))) != null) { - createNatRelation(resiNat.getId(), listener.getCurrentAgencyId(), listener.getCurrentAgencyPids()); + if (resi != null) { + createNatRelation(resiNat.getId(), resi.getAgencyId(), resi.getPids()); } return; } // 执行新增操作 - IcResiUserEntity resi = getResi(customerId, idCard, null); e.setIsResiUser(resi != null ? "1" : "0"); e.setUserId(resi != null ? resi.getId() : ""); e.setUserType("import"); @@ -571,8 +572,8 @@ public class IcNatServiceImpl extends BaseServiceImpl imp baseDao.insert(e); // 还要创建关系。只有本辖区及下级居民，才建立关系 - if (getResi(customerId, idCard, String.join(":", Arrays.asList(agencyPids, agencyId))) != null) { - createNatRelation(e.getId(), listener.getCurrentAgencyId(), listener.getCurrentAgencyPids()); + if (resi != null) { + createNatRelation(e.getId(), resi.getAgencyId(), resi.getPids()); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java index c9ca6ee005..ec33974bf8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java @@ -297,6 +297,9 @@ public class IcVaccineServiceImpl extends BaseServiceImpl Date: Fri, 8 Apr 2022 09:14:19 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/exception/EpmetErrorCode.java | 1 + .../src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java | 1 + .../src/main/java/com/epmet/controller/IcNatController.java | 1 + .../src/main/java/com/epmet/service/impl/IcNatServiceImpl.java | 3 +++ 4 files changed, 6 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index a059504d2e..3b1ed3c0c4 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -253,6 +253,7 @@ public enum EpmetErrorCode { NEIGHBORHOOD_DEL_FAILED(8922,""), IC_NAT_IDCARD_NATTIME(8923,"已存在相同记录"), IC_NAT(8924,"平台已存在记录，请去修改原有记录"), + RESI_IC_NAT(8925,"已存在记录，请联系社区工作人员修改"), //通用错误码 start diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java index 9472ea4314..258f28c66b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java @@ -100,6 +100,7 @@ public class AddIcNatFormDTO implements Serializable { //token中信息 private String customerId; private String staffId; + private String client; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java index 727c5678c8..c03c2b50db 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java @@ -89,6 +89,7 @@ public class IcNatController implements ResultDataResolver { ValidatorUtils.validateEntity(formDTO, AddIcNatFormDTO.Nat.class); formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setClient(tokenDto.getClient()); icNucleinService.add(formDTO); return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index b6a82a1543..5f2deb846e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -101,6 +101,9 @@ public class IcNatServiceImpl extends BaseServiceImpl imp if (null != icNatDTO && icNatDTO.getNatResult().equals(formDTO.getNatResult())) { throw new RenException(EpmetErrorCode.IC_NAT_IDCARD_NATTIME.getCode(), EpmetErrorCode.IC_NAT_IDCARD_NATTIME.getMsg()); } else if (null != icNatDTO && !icNatDTO.getNatResult().equals(formDTO.getNatResult())) { + if ("wxmp".equals(formDTO.getClient())) { + throw new RenException(EpmetErrorCode.RESI_IC_NAT.getCode(), EpmetErrorCode.RESI_IC_NAT.getMsg()); + } throw new RenException(EpmetErrorCode.IC_NAT.getCode(), EpmetErrorCode.IC_NAT.getMsg()); } //1.获取所填居民所属组织缓存信息 From 2806a75bf92d016f0d0bbb4d40db873f73aacdc6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 8 Apr 2022 09:54:47 +0800 Subject: [PATCH 16/20] bug#2759 --- .../java/com/epmet/service/impl/IcResiCollectServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index b0befce180..39efa26144 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -144,6 +144,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl Date: Fri, 8 Apr 2022 10:23:44 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=EF=BC=8C=E5=A5=87=E8=91=A9=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/IcResiCollectMemFormDTO.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java index a3fca9b02b..95ae25cd79 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java @@ -2,7 +2,6 @@ package com.epmet.dto.form; import lombok.Data; -import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -18,13 +17,13 @@ public class IcResiCollectMemFormDTO implements Serializable { /** * 居住成员1姓名 */ - @NotBlank(message = "姓名不能为空", groups = {ResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class}) + // @NotBlank(message = "姓名不能为空", groups = {ResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class}) private String name; /** * 居住成员1身份证号 */ - @NotBlank(message = "身份证号不能为空", groups = {ResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class}) + // @NotBlank(message = "身份证号不能为空", groups = {ResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class}) private String idNum; /** From 3beb70dfd8b5bcb667e3722ab38c2a2474bc486c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 8 Apr 2022 11:12:19 +0800 Subject: [PATCH 18/20] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=EF=BC=8C=E5=8F=96=E6=B6=88=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcEpidemicSpecialAttentionServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index bd9faff62b..f27bc46842 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -334,7 +334,8 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl Date: Fri, 8 Apr 2022 11:19:59 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E4=B8=AD=E9=97=B4=E5=BA=93=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=20=E5=B7=A1=E6=9F=A5=E6=9A=82=E6=97=B6=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mq/listener/OpenDataPatrolChangeEventListener.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java index c2cd63b509..677d1062ce 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java @@ -16,7 +16,6 @@ import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.constant.SystemMessageType; import com.epmet.opendata.dto.form.UpsertPatrolRecordForm; import com.epmet.opendata.service.BaseGridDailyworkService; -import com.epmet.opendata.service.UserPatrolRecordService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; @@ -90,10 +89,11 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr Boolean aBoolean = false; switch (tags) { case SystemMessageType.USER_PATROL_START: - aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).insertPatrolRecord(patrolRecordForm); + //巡查的未对接暂时不用同步了 + //aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).insertPatrolRecord(patrolRecordForm); break; case SystemMessageType.USER_PATROL_STOP: - aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).updatePatrolRecord(patrolRecordForm); + //aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).updatePatrolRecord(patrolRecordForm); break; case SystemMessageType.PATROL_ROUTINE_WORK_ADD: aBoolean = SpringContextUtils.getBean(BaseGridDailyworkService.class).insertBaseGridWorkRecord(patrolRecordForm); From a82feb5d7e183f484391698b1b43d72300e8ca07 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 8 Apr 2022 12:26:12 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E4=B8=AD=E9=97=B4=E5=BA=93=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=20=E5=B7=A1=E6=9F=A5=E6=9A=82=E6=97=B6=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opendata/mq/listener/OpenDataPatrolChangeEventListener.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java index 677d1062ce..d168875abb 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java @@ -91,9 +91,11 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr case SystemMessageType.USER_PATROL_START: //巡查的未对接暂时不用同步了 //aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).insertPatrolRecord(patrolRecordForm); + aBoolean = true; break; case SystemMessageType.USER_PATROL_STOP: //aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).updatePatrolRecord(patrolRecordForm); + aBoolean = true; break; case SystemMessageType.PATROL_ROUTINE_WORK_ADD: aBoolean = SpringContextUtils.getBean(BaseGridDailyworkService.class).insertBaseGridWorkRecord(patrolRecordForm);