item：巡查数据-站端与中心级数据同步,新增同步开关

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/action/AcceptEquipmentRules.java

@@ -52,6 +52,8 @@ public class AcceptEquipmentRules {
     @Autowired
     private CheckInputMapper checkInputMapper;
 
+    @Value("${dataSync.patrol.emqx.switch}")
+    private Boolean patrolSyncSwitch;
 
     public void getContent(
             String itemNo,
@@ -133,6 +135,7 @@ public class AcceptEquipmentRules {
             checkInput.setIsOk(CheckStatusEnum.UNQUALIFIED.getCode());
         }
         checkInputDao.save(checkInput);
+        if (patrolSyncSwitch) {
             //  巡检站端与中心级数据同步
             TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
                 @Override
@@ -144,6 +147,7 @@ public class AcceptEquipmentRules {
                     patrolDataSyncService.checkInputBoDataSync(checkInputSyncBoList);
                 }
             });
+        }
         log.info(checkInput.getPointClassifyName()+"规则校验返回结果修改成功");
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

@@ -155,6 +155,9 @@ public class CheckServiceImpl implements ICheckService {
     @Autowired
     private CheckInputMapper checkInputMapper;
 
+    @Value("${dataSync.patrol.emqx.switch}")
+    private Boolean patrolSyncSwitch;
+
 //    @Value("${file.ip}")
 //    private String fileIp;
 //
@@ -221,6 +224,7 @@ public class CheckServiceImpl implements ICheckService {
         checkDao.save(check);
         checkShotDao.saveAll(imgList);
         //  巡检站端与中心级数据同步
+        if (patrolSyncSwitch) {
             TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
                 @Override
                 public void afterCommit() {
@@ -230,6 +234,7 @@ public class CheckServiceImpl implements ICheckService {
                 }
             });
         }
+    }
 
     @Override
     @Transactional
@@ -447,6 +452,7 @@ public class CheckServiceImpl implements ICheckService {
                     updateTaskStatus(plan.getId(), null);
                 }
             }
+            if (patrolSyncSwitch) {
                 //  巡检站端与中心级数据同步
                 TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
                     @Override
@@ -458,6 +464,7 @@ public class CheckServiceImpl implements ICheckService {
                         patrolDataSyncService.checkInputBoDataSync(checkInputSyncBoList);
                     }
                 });
+            }
             return new CheckDto(check.getId(), unqualifiedcheckItemList);
         } catch (Exception e) {
         	e.printStackTrace();
@@ -694,6 +701,7 @@ public class CheckServiceImpl implements ICheckService {
             }
             CheckDto checkDto=    new CheckDto(check.getId(), unqualifiedcheckItemList);
 
+            if (patrolSyncSwitch) {
                 //  巡检站端与中心级数据同步
                 Check finalCheck = check;
                 TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
@@ -702,19 +710,14 @@ public class CheckServiceImpl implements ICheckService {
                         // 事物提交后业务逻辑
                         patrolDataSyncService.checkDataSync(finalCheck);
                         patrolDataSyncService.checkInputDataSync(checkInputList);
-                }
-            });
-            //  巡检站端与中心级数据同步
-            TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
-                @Override
-                public void afterCommit() {
-                    // 事物提交后业务逻辑
+
                         Map<String, Object> map = new HashMap<>();
                         map.put("idList", checkInputList.stream().map(CheckInput::getId).collect(Collectors.toList()));
                         List<CheckInputSyncBo> checkInputSyncBoList = checkInputMapper.getCheckInputSyncBoList(map);
                         patrolDataSyncService.checkInputBoDataSync(checkInputSyncBoList);
                     }
                 });
+            }
             return checkDto;
         } catch (Exception e) {
             e.printStackTrace();

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java

@@ -218,6 +218,9 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
     @Value("${emergency.command.section.id}")
     private String emergencyCommandSectionId;
 
+    @Value("${dataSync.patrol.emqx.switch}")
+    private Boolean patrolSyncSwitch;
+
     @Transactional
     @Override
     public CommonResponse saveNormal(LatentDangerNormalParam latentDangerParam, String userId, String userRealName, String departmentId, String departmentName, String companyId, String orgCode, RoleBo role) {
@@ -390,6 +393,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
 
     private void updateCheckInputDangerState(Long id, int code) {
         latentDangerMapper.updateCheckInputDangerState(id, code);
+        if (patrolSyncSwitch) {
             //  巡检站端与中心级数据同步
             TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
                 @Override
@@ -402,6 +406,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                 }
             });
         }
