9.24更新最新版

ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlertMessageController.java

@@ -92,7 +92,7 @@ public class AlertMessageController extends BaseController
      * 查询预警信息统计列表
      */
     @PreAuthorize("@ss.hasPermi('inMonitoring:alertMessage:list')")
-    @GetMapping ("/list")
+    @PostMapping ("/list")
     @ApiOperation("查询预警信息")
     @Log(title = "查询预警信息", businessType = BusinessType.UPDATE)
 
@@ -129,7 +129,17 @@ public class AlertMessageController extends BaseController
         return AjaxResult.success(dto);
     }
 
-
+    /**
+     * 删除预警信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:message:remove')")
+    @ApiOperation("删除预警信息")
+    @Log(title = "删除预警信息", businessType = BusinessType.UPDATE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(alertMessageService.deleteAlertMessageByIds(ids));
+    }
 
    }
 

ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/DictAlarmParamController.java

@@ -33,8 +33,8 @@ public class DictAlarmParamController extends BaseController
     @ApiOperation("获取预警参数")
     @PreAuthorize("@ss.hasPermi('system:param:byTable')")
     @GetMapping("/byTable")
-    public AjaxResult getParamsByTableName(@RequestParam String tableName) {
+    public AjaxResult getParamsByTableName() {
-        return AjaxResult.success("获取预警参数成功",dictAlarmParamService.getParamsByTableName(tableName));
+        return AjaxResult.success("获取预警参数成功",dictAlarmParamService.getParamsByTableName());
     }
     /**
      * 查询【请填写功能名称】列表

ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlertMessage.java

@@ -23,8 +23,6 @@ public class AlertMessage
     /** ID */
     private Long id;
 
-    /** 批次 */
-    private int batch;
 
     /** 设备ID */
     @Excel(name = "设备ID")

ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/AlertMessageMapper.java

@@ -43,7 +43,7 @@ public interface AlertMessageMapper
      * @param alertMessage 故障统计
      * @return 故障统计集合
      */
-    public List<AlertMessage> selectAlertMessageList(AlertMessage alertMessage);
+    public List<AlertMessage> selectAlertMessageList(AlertDto alertMessage);
     public ArrayList<AlertMessage> selectAlertMessageByEquId(Long Equid);
 
     /**

ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquBaseMapper.java

@@ -5,6 +5,9 @@ import java.util.Map;
 
 import com.alops.system.domain.EquBase;
 import com.alops.system.domain.dto.EquBaseQueryDto;
+import com.alops.system.domain.dto.MonitorLastDto;
+import com.alops.system.domain.dto.MonitorListDto;
+import com.alops.system.domain.dto.MonitorStatisticDto;
 import com.alops.system.domain.vo.imageVo;
 import com.alops.system.domain.vo.queryEquBaseVO;
 import org.apache.ibatis.annotations.Mapper;

ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml

@@ -300,11 +300,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="findEquBaseList"  resultMap="EquBaseResult">
-        <include refid="selectEquBaseVo"/>
-    </select>
-
-
 
     <update id="batchUpdateFailureFrequency">
         UPDATE equ_base