From 80cb29baa8263cb1c01feb908d4ea3e634a72a3f Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Tue, 15 Nov 2022 21:04:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=B9?=
 =?UTF-8?q?=E6=AF=94=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/constant/EpidemicConstant.java |  3 ++-
 ...ava => YanTaiResiComparisonSyncProcessor.java} | 15 ++++++++-------
 .../impl/IcResiComparisonRecordServiceImpl.java   |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)
 rename epmet-user/epmet-user-server/src/main/java/com/epmet/processor/{YanTaiComparisonSyncProcessor.java => YanTaiResiComparisonSyncProcessor.java} (91%)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java
index edd9d1a695..3b843838e4 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java
@@ -21,7 +21,8 @@ public interface EpidemicConstant {
      */
     String JOB_TYPE_NAT = "nat";
     String JOB_TYPE_VACCINE = "vaccine";
-    String JOB_TYPE_COMPARISON = "comparison";
+    // 居民信息对比
+    String JOB_TYPE_COMPARISON_RESI = "comparison_resi";
 
     String OPERATION_STATUS_WAITING = "waiting";
     String OPERATION_STATUS_PROCESSING = "processing";
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiComparisonSyncProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiResiComparisonSyncProcessor.java
similarity index 91%
rename from epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiComparisonSyncProcessor.java
rename to epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiResiComparisonSyncProcessor.java
index cc07aafab2..8e57474606 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiComparisonSyncProcessor.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiResiComparisonSyncProcessor.java
@@ -7,7 +7,6 @@ import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.constant.EpidemicConstant;
 import com.epmet.dao.IcSyncJobDao;
 import com.epmet.entity.IcSyncJobEntity;
-import com.epmet.service.DataSyncConfigService;
 import com.epmet.service.IcResiComparisonRecordService;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
@@ -20,12 +19,14 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import static com.epmet.constant.EpidemicConstant.JOB_TYPE_NAT;
-
-// 烟台数据比对
+/**
+  * @Description 居民一致性对比任务处理器
+  * @Author wxz
+  * @Date 2022/11/15 下午5:54
+ */
 @Component
 @Slf4j
-public class YanTaiComparisonSyncProcessor {
+public class YanTaiResiComparisonSyncProcessor {
 
     public static final int MAX_EXECUTING_COUNT = 3;
 
@@ -67,10 +68,10 @@ public class YanTaiComparisonSyncProcessor {
 
         RLock lock = null;
         try {
-            lock = distributedLock.getLock("data:sync:" + "comparison", 60L, 60L, TimeUnit.SECONDS);
+            lock = distributedLock.getLock("data:sync:comparison:resi", 60L, 60L, TimeUnit.SECONDS);
             // 查询可执行的任务列表，并且异步执行
             List<IcSyncJobEntity> icSyncJobToExec = icSyncJobDao.selectExecutableJobList(
-                    EpidemicConstant.JOB_TYPE_COMPARISON,
+                    EpidemicConstant.JOB_TYPE_COMPARISON_RESI,
                     leftCount);
 
             if (!CollectionUtils.isEmpty(icSyncJobToExec)) {
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java
index 78b76b12f7..9b6dfa7628 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java
@@ -251,7 +251,7 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl<IcResiCom
         // 查询该组织是否存在等待中或者进行中的任务
         LambdaQueryWrapper<IcSyncJobEntity> qw = new LambdaQueryWrapper<>();
         qw.eq(IcSyncJobEntity::getOrgId, formDTO.getAgencyId())
-                .eq(IcSyncJobEntity::getJobType, EpidemicConstant.JOB_TYPE_COMPARISON)
+                .eq(IcSyncJobEntity::getJobType, EpidemicConstant.JOB_TYPE_COMPARISON_RESI)
                 .in(IcSyncJobEntity::getOperationStatus, OPERATION_STATUS_WAITING, OPERATION_STATUS_PROCESSING);
         List<IcSyncJobEntity> icSyncJobEntities = icSyncJobDao.selectList(qw);
         // 当前组织下存在同步任务
@@ -265,7 +265,7 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl<IcResiCom
         e.setOrgId(formDTO.getAgencyId());
         e.setPid(agencyInfo.getPid());
         e.setOrgIdPath(StringUtils.isBlank(agencyInfo.getPids()) ? agencyInfo.getId() : agencyInfo.getPids() + ":" + agencyInfo.getId());
-        e.setJobType(EpidemicConstant.JOB_TYPE_COMPARISON);
+        e.setJobType(EpidemicConstant.JOB_TYPE_COMPARISON_RESI);
         e.setOperatorId(formDTO.getUserId());
         e.setOperationStatus(OPERATION_STATUS_WAITING);
         icSyncJobDao.insert(e);