修改代码

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

@@ -230,4 +230,6 @@ public interface EquipmentSpecificAlarmMapper extends BaseMapper<EquipmentSpecif
 
     List<Map<String, Object>> alarmTrend(String bizOrgCode);
     List<Map<String, Object>> stationInfo();
+
+    void updateStatusByAlarm();
 }

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

@@ -147,6 +147,7 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
     String confirmUserName = "系统自动处理";
     String resolveResult = DateUtils.getDateNowString()+"系统收到设备复归（已消除）信号，系统自动处理。";
     String confirmTypeName = "故障";
+    equipmentSpecificAlarmMapper.updateStatusByAlarm();
     equipmentSpecificAlarmLogMapper.updateStatusByAlarm(confirmUserName,resolveResult,confirmTypeName);
 
     }

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

@@ -12,6 +12,11 @@
         <result column="status" property="status"/>
         <result column="confirmType" property="confirmType"/>
     </resultMap>
+
+    <update id="updateStatusByAlarm">
+        update wl_equipment_specific_alarm set status = 0,recovery_date = now() where status = 1
+    </update>
+
     <select id="getEquipmentSpecAlarmByIotCode"
             resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm">
         SELECT