修改同步消控室执法数据问题

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/sync/remote/DefaultLjZfjgSyncDataService.java

@@ -320,27 +320,38 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
 
     @Override
     public void updateFireRoom() {
-        System.out.println("消控室接口");
-        System.out.println(enabled);
+        log.info("=============消控室接口");
+
         if (!enabled) {
-            System.out.println("未开启消控室接口");
+            log.error("===========未开启消控室接口");
             return;
         }
         if (!fireRoomEnable) {
-            System.out.println("未开启消控室执行计划");
+            log.info("============未开启消控室执行计划");
             return;
         }
         List<EnforceJobFireRoomDTO> enforceJobFireRoomDTOS = enforceObjServiceExtend.enforceJobFireRoomList();
         if (enforceJobFireRoomDTOS.isEmpty()) {
-            System.out.println("未找到不合格的消控室");
+            log.info("============未找到不合格的消控室");
             return;
         }
-        System.out.println("不合格的消控室" + enforceJobFireRoomDTOS);
+        log.info("不合格的消控室" + enforceJobFireRoomDTOS);
         Map<String, String> stringStringMap = enforceJobFireRoomDTOS.stream().collect(Collectors.toMap(EnforceJobFireRoomDTO::getEnforceObjId, EnforceJobFireRoomDTO::getJobId));
         List<String> ids = enforceJobFireRoomDTOS.stream().map(EnforceJobFireRoomDTO::getEnforceObjId).collect(Collectors.toList());
         List<EnforceObj> enforceObjs = enforceObjService.listByIds(ids);
-        System.out.println("不合格的消控室执法对象" + enforceObjs);
+        log.info("不合格的消控室执法对象" + enforceObjs);
         for (EnforceObj enforceObj : enforceObjs) {
+
+            //发送数据到IRS交互应用
+            String address = Optional.of(enforceObj).map(EnforceObj::getEnforceObjAddress).orElse("");
+            if (!address.contains("两江新区")) {
+                log.info(enforceObj.getEnforceObjName() + " 发送至发送数据到IRS交互应用不是两江新区");
+                continue;
+            }
+            if (!stringStringMap.containsKey(enforceObj.getId())) {
+                log.info(enforceObj.getEnforceObjName() + " 发送至发送数据到IRS交互应用找不到ID");
+                continue;
+            }
             String eventCondition = "A11";
             if (ObjectUtil.isNotEmpty(enforceObj.getPlaceType())) {
                 SysDictData dictDataCache = commMapper.selectDeptByQuery(CacheConstants.PLACE_TYPE, enforceObj.getPlaceType());
@@ -373,17 +384,8 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
                     eventCondition = "A10";
                 }
             }
-            System.out.println(enforceObj.getEnforceObjName() + " 发送至发送数据到IRS交互应用不是两江新区走的情形为: " + eventCondition);
-            //发送数据到IRS交互应用
-            String address = Optional.of(enforceObj).map(EnforceObj::getEnforceObjAddress).orElse("");
-            if (!address.contains("两江新区")) {
-                System.out.println(enforceObj.getEnforceObjName() + " 发送至发送数据到IRS交互应用不是两江新区");
-                continue;
-            }
-            if (!stringStringMap.containsKey(enforceObj.getId())) {
-                System.out.println(enforceObj.getEnforceObjName() + " 发送至发送数据到IRS交互应用找不到ID");
-                continue;
-            }
+            log.info(enforceObj.getEnforceObjName() + " 发送至发送数据到IRS交互应用不是两江新区走的情形为: " + eventCondition);
+
             String jobId = stringStringMap.get(enforceObj.getId());
             EnforceJob enforceJob = enforceJobService.getById(jobId);
 
@@ -395,7 +397,7 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
                     .filter(it -> it.containsKey("township"))
                     .map(it -> it.getString("township")).orElse("");
             if (StringUtils.isEmpty(streetName)) {
-                System.out.println(enforceObj.getEnforceObjName() + "发送至发送数据到IRS交互应用找不到街道");
+                log.info(enforceObj.getEnforceObjName() + "发送至发送数据到IRS交互应用找不到街道");
                 continue;
             }
 
@@ -421,7 +423,6 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
                     .execute()
                     .sync()
                     .body();
-            System.out.println("单位发送至发送数据到IRS交互应用: " + startEventString);
             log.error("单位发送至发送数据到IRS交互应用: {}", startEventString);
 
         }

zfjg-modules/zfjg-manage/src/main/resources/mapper/enforce/obj/EnforceObjMapper.xml

@@ -280,11 +280,13 @@
     AND a.extract_num = 0
     </select>
     <select id="getEnforceJobFireRoom" resultType="com.zfjg.manage.api.dto.enforce.job.EnforceJobFireRoomDTO">
-        SELECT DISTINCT enforce_obj_id,job_id
+        SELECT DISTINCT enforce_obj_id, job_id
         FROM enforce_job_node_item
-        WHERE TO_DAYS(NOW()) - TO_DAYS(update_time) <![CDATA[ <= ]]> 1
-          AND enforce_obj_class = '消防控制室'
-          AND check_result = 2
+        WHERE DATEDIFF(NOW(), update_time) <= 1
+        AND enforce_obj_class = '消防控制室'
+        AND check_result = 2;
     </select>
 
+
+
 </mapper>