更新冲突代码

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -219,6 +219,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Value("${equip.risk.model.topic}")
     private String riskTopic;
 
+    @Value("${equip.message.create.topic}")
+    private String riskTopicCreate;
+
     private static String canvasTopic;
     @Value("${equip.point.equipmentdata.topic}")
     public void setCanvasTopic(String canvasTopic){
@@ -1462,9 +1465,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 
             TopicEntityVo topicEntityVo = new TopicEntityVo();
             topicEntityVo.setIotCode(equipmentSpeIndex.getIotCode());
-            topicEntityVo.setTopic(riskTopic);
+            topicEntityVo.setTopic(riskTopicCreate);
             topicEntityVo.setMessage(JSON.toJSONString(detailVo));
-            mqttSendGateway.sendToMqtt(riskTopic, JSON.toJSONString(topicEntityVo));
+            mqttSendGateway.sendToMqtt(riskTopicCreate, JSON.toJSONString(topicEntityVo));
         });
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java

@@ -4,7 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
-import com.yeejoin.amos.patrol.business.dto.CheckDto;
+import com.yeejoin.amos.patrol.business.dao.mapper.CheckMapper;
+import com.yeejoin.amos.patrol.business.dto.*;
 import com.yeejoin.amos.patrol.business.param.CheckInfoPageParam;
 import com.yeejoin.amos.patrol.business.param.CheckRecordParam;
 import com.yeejoin.amos.patrol.business.param.CheckStatisticalParam;
