死亡定时任务修改

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java

@@ -128,11 +128,19 @@ public class YtHsResUtils {
 //            4)start开始默认0
 //            5)limit每页记录数
             Map<String, Object> param = new HashMap<>();
-            param.put(APP_KEY, "IGE8TMM6f4t1Sef7FfstOLHAL");
+/*            param.put(APP_KEY, "IGE8TMM6f4t1Sef7FfstOLHAL");
             param.put("id_card", cardNo);
             param.put("name", userName);
             param.put("start", 0);
-            param.put("limit", 1);
+            param.put("limit", 1);*/
+            param.put(APP_KEY, "A2zfd4LYCqZWFddgKaihMKD5e");
+            param.put("AccountId", 1);
+            param.put("AccessToken", 1);
+            param.put("CertificateHolderCode", cardNo);
+            param.put("CertificateType", "死亡医学证明");
+            param.put("UseFor", "1");
+            param.put("CertificateHolderType", "");
+            param.put("CertificateNumber", "");
 
             log.info("siWang api param:{}", param);
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java

@@ -281,11 +281,14 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
 
         List<NatUserInfoResultDTO> dbResiList = null;
 
-        for (DataSyncConfigDTO config : configData) {
-            String scope = config.getScopeList().stream().map(DataSyncScopeDTO::getId).collect(Collectors.joining(","));
+        List<DataSyncScopeDTO> orgListLast = new ArrayList<>();;
 
-            // 查询上一次定时任务 居民位置记录
-            LambdaQueryWrapper<IcResiUserTaskLogEntity> logEntityLambdaQueryWrapper = new LambdaQueryWrapper<IcResiUserTaskLogEntity>().eq(IcResiUserTaskLogEntity::getDataScope,scope).eq(IcResiUserTaskLogEntity::getType,"siwang").orderByDesc(IcResiUserTaskLogEntity::getCreatedTime).last("limit 1");
+        for (DataSyncConfigDTO config : configData) {
+            orgListLast.addAll(config.getScopeList());
+//            String scope = config.getScopeList().stream().map(DataSyncScopeDTO::getId).collect(Collectors.joining(","));
+        }
+            // 查询上一次定时任务 居民位置记录  .eq(IcResiUserTaskLogEntity::getDataScope,scope)
+        LambdaQueryWrapper<IcResiUserTaskLogEntity> logEntityLambdaQueryWrapper = new LambdaQueryWrapper<IcResiUserTaskLogEntity>().eq(IcResiUserTaskLogEntity::getType,"siwang").orderByDesc(IcResiUserTaskLogEntity::getCreatedTime).last("limit 1");
         IcResiUserTaskLogEntity logEntity = resiUserTaskLogDao.selectOne(logEntityLambdaQueryWrapper);
 
         List<NatUserInfoResultDTO> userInfoResultDTOS = new ArrayList<>();
@@ -308,12 +311,12 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
 
         IcResiUserTaskLogEntity newLog = new IcResiUserTaskLogEntity();
         newLog.setCreatedTime(new Date());
-            newLog.setDataScope(scope);
+//        newLog.setDataScope(scope);
         newLog.setType("siwang");
 
         // 设置查询数据范围
-            formDTO.setOrgList(config.getScopeList());
-            DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode());
+        formDTO.setOrgList(orgListLast);
+        DataSyncEnum anEnum = DataSyncEnum.getEnum(EpidemicConstant.DATA_CODE_DEATH);
         if (isNum){
             formDTO.setStart(start);
             formDTO.setEnd(50000-userInfoResultDTOS.size());
@@ -346,9 +349,9 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
         }
 
 
-            if (CollectionUtils.isEmpty(dbResiList)) {
+/*        if (CollectionUtils.isEmpty(dbResiList)) {
             continue;
-            }
+        }*/
         switch (anEnum) {
             case SI_WANG:
                 try {
@@ -362,7 +365,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
             default:
                 log.warn("没有要处理的数据");
         }
-        }
+//        }
 
     }