解决冲突

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipQrcodeRecord.java

@@ -31,7 +31,7 @@ public class EquipQrcodeRecord extends BaseEntity {
 
     @ApiModelProperty(value = "来源id alarm表或p_check_input")
     @TableField("source_id")
-    private Long sourceId;
+    private String sourceId;
 
     @ApiModelProperty(value = "状态(0:绿码,1:黄码,2:红码)")
     @TableField("status")

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificController.java

@@ -429,7 +429,7 @@ public class EquipmentSpecificController extends AbstractBaseController {
         equipQrcodeRecord.setSource(source);
         equipQrcodeRecord.setAlarmTime(new Date());
         equipQrcodeRecord.setStatus(status);
-        equipQrcodeRecord.setSourceId(Long.valueOf(sourceId));
+        equipQrcodeRecord.setSourceId(sourceId);
         equipQrcodeRecord.setBizOrgCode(spec.getBizOrgCode());
         equipQrcodeRecord.setBizOrgName(spec.getBizOrgName());
         equipQrcodeRecord.setSystemCode(spec.getSystemId());

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/IdxFeign.java

 package com.yeejoin.equipmanage.fegin;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.equipmanage.common.entity.publics.CommonResponse;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.util.List;
+
 
 /**
  * @author DELL
@@ -29,4 +30,8 @@ public interface IdxFeign {
     @RequestMapping(value = "/defect/alarm/{alarmLogId}", method = RequestMethod.GET)
     ResponseModel<JSONObject> queryDefectByBatchId(@PathVariable(value = "alarmLogId") String alarmLogId);
 
+    @RequestMapping(value = "/defect/check/list", method = RequestMethod.POST)
+    JSONObject queryDefectByCodes(@RequestBody(required = false) List<String> codes, @RequestParam String checkId);
+
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificAlarmLogMapper.java

@@ -46,4 +46,8 @@ public interface EquipmentSpecificAlarmLogMapper extends BaseMapper<EquipmentSpe
     List<EquipmentSpecificAlarmLog> getAlarmLogInfoList(String equipmentCode, String nameKeys, String value, String isCleanTime, String bizOrgCode);
 
     void updateStatusByAlarm(String confirmUserName, String resolveResult , String confirmTypeName);
+
+   List<Map<String,Object>> getEquipAlarmList(String equipmentSpecificId);
+
+   List <String> getEquipAlarmIdList(String equipmentSpecificId);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java

@@ -268,4 +268,8 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
 
     String updateEquipSpecificStatusByCheckInput(String id);
 
+    List<Map<String,Object>> selectListByPatrolCheck(String id);
+
+    List<String> selectIdsByPatrolCheck(String id);
+
 }

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

@@ -949,7 +949,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                         equipQrcodeRecord.setSource("equip");
                         equipQrcodeRecord.setAlarmTime(new Date());
                         equipQrcodeRecord.setStatus(EquipQrcodeColorEnum.RED.getCode());
-                        equipQrcodeRecord.setSourceId(action.getId());
+                        equipQrcodeRecord.setSourceId(action.getId().toString());
                         equipQrcodeRecord.setBizOrgCode(action.getBizOrgCode());
                         equipQrcodeRecord.setBizOrgName(action.getBizOrgName());
                         equipQrcodeRecord.setSystemCode(action.getSystemIds());

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmLogMapper.xml

@@ -286,4 +286,27 @@
         WHERE
         confirm_type is null or clean_time is null
     </update>
+
+    <select id="getEquipAlarmList" resultType="map">
+        SELECT
+            equipment_specific_index_name AS alarmType,
+            create_date AS alarmDate,
+            clean_time AS cleanTime,
+            concat( equipment_specific_name, equipment_specific_index_name ) AS alarmContent,
+            ( CASE clean_time is NULL  WHEN TRUE THEN '未消除' ELSE '已消除' END ) AS clearStatus,
+            id AS id
+        FROM
+            wl_equipment_specific_alarm_log
+        WHERE
+              equipment_specific_id in (#{equipmentSpecificId})
+    </select>
+
+    <select id="getEquipAlarmIdList" resultType="string">
+        select
+            id as id
+        from
+            wl_equipment_specific_alarm_log
+        where
+            equipment_specific_id in (#{equipmentSpecificId})
+    </select>
 </mapper>
\ No newline at end of file

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -1877,7 +1877,7 @@
         WHERE
         (
         0 <![CDATA[<>]]> find_in_set(`fs`.`id`, `s`.`system_id`)
-        ) limt 1
+        ) limit 1
         ) AS `chargePersonName`
         FROM
         `wl_equipment_specific_index` `si`
@@ -2358,4 +2358,29 @@
         WHERE ci.id = #{id}
     </select>
 
+    <select id="selectListByPatrolCheck" resultType="map">
+        SELECT
+            c.*
+        FROM
+            p_check c
+                LEFT JOIN p_check_input ci on  ci.check_id = c.id
+                LEFT JOIN p_point_classify ppc on  ci .point_classify_id = ppc.id
+        WHERE
+            ppc.equipment_id = #{id}
+    </select>
+
+
+    <select id="selectIdsByPatrolCheck" resultType="string">
+        SELECT
+            c.id
+        FROM
+            p_check c
+                LEFT JOIN p_check_input ci on  ci.check_id = c.id
+                LEFT JOIN p_point_classify ppc on  ci .point_classify_id = ppc.id
+        WHERE
+            ppc.equipment_id = #{id}
+    </select>
+
+
+
 </mapper>
\ No newline at end of file