+    }
 
     private String buildLocalHost() {
         try {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PatrolDataSyncServiceImpl.java

@@ -34,6 +34,7 @@ public class PatrolDataSyncServiceImpl implements IPatrolDataSyncService {
             try {
                 String message = buildSyncMessage(PatrolDataSyncTopicEnum.CHECK.getTopic(), check);
                 webMqttComponent.publish(PatrolDataSyncTopicEnum.EQM_PATROL_CREATED.getTopic(), message);
+                webMqttComponent.publish(PatrolDataSyncTopicEnum.CHECK.getTopic(), JSONObject.toJSONString(check));
                 String isOk = check.getIsOk();
                 long taskDetailId = check.getPlanTaskDetailId();
                 List<PlanTaskDetail> planTaskDetailList = planTaskDetailDao.findAllByIdAndStatus(taskDetailId, isOk);
@@ -42,6 +43,7 @@ public class PatrolDataSyncServiceImpl implements IPatrolDataSyncService {
                         String detailMessage = buildSyncMessage(PatrolDataSyncTopicEnum.PLAN_TASK_DETAIL.getTopic(), x);
                         webMqttComponent.publish(PatrolDataSyncTopicEnum.EQM_PATROL_CREATED.getTopic(), detailMessage);
                     });
+                    webMqttComponent.publish(PatrolDataSyncTopicEnum.PLAN_TASK_DETAIL.getTopic(), JSONObject.toJSONString(planTaskDetailList));
                 }
             } catch (Exception e) {
                 log.error("站端与中心级巡检数据【check或planTaskDetail】同步推送失败-----------" + e.getMessage());
@@ -64,8 +66,10 @@ public class PatrolDataSyncServiceImpl implements IPatrolDataSyncService {
                             String detailMessage = buildSyncMessage(PatrolDataSyncTopicEnum.PLAN_TASK_DETAIL.getTopic(), x);
                             webMqttComponent.publish(PatrolDataSyncTopicEnum.EQM_PATROL_CREATED.getTopic(), detailMessage);
                         });
+                        webMqttComponent.publish(PatrolDataSyncTopicEnum.PLAN_TASK_DETAIL.getTopic(), JSONObject.toJSONString(planTaskDetailList));
                     }
                 });
+                webMqttComponent.publish(PatrolDataSyncTopicEnum.CHECK.getTopic(), JSONObject.toJSONString(checkList));
             } catch (Exception e) {
                 log.error("站端与中心级巡检数据【check或planTaskDetail】同步推送失败-----------" + e.getMessage());
             }
@@ -80,6 +84,7 @@ public class PatrolDataSyncServiceImpl implements IPatrolDataSyncService {
                     String message = buildSyncMessage(PatrolDataSyncTopicEnum.CHECK_INPUT.getTopic(), x);
                     webMqttComponent.publish(PatrolDataSyncTopicEnum.EQM_PATROL_CREATED.getTopic(), message);
                 });
+                webMqttComponent.publish(PatrolDataSyncTopicEnum.CHECK_INPUT.getTopic(), JSONObject.toJSONString(checkInputList));
             }
         } catch (Exception e) {
             log.error("站端与中心级巡检数据【checkInput】同步推送失败-----------" + e.getMessage());
@@ -94,6 +99,7 @@ public class PatrolDataSyncServiceImpl implements IPatrolDataSyncService {
                     String message = buildSyncMessage(PatrolDataSyncTopicEnum.CHECK_SHOT.getTopic(), x);
                     webMqttComponent.publish(PatrolDataSyncTopicEnum.EQM_PATROL_CREATED.getTopic(), message);
                 });