@@ -101,6 +102,12 @@ public class CheckController extends AbstractBaseController {
     @Autowired
     private WebMqttComponent webMqttComponent;
 
+    @Value("${patrol.message.create.topic}")
+    private String patrolRiskCreateTopic;
+
+    @Autowired
+    private CheckMapper checkMapper;
+
     /**
      *
      * 巡查记录列表
@@ -239,6 +246,9 @@ public class CheckController extends AbstractBaseController {
                     });
 
                 }
+
+                List<Map<String, Object>> checkInputItems = checkMapper.queryCheckInputItemsByCheckId(checkDto.getCheckId());
+                publishDataToMessage(checkInputItems);
                 is.pointCheckInfoPushToB(checkDto.getCheckId());
                 //数字换流站页面刷新
                 try {
@@ -259,8 +269,34 @@ public class CheckController extends AbstractBaseController {
         }
     }
 
-
-
+    /**
+     * 巡检组装发送风险消息
+     * @param
+     */
+    public void publishDataToMessage(List<Map<String, Object>> checkInputItems) {
+        for (Map<String, Object> map : checkInputItems) {
+            SendToMsgRiskDetailVo detailVo = new SendToMsgRiskDetailVo();
+            SendToMsgRiskEquipInfoVo equipInfoVo = new SendToMsgRiskEquipInfoVo();
+            SendToMsgRiskAlarmInfoVo alarmInfoVo = new SendToMsgRiskAlarmInfoVo();
+            equipInfoVo.setId(String.valueOf(map.get("id")));
+            equipInfoVo.setName(String.valueOf(map.get("inputItem")));
+            equipInfoVo.setCode(String.valueOf(map.get("item_no")));
+            equipInfoVo.setBizOrgCode(String.valueOf(map.get("biz_org_code")));
+            equipInfoVo.setBizOrgName(String.valueOf(map.get("biz_org_name")));
+
+            alarmInfoVo.setKey(String.valueOf(map.get("inputItem")));
+            alarmInfoVo.setValue(String.valueOf(map.get("input_value")));
+
+            TopicEntityVo topicEntityVo = new TopicEntityVo();
+            topicEntityVo.setTopic(patrolRiskCreateTopic);
+            topicEntityVo.setMessage(JSON.toJSONString(detailVo));
+            try {
+                webMqttComponent.publish(patrolRiskCreateTopic, JSON.toJSONString(topicEntityVo));
+            } catch (Exception e) {
+                log.error("推送失败-----------" + e.getMessage());
+            }
+        }
+    }
 
     /**
      * 巡检计划查询

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/CheckMapper.java

@@ -277,4 +277,5 @@ public interface CheckMapper extends BaseMapper {
 
 	List<Map<String, Object>> selectCheckById(@Param(value = "taskId") Long taskId, @Param(value = "pointId") Long pointId);
 
+	List<Map<String, Object>> queryCheckInputItemsByCheckId(@Param(value="checkId") long checkId);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dto/SendToMsgRiskAlarmInfoVo.java

+package com.yeejoin.amos.patrol.business.dto;
+
+import lombok.Data;
+
+/**
+ * @author keyong
+ * @title: SendToMsgRiskAlarmInfoVo
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2023/5/22 15:24
+ */
+@Data
+public class SendToMsgRiskAlarmInfoVo {
+
+    private String key;
+
+    private String value;
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dto/SendToMsgRiskDetailVo.java

+package com.yeejoin.amos.patrol.business.dto;
+
+import lombok.Data;
+
+/**
+ * @author keyong
+ * @title: SendToMsgRiskDetailVo
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2023/5/22 15:16
+ */
+@Data
+public class SendToMsgRiskDetailVo {
+
+    private SendToMsgRiskEquipInfoVo equipInfo;
+
+    private SendToMsgRiskAlarmInfoVo alarmInfo;
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dto/SendToMsgRiskEquipInfoVo.java

+package com.yeejoin.amos.patrol.business.dto;
+
+import lombok.Data;
+
+/**
+ * @author keyong
+ * @title: SendToMsgRiskEquipInfoVo
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2023/5/22 15:21
+ */
+@Data
+public class SendToMsgRiskEquipInfoVo {
+
+    private String id;
+
+    private String name;
+
+    private String code;
+
+    private String bizOrgName;
+
+    private String bizOrgCode;
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dto/TopicEntityVo.java

+package com.yeejoin.amos.patrol.business.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author keyong
+ * @title: TopicVo
+ * <pre>
+ * @description:
+ * </pre>
+ * @date 2020/11/13 9:15
+ */
+@Data
+@ApiModel(description = "订阅主题Vo")
+public class TopicEntityVo {
+
+    private String topic;
+
+    private String iotCode;
+
+    private String message;
+
+    private String type;
+
+    // 若是车辆返回车牌号
+    private String code;
+}

amos-boot-system-patrol/src/main/resources/application.properties

@@ -51,6 +51,8 @@ amosRefresh.danger.topic =patrolDangerInsertOrUpdate
 amosRefresh.patrol.topic =patrolCheckInsert
 patrol.point.classify.topic=patrol/point/classify
 patrol.topic=patrol/#
+# \u7AD9\u7AEFmessage\u76D1\u542C\u4E3B\u9898
+patrol.message.create.topic=emq.risk.created
 #\u505C\u6B62\u901A\u8FC7WEB\u516C\u5F00\u6240\u6709\u7AEF\u70B9
 #management.endpoints.web.exposure.exclude=*
 ## redis\u5931\u6548\u65F6\u95F4

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

@@ -2177,4 +2177,32 @@
         WHERE pc.plan_task_id = #{taskId} AND pc.point_id = #{pointId} AND pc.is_ok = 3
     </select>
 
+    <select id="queryCheckInputItemsByCheckId" resultType="Map">
+        SELECT
+            c.id,
+            ii.item_no,
+            ii.NAME inputItem,
+            ci.input_value,
+            CASE ci.is_ok
+                WHEN 1 THEN
+                    '合格'
+                WHEN 2 THEN
+                    '不合格'
+                ELSE
+                    '漏检'
+                END AS is_ok,
+            ii.biz_org_code,
+            ii.biz_org_name,
+            ci.score
+        FROM
+            p_check c,
+            p_check_input ci,
+            p_input_item ii
+        WHERE
+            c.id = ci.check_id
+          AND ii.id = ci.input_id
+          AND c.id = #{checkId}
+        ORDER BY
+            ci.order_no
+    </select>
 </mapper>
\ No newline at end of file