任务 13675

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

 package com.yeejoin.amos.patrol.quartz;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import com.yeejoin.amos.patrol.business.bo.CheckInputSyncBo;
+import com.yeejoin.amos.patrol.business.bo.PlanTaskSyncBo;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import com.yeejoin.amos.patrol.business.dao.mapper.CheckInputMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.MsgMapper;
@@ -26,6 +28,7 @@ import com.yeejoin.amos.patrol.mqtt.WebMqttComponent;
 import org.quartz.Job;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -530,6 +533,11 @@ public class JobService implements IJobService {
                 if (PlanTaskFinishStatusEnum.NOTSTARTED.getValue() == planTask.getFinishStatus()) {
                     planTask.setFinishStatus(PlanTaskFinishStatusEnum.UNDERWAY.getValue());
                     iPlanTaskDao.save(planTask);
+                    if (planTask != null) {
+                        PlanTaskSyncBo planTaskSyncBo = buildPlanTaskBo(planTask);
+                        String message = buildSyncMessage(PatrolDataSyncTopicEnum.PLAN_TASK.getTopic(), planTaskSyncBo);
+                        webMqttComponent.publish(PatrolDataSyncTopicEnum.EQM_PATROL_CREATED.getTopic(), message);
+                    }
                 }
             } else if (XJConstant.STATUS_MONITOR_END.equals(jobType)) {
                 if (PlanTaskFinishStatusEnum.UNDERWAY.getValue() == planTask.getFinishStatus()) {
@@ -543,6 +551,19 @@ public class JobService implements IJobService {
         removeJob(jobName);
     }
 
+    public PlanTaskSyncBo buildPlanTaskBo(PlanTask planTask) {
+        PlanTaskSyncBo taskSyncBo = new PlanTaskSyncBo();
+        BeanUtils.copyProperties(planTask, taskSyncBo);
+        return taskSyncBo;
+    }
+
+    public String buildSyncMessage(String topic, Object object) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("topic", topic);
+        map.put("data", object);
+        return JSON.toJSONString(map, SerializerFeature.WriteMapNullValue);
+    }
+
     @Override
     public void msgAddJob(Msg msg) {
         addJob("msg", XJConstant.MESSAGE_PUSH, msg.getId(), msg.getFixedTime());

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -83,7 +83,7 @@
             <if test="pointName!=null">and b.name like concat(concat("%",#{pointName}),"%")</if>
             <if test="pointNo!=null">and b.point_no like concat('%',#{pointNo},'%')</if>
             <if test="isFixed!=null">and b.is_fixed = #{isFixed}</if>
-            <if test="isOK!=null and isOk!=''">and a.is_OK = #{isOK}</if>
+            <if test="isOK!=null and isOK!=''">and a.is_OK = #{isOK}</if>
             <if test="planId!=null">and a.plan_Id = #{planId}</if>
             <if test="planTaskId!=null">and a.plan_task_id = #{planTaskId}</if>
             <if test="userId!=null">and find_in_set(#{userId}, a.user_id) > 0</if>
@@ -292,7 +292,7 @@
             <if test="pointName!=null">and b.name like concat(concat("%",#{pointName}),"%")</if>
             <if test="pointNo!=null">and b.point_no like concat('%',#{pointNo},'%')</if>
             <if test="isFixed!=null">and b.is_fixed = #{isFixed}</if>
-            <if test="isOK!=null">and a.is_OK = #{isOK}</if>
+            <if test="isOK!=null and isOK!=''">and a.is_OK = #{isOK}</if>
             <if test="planId!=null">and a.plan_Id = #{planId}</if>
             <if test="planTaskId!=null">and a.plan_task_id = #{planTaskId}</if>
             <if test="userId!=null">and find_in_set(#{userId}, a.user_id) > 0</if>