From f76ab495540d5a22579444a43bfcd8904488cdae Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 1 Dec 2022 15:21:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5-=E6=B7=BB=E5=8A=A0=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/RentTenantFormDTO.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.java index 039b433416..be89dc898c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.java @@ -42,4 +42,15 @@ public class RentTenantFormDTO implements Serializable { */ private IcResiUserDTO user; + // 合同相关 + /** + * 合同开始日期 + */ + private String startDate; + + /** + * 合同结束日期 + */ + private String endDate; + } From 1331a1f7375a42bd7e82430f47b64a10b1bc35e3 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 1 Dec 2022 16:28:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E6=A0=B8=E9=85=B8=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=20&=20=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E3=80=91=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DataSyncConfigServiceImpl.java | 161 ++++++++++-------- 1 file changed, 93 insertions(+), 68 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index ae9abc8daf..4473b71722 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -1173,84 +1173,99 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl args = new HashMap<>(); args.put("idcards", idCards); - List> vaccineList = yantaiNamedParamLantuJdbcTemplate.queryForList( + List> vaccineListGetted = yantaiNamedParamLantuJdbcTemplate.queryForList( "select data, name, cardno, vaccineCount from t_ymjz_info where cardno in (:idcards)", args); + if (CollectionUtils.isEmpty(vaccineListGetted)) { + return; + } + + // 将获取到的json数据进行日期格式转化，暂存到java对象 List ytVaccineListFromApi = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(vaccineList)) { - vaccineList.forEach(v -> { - if (v.containsKey("data")){ - JSONObject jo = JSON.parseObject((String) v.get("data")); - if (jo.containsKey("vaccineList")) { - JSONArray vaccineListJA = jo.getJSONArray("vaccineList"); - List vaccineList1 = vaccineListJA.toJavaList(YTVaccineListDTO.class); - vaccineList1.forEach(v1 -> { - v1.setCardno(v.get("cardno").toString()); - - // 秒转换成:00 - Matcher matcher = VACCINE_DATE_OF_API_PATTERN.matcher(v1.getInoculateDate()); - if (matcher.matches()) { - v1.setInoculateDate(matcher.group(1).concat(":00")); - } - }); - ytVaccineListFromApi.addAll(vaccineList1); - } + vaccineListGetted.forEach(vGetted -> { + if (vGetted.containsKey("data")){ + JSONObject jo = JSON.parseObject((String) vGetted.get("data")); + if (jo.containsKey("vaccineList")) { + JSONArray vaccineListJA = jo.getJSONArray("vaccineList"); + List vaccineList1 = vaccineListJA.toJavaList(YTVaccineListDTO.class); + vaccineList1.forEach(v1 -> { + v1.setCardno(vGetted.get("cardno").toString()); + + // 秒转换成:00 + Matcher matcher = VACCINE_DATE_OF_API_PATTERN.matcher(v1.getInoculateDate()); + if (matcher.matches()) { + v1.setInoculateDate(matcher.group(1).concat(":00")); + } + }); + ytVaccineListFromApi.addAll(vaccineList1); } - }); - List entities = new ArrayList<>(); + } + }); - // 过滤已存在的记录 - List existVaccines = icVaccineDao.getExistVaccine(ytVaccineListFromApi); - if (CollectionUtils.isNotEmpty(existVaccines)){ - for (YTVaccineListDTO existVaccineItem : existVaccines) { - Iterator iterator = ytVaccineListFromApi.iterator(); - while (iterator.hasNext()) { - YTVaccineListDTO vaccineFromApi = iterator.next(); + if (CollectionUtils.isEmpty(ytVaccineListFromApi)) { + return; + } - // 身份证号和接种时间都一致，移除 - if (vaccineFromApi.getCardno().equals(existVaccineItem.getCardno()) - && vaccineFromApi.getInoculateDate().equals(existVaccineItem.getInoculateDate())) { + // 过滤已存在的记录 + List existVaccines = icVaccineDao.getExistVaccine(ytVaccineListFromApi); + if (CollectionUtils.isNotEmpty(existVaccines)){ + for (YTVaccineListDTO existVaccineItem : existVaccines) { + Iterator iterator = ytVaccineListFromApi.iterator(); + while (iterator.hasNext()) { + YTVaccineListDTO vaccineFromApi = iterator.next(); + + String inoculateDate = vaccineFromApi.getInoculateDate(); + if (StringUtils.isBlank(inoculateDate)) { + // 没有接种时间，移除 + log.warn("【疫苗接种同步】证件号为{}的记录，没有接种时间，移除。", vaccineFromApi.getCardno()); + iterator.remove(); + } - iterator.remove(); - } + // 身份证号和接种时间都一致，移除 + if (vaccineFromApi.getCardno().equals(existVaccineItem.getCardno()) + && inoculateDate.equals(existVaccineItem.getInoculateDate())) { + + iterator.remove(); } } } - if (CollectionUtils.isNotEmpty(ytVaccineListFromApi)){ - ytVaccineListFromApi.forEach(v -> { - resiInfos.forEach(u -> { - if (v.getCardno().equals(u.getIdCard())){ - IcVaccineEntity e = new IcVaccineEntity(); - e.setCustomerId(customerId); - e.setName(u.getName()); - e.setMobile(u.getMobile()); - e.setIdCard(u.getIdCard()); - e.setIsResiUser(StringUtils.isBlank(u.getUserId()) ? NumConstant.ZERO_STR : NumConstant.ONE_STR); - e.setUserId(StringUtils.isBlank(u.getUserId()) ? "" : u.getUserId()); - e.setUserType("ytPull"); - e.setInoculateTime(DateUtils.parseDate(v.getInoculateDate(),DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)); - e.setInoculateAddress(v.getLastStationName()); - e.setAgencyId(u.getAgencyId()); - e.setPids(u.getPids()); - entities.add(e); - } - }); - }); - icVaccineService.insertBatch(entities,NumConstant.ONE_HUNDRED); - List relationEntities = new ArrayList<>(); - entities.forEach(e -> { - IcVaccineRelationEntity re = new IcVaccineRelationEntity(); - re.setIcVaccineId(e.getId()); - re.setPids(e.getPids()); - re.setCustomerId(customerId); - re.setUserType("ytPull"); - re.setAgencyId(e.getAgencyId()); - // 拉取居民的疫苗接种信；因为查询的就是组织下的居民，所以都是本地居民。 - re.setIsLocalResiUser(NumConstant.ONE_STR); - relationEntities.add(re); - }); - icVaccineRelationService.insertBatch(relationEntities,NumConstant.ONE_HUNDRED); - } } + + + // 转化为entity，插入vaccine和vaccine_relation + List entities2Insert = new ArrayList<>(); + ytVaccineListFromApi.forEach(v -> { + resiInfos.forEach(u -> { + if (v.getCardno().equals(u.getIdCard())){ + IcVaccineEntity e = new IcVaccineEntity(); + e.setCustomerId(customerId); + e.setName(u.getName()); + e.setMobile(u.getMobile()); + e.setIdCard(u.getIdCard()); + e.setIsResiUser(StringUtils.isBlank(u.getUserId()) ? NumConstant.ZERO_STR : NumConstant.ONE_STR); + e.setUserId(StringUtils.isBlank(u.getUserId()) ? "" : u.getUserId()); + e.setUserType("ytPull"); + e.setInoculateTime(DateUtils.parseDate(v.getInoculateDate(),DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)); + e.setInoculateAddress(v.getLastStationName()); + e.setAgencyId(u.getAgencyId()); + e.setPids(u.getPids()); + entities2Insert.add(e); + } + }); + }); + icVaccineService.insertBatch(entities2Insert,NumConstant.ONE_HUNDRED); + List relationEntities = new ArrayList<>(); + entities2Insert.forEach(e -> { + IcVaccineRelationEntity re = new IcVaccineRelationEntity(); + re.setIcVaccineId(e.getId()); + re.setPids(e.getPids()); + re.setCustomerId(customerId); + re.setUserType("ytPull"); + re.setAgencyId(e.getAgencyId()); + // 拉取居民的疫苗接种信；因为查询的就是组织下的居民，所以都是本地居民。 + re.setIsLocalResiUser(NumConstant.ONE_STR); + relationEntities.add(re); + }); + icVaccineRelationService.insertBatch(relationEntities,NumConstant.ONE_HUNDRED); } /** @@ -1284,6 +1299,11 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl