1、报警记录添加处理接口；

mh-admin/src/main/java/com/mh/web/controller/alarm/AlarmRecordsController.java

@@ -4,8 +4,10 @@ import com.mh.common.annotation.Log;
 import com.mh.common.core.controller.BaseController;
 import com.mh.common.core.domain.AjaxResult;
 import com.mh.common.core.domain.entity.AlarmRecords;
+import com.mh.common.core.domain.entity.AlarmRules;
 import com.mh.common.core.page.TableDataInfo;
 import com.mh.common.enums.BusinessType;
+import com.mh.common.utils.DateUtils;
 import com.mh.system.service.operation.IAlarmRecordsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -60,5 +62,16 @@ public class AlarmRecordsController extends BaseController {
     {
         return toAjax(alarmRecordsService.deleteAlarmRecordsByIds(acdIds));
     }
+
+    /**
+     * 修改报警规则记录信息
+     */
+    @PreAuthorize("@ss.hasPermi('alarm:ard:edit')")
+    @Log(title = "报警记录管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody AlarmRecords alarmRecords)
+    {
+        return toAjax(alarmRecordsService.updateAlarmRecord(alarmRecords));
+    }
     
 }

mh-admin/src/main/java/com/mh/web/controller/device/DeviceInOutManageController.java

@@ -61,27 +61,27 @@ public class DeviceInOutManageController extends BaseController {
         return toAjax(deviceInOutManageService.insertDeviceInOutManage(deviceInOutManage, getUsername()));
     }
 
-//    /**
+    /**
-//     * 修改备品/备件出入库管理流水记录信息
+     * 修改备品/备件出入库管理流水记录信息
-//     */
+     */
-//    @PreAuthorize("@ss.hasPermi('device:spareInOut:edit')")
+    @PreAuthorize("@ss.hasPermi('device:spareInOut:edit')")
-//    @Log(title = "备品/备件出入库管理流水记录管理", businessType = BusinessType.UPDATE)
+    @Log(title = "备品/备件出入库管理流水记录管理", businessType = BusinessType.UPDATE)
-//    @PutMapping
+    @PutMapping
-//    public AjaxResult edit(@Validated @RequestBody DeviceInOutManage deviceInOutManage)
+    public AjaxResult edit(@Validated @RequestBody DeviceInOutManage deviceInOutManage)
-//    {
+    {
-//        deviceInOutManage.setUpdateBy(getUsername());
+        deviceInOutManage.setUpdateBy(getUsername());
-//        return toAjax(deviceInOutManageService.updateDeviceInOutManage(deviceInOutManage));
+        return toAjax(deviceInOutManageService.updateDeviceInOutManage(deviceInOutManage));
-//    }
+    }
-//
+
-//    /**
+    /**
-//     * 删除备品/备件出入库管理流水记录管理
+     * 删除备品/备件出入库管理流水记录管理
-//     */
+     */
-//    @PreAuthorize("@ss.hasPermi('device:spareInOut:remove')")
+    @PreAuthorize("@ss.hasPermi('device:spareInOut:remove')")
-//    @Log(title = "备品/备件出入库管理流水记录管理", businessType = BusinessType.DELETE)
+    @Log(title = "备品/备件出入库管理流水记录管理", businessType = BusinessType.DELETE)
-//    @DeleteMapping("/{spareIds}")
+    @DeleteMapping("/{spareIds}")
-//    public AjaxResult remove(@PathVariable String[] spareIds)
+    public AjaxResult remove(@PathVariable String[] spareIds)
-//    {
+    {
-//        return toAjax(deviceInOutManageService.deleteDeviceInOutManageByIds(spareIds));
+        return toAjax(deviceInOutManageService.deleteDeviceInOutManageByIds(spareIds));
-//    }
+    }
 
 }

mh-admin/src/main/java/com/mh/web/controller/device/MaintainInfoController.java

@@ -90,10 +90,8 @@ public class MaintainInfoController extends BaseController {
     }
 
     /**
-     * 删除维护设备管理
+     * 查询维保量汇总
      */
