From b787f42c57905fd5612085a038e5e0bd8f2b6b8f Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 15 Nov 2022 13:37:55 +0800 Subject: [PATCH 1/5] =?UTF-8?q?natInfoSyncButton=E6=94=B9=E4=B8=BAsubmitSy?= =?UTF-8?q?ncJob=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/DataSyncConfigController.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java index 948471cbe3..afaf67391b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java @@ -124,8 +124,16 @@ public class DataSyncConfigController { return new Result(); } - @PostMapping("natInfoSyncButton") - public Result natInfoSyncButton(@RequestBody DataSyncTaskParam formDTO, @LoginUser TokenDto tokenDto){ + /** + * 提交同步任务(核酸，疫苗，身份一致性验证) + * @author wxz + * @date 2022/11/15 下午1:37 + * @param formDTO + * @param tokenDto + * @return Result + */ + @PostMapping("submitSyncJob") + public Result submitSyncJob(@RequestBody DataSyncTaskParam formDTO, @LoginUser TokenDto tokenDto){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); dataSyncConfigService.natInfoSyncButton(formDTO); From f48f1c6112f8c36ebd1390ab72f5c9bea126dd43 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 15 Nov 2022 13:39:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?natInfoSyncButton=E6=94=B9=E4=B8=BAsubmitSy?= =?UTF-8?q?ncJob=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/DataSyncConfigController.java | 2 +- .../src/main/java/com/epmet/service/DataSyncConfigService.java | 2 +- .../java/com/epmet/service/impl/DataSyncConfigServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java index afaf67391b..737bf81727 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java @@ -136,7 +136,7 @@ public class DataSyncConfigController { public Result submitSyncJob(@RequestBody DataSyncTaskParam formDTO, @LoginUser TokenDto tokenDto){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); - dataSyncConfigService.natInfoSyncButton(formDTO); + dataSyncConfigService.submitSyncJob(formDTO); return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java index b4d80051da..300128bc4d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java @@ -112,7 +112,7 @@ public interface DataSyncConfigService extends BaseService */ void natInfoScanTask(DataSyncTaskParam formDTO); - void natInfoSyncButton(DataSyncTaskParam formDTO); + void submitSyncJob(DataSyncTaskParam formDTO); List getNatUserInfoFromDb(DataSyncTaskParam formDTO, int pageNo, int pageSize); 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 b3a50c4490..79fd952139 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 @@ -411,7 +411,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl Date: Tue, 15 Nov 2022 13:44:11 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=AF=94=E5=AF=B9?= =?UTF-8?q?=EF=BC=8C=E5=85=B3=E7=B3=BB=E8=A1=A8=E6=94=B9=E4=B8=BA=20agency?= =?UTF-8?q?=5Fid+compare=5Frec=5Fid=E5=94=AF=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcNatCompareRecordServiceImpl.java | 4 +++- .../src/main/resources/mapper/IcNatCompareRecRelationDao.xml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java index 38bde062d2..47efdc1980 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java @@ -285,7 +285,8 @@ public class IcNatCompareRecordServiceImpl extends BaseServiceImpl AND r.IMPORT_DATE = #{importDate} + \ No newline at end of file From 0f95e7f1d42922fa625ab634676185b43602228e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 15 Nov 2022 13:50:40 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=AF=94=E5=AF=B9?= =?UTF-8?q?=EF=BC=8C=E5=85=B3=E7=B3=BB=E8=A1=A8=E6=94=B9=E4=B8=BA=20agency?= =?UTF-8?q?=5Fid+compare=5Frec=5Fid=E5=94=AF=E4=B8=802?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcNatCompareRecordServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java index 47efdc1980..18071df16c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java @@ -300,6 +300,8 @@ public class IcNatCompareRecordServiceImpl extends BaseServiceImpl Date: Tue, 15 Nov 2022 15:00:15 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=94=B9=E6=88=90=E6=9F=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/YTVaccineListDTO.java | 2 +- .../impl/DataSyncConfigServiceImpl.java | 64 +++++++++++++------ .../main/resources/mapper/IcVaccineDao.xml | 2 +- 3 files changed, 48 insertions(+), 20 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/YTVaccineListDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/YTVaccineListDTO.java index 94b2b30418..2950cd00c0 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/YTVaccineListDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/YTVaccineListDTO.java @@ -12,7 +12,7 @@ import java.io.Serializable; public class YTVaccineListDTO implements Serializable { private static final long serialVersionUID = -5583350277850076659L; - private String idCard; + private String cardno; /** * 接种时间 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 79fd952139..438f0d80c7 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 @@ -1072,30 +1072,58 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl> vaccineList = new ArrayList<>();/*yantaiNamedParamLantuJdbcTemplate.queryForList( - "select id, name,card_no, create_time from hscyxxb where card_no in (:idcards)", args);*/ - Map m = new HashMap<>(); - vaccineList.add(m); +// List vaccineList = JSON.parseArray(json,Map.class); + List> vaccineList = yantaiNamedParamLantuJdbcTemplate.queryForList( + "select data, name, card_no, vaccineCount from t_ymjz_info where card_no in (:idcards)", args); + List ytVaccineListDTOS = new ArrayList<>(); if (CollectionUtils.isNotEmpty(vaccineList)) { + vaccineList.forEach(v -> { + if (v.containsKey("data")){ + Map data = (Map) v.get("data"); + if (data.containsKey("vaccineList")){ + List vaccineList1 = JSON.parseArray(data.get("vaccineList").toString(), YTVaccineListDTO.class); + vaccineList1.forEach(v1 -> { + v1.setCardno(v.get("cardno").toString()); + }); + ytVaccineListDTOS.addAll(vaccineList1); + } + } + }); List entities = new ArrayList<>(); -// List ytVaccineListDTOS = ConvertUtils.sourceToTarget(vaccineList, YTVaccineListDTO.class); - List ytVaccineListDTOS = JSON.parseArray(json,YTVaccineListDTO.class); List existVaccine = icVaccineDao.getExistVaccine(ytVaccineListDTOS); if (CollectionUtils.isNotEmpty(existVaccine)){ for (YTVaccineListDTO e : existVaccine) { for (int i = 0; i < ytVaccineListDTOS.size(); i++) { - if (ytVaccineListDTOS.get(i).getIdCard().equals(e.getIdCard()) && ytVaccineListDTOS.get(i).getInoculateDate().equals(e.getInoculateDate())){ + if (ytVaccineListDTOS.get(i).getCardno().equals(e.getCardno()) && ytVaccineListDTOS.get(i).getInoculateDate().equals(e.getInoculateDate())){ ytVaccineListDTOS.remove(i); } } @@ -1104,7 +1132,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl { resiInfos.forEach(u -> { - if (v.getIdCard().equals(u.getIdCard())){ + if (v.getCardno().equals(u.getIdCard())){ IcVaccineEntity e = new IcVaccineEntity(); e.setCustomerId(customerId); e.setName(u.getName()); 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 458a917ab6..319d7b959a 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 @@ -236,7 +236,7 @@ WHERE DEL_FLAG = '0' AND ( - (ID_CARD = #{l.idCard} AND DATE_FORMAT(INOCULATE_TIME, '%Y-%m-%d %H:%i') = #{l.inoculateDate}) + (ID_CARD = #{l.cardno} AND DATE_FORMAT(INOCULATE_TIME, '%Y-%m-%d %H:%i') = #{l.inoculateDate}) )