+                webMqttComponent.publish(PatrolDataSyncTopicEnum.CHECK_SHOT.getTopic(), JSONObject.toJSONString(checkShotList));
             }
         } catch (Exception e) {
             log.error("站端与中心级巡检数据【checkShot】同步推送失败-----------" + e.getMessage());
@@ -106,6 +112,7 @@ public class PatrolDataSyncServiceImpl implements IPatrolDataSyncService {
             if (checkInputSyncBo != null) {
                 String message = buildSyncMessage(PatrolDataSyncTopicEnum.CHECK_INPUT_BO.getTopic(), checkInputSyncBo);
                 webMqttComponent.publish(PatrolDataSyncTopicEnum.EQM_PATROL_CREATED.getTopic(), message);
+                webMqttComponent.publish(PatrolDataSyncTopicEnum.CHECK_INPUT_BO.getTopic(), JSONObject.toJSONString(checkInputSyncBo));
             }
         } catch (Exception e) {
             log.error("站端与中心级巡检数据【CheckInputSyncBo】同步推送失败-----------" + e.getMessage());
@@ -120,6 +127,7 @@ public class PatrolDataSyncServiceImpl implements IPatrolDataSyncService {
                     String message = buildSyncMessage(PatrolDataSyncTopicEnum.CHECK_INPUT_BO.getTopic(), x);
                     webMqttComponent.publish(PatrolDataSyncTopicEnum.EQM_PATROL_CREATED.getTopic(), message);
                 });
+                webMqttComponent.publish(PatrolDataSyncTopicEnum.CHECK_INPUT_BO.getTopic(), JSONObject.toJSONString(checkInputSyncBoList));
             }
         } catch (Exception e) {
             log.error("站端与中心级巡检数据【CheckInputSyncBo】同步推送失败-----------" + e.getMessage());
@@ -130,8 +138,9 @@ public class PatrolDataSyncServiceImpl implements IPatrolDataSyncService {
     public void planTaskDataSync(PlanTask planTask) {
         try {
             if (planTask != null) {
-                String message = buildSyncMessage(PatrolDataSyncTopicEnum.CHECK_INPUT_BO.getTopic(), planTask);
+                String message = buildSyncMessage(PatrolDataSyncTopicEnum.PLAN_TASK.getTopic(), planTask);
                 webMqttComponent.publish(PatrolDataSyncTopicEnum.EQM_PATROL_CREATED.getTopic(), message);
+                webMqttComponent.publish(PatrolDataSyncTopicEnum.PLAN_TASK.getTopic(), JSONObject.toJSONString(planTask));
             }
         } catch (Exception e) {
             log.error("站端与中心级巡检数据【planTask】同步推送失败-----------" + e.getMessage());
@@ -146,6 +155,7 @@ public class PatrolDataSyncServiceImpl implements IPatrolDataSyncService {
                     String message = buildSyncMessage(PatrolDataSyncTopicEnum.PLAN_TASK.getTopic(), x);
                     webMqttComponent.publish(PatrolDataSyncTopicEnum.EQM_PATROL_CREATED.getTopic(), message);
                 });
+                webMqttComponent.publish(PatrolDataSyncTopicEnum.PLAN_TASK.getTopic(), JSONObject.toJSONString(planTaskList));
             }
         } catch (Exception e) {
             log.error("站端与中心级巡检数据【PlanTask】同步推送失败-----------" + e.getMessage());

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -57,6 +57,7 @@ import org.apache.commons.compress.utils.Sets;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
@@ -130,6 +131,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
     @Autowired
     private IPatrolDataSyncService patrolDataSyncService;
 
+    @Value("${dataSync.patrol.emqx.switch}")
+    private Boolean patrolSyncSwitch;
+
     private final String PATROL_PLAN_TASK_KEY = "PATROL_PLAN_ID:";
 
     private final String packageId = "消息/addCheckRule";
@@ -855,6 +859,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                 paramMap.put("next_gen_date", DateUtil.formatDatrToStr(now, "yyyy-MM-dd"));
             }
             planMapper.updPlanStatusOrGenDate(paramMap);// 更新下次任务生成日期
+            if (patrolSyncSwitch) {
                 //  巡检站端与中心级数据同步
                 TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
                     @Override
@@ -863,6 +868,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                         patrolDataSyncService.planTaskDataSync(planTaskList);
                     }
                 });
+            }
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             throw new  RuntimeException(e.getMessage());
@@ -1053,6 +1059,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                 paramMap.put("next_gen_date", DateUtil.formatDatrToStr(now, "yyyy-MM-dd"));
             }
             planMapper.updPlanStatusOrGenDate(paramMap);// 更新下次任务生成日期
+            if (patrolSyncSwitch) {
                 //  巡检站端与中心级数据同步
                 TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
                     @Override
@@ -1061,6 +1068,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                         patrolDataSyncService.planTaskDataSync(planTaskList);
                     }
                 });
+            }
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PointServiceImpl.java

@@ -37,6 +37,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.*;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
@@ -108,6 +109,9 @@ public class PointServiceImpl implements IPointService {
     @Autowired
     private IPatrolDataSyncService patrolDataSyncService;
 
+    @Value("${dataSync.patrol.emqx.switch}")
+    private Boolean patrolSyncSwitch;
+
     @Override
     @Transactional
     public Point addPoint(PointParam pointParam) {
@@ -668,6 +672,7 @@ public class PointServiceImpl implements IPointService {
 
         iPlanTaskDetailDao.deletePlanTaskDetailByPointId(idList); // 删除p_plan_task_detail相关行
         iPointDao.delPointById(idList);
+        if (patrolSyncSwitch) {
             //  巡检站端与中心级数据同步
             TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
                 @Override
@@ -676,6 +681,7 @@ public class PointServiceImpl implements IPointService {
                     patrolDataSyncService.planTaskDataSync(planTaskList);
                 }
             });
+        }
         return idList;
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/quartz/JobService.java

@@ -96,6 +96,9 @@ public class JobService implements IJobService {
     @Autowired
     JcsFeignClient jcsFeignClient;
 
+    @Value("${dataSync.patrol.emqx.switch}")
+    private Boolean patrolSyncSwitch;
+
 
     @Override
     @Transactional
@@ -379,6 +382,7 @@ public class JobService implements IJobService {
         } catch (Exception e) {
             log.error("数字换流站页面推送失败-----------" + e.getMessage());
         }
+        if (patrolSyncSwitch) {
             //  巡检站端与中心级数据同步
             TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
                 @Override
@@ -392,6 +396,7 @@ public class JobService implements IJobService {
                 }
             });
         }
+    }
 
     private void removeJob(String jobName) {
         log.debug("removeJob==jobName==" + jobName);