-    @PreAuthorize("@ss.hasPermi('device:maintain:remove')")
-    @Log(title = "维护设备管理", businessType = BusinessType.DELETE)
     @GetMapping("/maintainSum")
     public AjaxResult sumMaintain(@RequestParam(value= "buildingId", required=false)String buildingId,
                                   @RequestParam(value= "curDate", required=false)String curDate) {

mh-admin/src/main/java/com/mh/web/controller/device/OperationController.java

@@ -2,6 +2,7 @@ package com.mh.web.controller.device;
 
 import com.mh.common.annotation.ControlDeviceAno;
 import com.mh.common.annotation.Log;
+import com.mh.common.config.MHConfig;
 import com.mh.common.core.controller.BaseController;
 import com.mh.common.core.domain.AjaxResult;
 import com.mh.common.core.domain.dto.DeviceMonitorDTO;
@@ -35,6 +36,9 @@ public class OperationController extends BaseController {
     @Value("${control.topic}")
     String controlTopic;
 
+    @Autowired
+    private MHConfig mhConfig;
+
     private final ICollectionParamsManageService iCollectionParamsManageService;
 
     private final IOperationDeviceService iOperationService;
@@ -92,9 +96,10 @@ public class OperationController extends BaseController {
     public AjaxResult operationDevice(@RequestBody List<OrderEntity> changeValues) {
         try {
             String sendOrder = iOperationService.operationDevice(changeValues);
+            String name = mhConfig.getName();
             // 获取mqtt操作队列(后期通过mqtt队列配置发送主题)
-            log.info("发送主题：{},消息：{}", controlTopic, sendOrder);
+            log.info("发送主题：{},消息：{}", name + "/"+ controlTopic, sendOrder);
-//            iMqttGatewayService.publish(controlTopic, sendOrder, 1);
+            iMqttGatewayService.publish(name + "/"+ controlTopic, sendOrder, 1);
         } catch (Exception e) {
             log.error("设备操作失败", e);
             return AjaxResult.error();

mh-common/src/main/java/com/mh/common/core/domain/entity/AlarmRecords.java

@@ -78,6 +78,19 @@ public class AlarmRecords implements Serializable {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private Map<String, Object> params;
 
+    /**
+     * 状态 0：未处理 1：已处理
+     */
+    private int status;
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
     public Map<String, Object> getParams() {
         return params;
     }

mh-system/src/main/java/com/mh/system/service/operation/IAlarmRecordsService.java

@@ -17,7 +17,7 @@ public interface IAlarmRecordsService {
 
     void insertAlarmRecord(AlarmRecords alarmRecords);
 
-    void updateAlarmRecord(AlarmRecords alarmRecords);
+    int updateAlarmRecord(AlarmRecords alarmRecords);
 
     List<AlarmRecords> selectAlarmRecordsList(AlarmRecords alarmRecords);
 

mh-system/src/main/java/com/mh/system/service/operation/impl/AlarmRecordsServiceImpl.java

@@ -48,8 +48,8 @@ public class AlarmRecordsServiceImpl implements IAlarmRecordsService {
     }
 
     @Override
-    public void updateAlarmRecord(AlarmRecords alarmRecords) {
+    public int updateAlarmRecord(AlarmRecords alarmRecords) {
-        alarmRecordsMapper.updateById(alarmRecords);
+        return alarmRecordsMapper.updateById(alarmRecords);
     }
 
     @Override
@@ -103,6 +103,9 @@ public class AlarmRecordsServiceImpl implements IAlarmRecordsService {
         if (!StringUtils.isEmpty(alarmRecords.getContent())) {
             queryWrapper.like("content", alarmRecords.getContent());
         }
+        // 是否已处理，0：未处理，1：已处理
+        queryWrapper.eq("status", alarmRecords.getStatus());
+
         queryWrapper.orderByDesc("create_time");
         return alarmRecordsMapper.selectList(queryWrapper);
     }

sql/2025-05-07-未执行.sql

@@ -0,0 +1,3 @@
+-- 新增sql
+ALTER TABLE public.alarm_records ADD status int NULL DEFAULT 0;
+COMMENT ON COLUMN public.alarm_records.status IS '报警状态：0未处理，1已处理';