Merge branch 'yantai_zhengwu_master' into dev

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserTaskLogEntity.java

@@ -41,4 +41,6 @@ public class IcResiUserTaskLogEntity extends BaseEpmetEntity {
      */
 	private String type;
 
+	private String dataScope;
+
 }

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

@@ -278,8 +278,15 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
             return;
         }
 
-        LambdaQueryWrapper<IcResiUserDeadTaskLogEntity> logEntityLambdaQueryWrapper = new LambdaQueryWrapper<IcResiUserDeadTaskLogEntity>().orderByDesc(IcResiUserDeadTaskLogEntity::getCreatedTime).last("limit 1");
+
-        IcResiUserDeadTaskLogEntity logEntity = icResiUserDeadTaskLogDao.selectOne(logEntityLambdaQueryWrapper);
+        List<NatUserInfoResultDTO> dbResiList = null;
+
+        for (DataSyncConfigDTO config : configData) {
+            String scope = config.getScopeList().stream().map(DataSyncScopeDTO::getId).collect(Collectors.joining(","));
+
+            // 查询上一次定时任务 居民位置记录
+            LambdaQueryWrapper<IcResiUserTaskLogEntity> logEntityLambdaQueryWrapper = new LambdaQueryWrapper<IcResiUserTaskLogEntity>().eq(IcResiUserTaskLogEntity::getDataScope,scope).eq(IcResiUserTaskLogEntity::getType,"siwang").orderByDesc(IcResiUserTaskLogEntity::getCreatedTime).last("limit 1");
+            IcResiUserTaskLogEntity logEntity = resiUserTaskLogDao.selectOne(logEntityLambdaQueryWrapper);
 
             List<NatUserInfoResultDTO> userInfoResultDTOS = new ArrayList<>();
             boolean isNum = false;
@@ -299,11 +306,11 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
 
             }
 
-        IcResiUserDeadTaskLogEntity newLog = new IcResiUserDeadTaskLogEntity();
+            IcResiUserTaskLogEntity newLog = new IcResiUserTaskLogEntity();
             newLog.setCreatedTime(new Date());
-        List<NatUserInfoResultDTO> dbResiList = null;
+            newLog.setDataScope(scope);
+            newLog.setType("siwang");
 
-        for (DataSyncConfigDTO config : configData) {
             // 设置查询数据范围
             formDTO.setOrgList(config.getScopeList());
             DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode());
@@ -347,7 +354,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
                     try {
                         //查询正常状态的居民
                         siWang(dbResiList);
-                        icResiUserDeadTaskLogDao.insert(newLog);
+                        resiUserTaskLogDao.insert(newLog);
                         log.info("======siWang信息拉取结束======");
                     } catch (Exception e) {
                         log.error("death thread execute exception", e);
@@ -1662,8 +1669,15 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
             return;
         }
 
+
+        List<NatUserInfoResultDTO> dbResiList = null;
+
+        for (DataSyncConfigDTO config : configData) {
+
+            String scope = config.getScopeList().stream().map(DataSyncScopeDTO::getId).collect(Collectors.joining(","));
+
             // 查询上一次定时任务 居民位置记录
-        LambdaQueryWrapper<IcResiUserTaskLogEntity> logEntityLambdaQueryWrapper = new LambdaQueryWrapper<IcResiUserTaskLogEntity>().eq(IcResiUserTaskLogEntity::getType,"hunyin").orderByDesc(IcResiUserTaskLogEntity::getCreatedTime).last("limit 1");
+            LambdaQueryWrapper<IcResiUserTaskLogEntity> logEntityLambdaQueryWrapper = new LambdaQueryWrapper<IcResiUserTaskLogEntity>().eq(IcResiUserTaskLogEntity::getDataScope,scope).eq(IcResiUserTaskLogEntity::getType,"hunyin").orderByDesc(IcResiUserTaskLogEntity::getCreatedTime).last("limit 1");
             IcResiUserTaskLogEntity logEntity = resiUserTaskLogDao.selectOne(logEntityLambdaQueryWrapper);
             // userInfoResultDTOS 待处理的数据存放
             List<NatUserInfoResultDTO> userInfoResultDTOS = new ArrayList<>();
@@ -1695,9 +1709,8 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
             IcResiUserTaskLogEntity newLog = new IcResiUserTaskLogEntity();
             newLog.setCreatedTime(new Date());
             newLog.setType("hunyin");
-        List<NatUserInfoResultDTO> dbResiList = null;
+            newLog.setDataScope(scope);
 
-        for (DataSyncConfigDTO config : configData) {
             // 设置查询数据范围
             formDTO.setOrgList(config.getScopeList());
             DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode());

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserTaskLogDao.xml

@@ -8,6 +8,7 @@
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="dataType" column="DATA_TYPE"/>
         <result property="dataCount" column="DATA_COUNT"/>
+        <result property="dataScope" column="DATA_SCOPE"/>
         <result property="type" column="TYPE"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>