增加 idx修改巡检项不合格装备的二维码状态

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/RiskDataVo.java

@@ -17,5 +17,7 @@ public class RiskDataVo {
 
     private String indexValue;
 
+    private String traceId;
+
     private RiskBizInfoVo bizInfo;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/SendToMsgRiskEquipInfoVo.java

@@ -23,5 +23,7 @@ public class SendToMsgRiskEquipInfoVo {
 
     private String bizOrgCode;
 
+    private String traceId;
+
     private Boolean reportIsAlarm;
 }

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

@@ -414,6 +414,17 @@ public class EquipmentSpecificController extends AbstractBaseController {
         return CommonResponseUtil.success();
     }
 
+    @GetMapping(value = "/status/checkInput")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "idx修改巡检项对应装备二维码状态", notes = "idx修改巡检项对应装备二维码状态")
+    public ResponseModel updateEquipSpecificStatusByCheckInput(  String id){
+        //查询 巡检项所绑定装备
+        String equipId = equipmentSpecificSerivce.updateEquipSpecificStatusByCheckInput(id);
+        //修改装备二维码状态为合格  此处为0代表绿色 是idx只有在合格是才会触发此接口
+        equipmentSpecificSerivce.updateEquipSpecificStatus("0", equipId);
+        return CommonResponseUtil.success();
+    }
+
     @GetMapping(value = "/info/paomo")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "查询泡沫系统指标", notes = "查询泡沫系统指标")

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

@@ -262,4 +262,6 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
 
     void updateEquipSpecificStatus(String status,String id);
 
+    String updateEquipSpecificStatusByCheckInput(String id);
+
 }

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

@@ -286,4 +286,6 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
     Map<String,Object> getStationCode(Long id);
 
     void updateEquipSpecificStatus(String status, String id);
+
+    String updateEquipSpecificStatusByCheckInput( String id);
 }

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

@@ -2098,4 +2098,10 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     public void updateEquipSpecificStatus(String status, String id){
        equipmentSpecificMapper.updateEquipSpecificStatus(status,id);
     }
+
+    @Override
+    public String updateEquipSpecificStatusByCheckInput( String id){
+        equipmentSpecificMapper.updateEquipSpecificStatusByCheckInput(id);
+    }
+
 }

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

@@ -1515,6 +1515,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         detailsVos.add(dynamicDetailsVo);
         infoVo.setDynamicDetails(detailsVos);
         dataVo.setBizInfo(infoVo);
+        dataVo.setTraceId(detailVo.getEquipInfo().getTraceId());
         mqttSendGateway.sendToMqtt(riskTopic, JSON.toJSONString(dataVo));
     }
 

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

@@ -295,8 +295,8 @@ public class CheckController extends AbstractBaseController {
             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")));
-            if (map.containsKey("equipId")){
-            equipInfoVo.setEquipId(map.get("equipId").toString());
+            if (map.containsKey("traceId")){
+            equipInfoVo.setTraceId(map.get("traceId").toString());
             }
             alarmInfoVo.setKey(String.valueOf(map.get("inputItem")));
             alarmInfoVo.setValue(String.valueOf(map.get("input_value")));

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

@@ -23,6 +23,8 @@ public class SendToMsgRiskEquipInfoVo {
 
     private String bizOrgCode;
 
-    private String equipId;
+    private String traceId;
+
+
 
 }

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

@@ -2327,4 +2327,14 @@
         update wl_equipment_specific set equip_status = #{} where id = #{id}
     </update>
 
+
+    <select id="updateEquipSpecificStatusByCheckInput">
+        SELECT
+            ppc.equipment_id
+        FROM
+            p_check_input ci
+                LEFT JOIN `p_point_classify` ppc ON ci .point_classify_id = ppc.id
+        WHERE ci.id = #{id}
+    </select>
+
 </mapper>
\ No newline at end of file

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

@@ -2194,7 +2194,7 @@
             ii.biz_org_code,
             ii.biz_org_name,
             ci.score ,
-            ppc.equipment_id
+            ci.id as traceId
         FROM
             p_check c
                 LEFT JOIN p_check_input ci ON ci.check_id = c.id