From 40f066d4543f1c46a364458c88d91b8d192e7877 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 11 Nov 2022 14:36:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/DataSyncTaskParam.java |  6 +++
 .../impl/DataSyncConfigServiceImpl.java       | 42 ++-----------------
 2 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java
index 215ffabf28..13a230c644 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java
@@ -49,4 +49,10 @@ public class DataSyncTaskParam implements Serializable {
     private String dataCode;
 
     private String staffId;
+
+    /**
+     * nat：核酸检测；
+     * vaccine：疫苗接种
+     */
+    private String jobType;
 }
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 513561b057..0f21e9e539 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
@@ -408,10 +408,6 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
      */
     @Override
     public void natInfoSyncButton(DataSyncTaskParam formDTO) {
-        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
-        if (null == staffInfo){
-            throw new EpmetException("未查询到工作人员信息："+formDTO.getStaffId());
-        }
         AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getAgencyId());
         if (null == agencyInfo){
             throw new EpmetException("未查询到组织信息："+formDTO.getAgencyId());
@@ -420,6 +416,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
         // 查询该组织是否存在等待中或者进行中的任务
         LambdaQueryWrapper<IcSyncJobEntity> qw = new LambdaQueryWrapper<>();
         qw.eq(IcSyncJobEntity::getOrgId,formDTO.getAgencyId())
+                .eq(IcSyncJobEntity::getJobType,formDTO.getJobType())
                 .in(IcSyncJobEntity::getOperationStatus,OPERATION_STATUS_WAITING,OPERATION_STATUS_PROCESSING);
         List<IcSyncJobEntity> icSyncJobEntities = icSyncJobDao.selectList(qw);
         // 当前组织下存在同步任务
@@ -433,43 +430,10 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
         e.setOrgId(formDTO.getAgencyId());
         e.setPid(agencyInfo.getPid());
         e.setOrgIdPath(StringUtils.isBlank(agencyInfo.getPids()) ? agencyInfo.getId() : agencyInfo.getPids()+":"+agencyInfo.getId());
-        e.setJobType(JOB_TYPE_NAT);
+        e.setJobType(formDTO.getJobType());
         e.setOperatorId(formDTO.getStaffId());
         e.setOperationStatus(OPERATION_STATUS_WAITING);
         insertSync(e);
-
-        //List<IcSyncJobEntity> waitList;
-        //do {
-        //    LambdaQueryWrapper<IcSyncJobEntity> qw3 = new LambdaQueryWrapper<>();
-        //    qw3.eq(IcSyncJobEntity::getCustomerId,formDTO.getCustomerId())
-        //            .eq(IcSyncJobEntity::getOperationStatus,OPERATION_STATUS_WAITING)
-        //            .eq(IcSyncJobEntity::getJobType,JOB_TYPE_NAT)
-        //            .orderByAsc(BaseEpmetEntity::getCreatedTime);
-        //    waitList = icSyncJobDao.selectList(qw3);
-        //    if (CollectionUtils.isNotEmpty(waitList)){
-        //        for (IcSyncJobEntity entity : waitList) {
-        //            RLock lock = null;
-        //            try {
-        //                lock = distributedLock.getLock(entity.getOrgId() + JOB_TYPE_NAT, 60L, 60L, TimeUnit.SECONDS);
-        //                updateSync(entity.getId(),OPERATION_STATUS_PROCESSING);
-        //            }catch (Exception ex){
-        //                log.error(ex.getMessage());
-        //                throw new EpmetException(ex.getMessage());
-        //            }finally {
-        //                lock.unlock();
-        //            }
-        //            formDTO.setAgencyId(entity.getOrgId());
-        //            try {
-        //                natInfoScanTask(formDTO);
-        //            }catch (Exception ee){
-        //                log.error(ee.getMessage());
-        //                throw new EpmetException(ee.getMessage());
-        //            }finally {
-        //                updateSync(entity.getId(),OPERATION_STATUS_FINISH);
-        //            }
-        //        }
-        //    }
-        //}while (CollectionUtils.isNotEmpty(waitList));
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -1103,7 +1067,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
         // todo 疫苗接种视图
 
         List<Map<String, Object>> vaccineList = yantaiNamedParamLantuJdbcTemplate.queryForList(
-                "select id, name,card_no, create_time, realname from hscyxxb where card_no in (:idcards)", args);
+                "select id, name,card_no, create_time from hscyxxb where card_no in (:idcards)", args);
         if (CollectionUtils.isNotEmpty(vaccineList)) {
             List<IcVaccineEntity> entities = new ArrayList<>();
             vaccineList.forEach(resiVaccineInfo -> {