diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlertMessageController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlertMessageController.java index ff795ab2..51756ee8 100644 --- a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlertMessageController.java +++ b/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)); + } } diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/DictAlarmParamController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/DictAlarmParamController.java index 57cc7033..b87fcda6 100644 --- a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/DictAlarmParamController.java +++ b/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) { - return AjaxResult.success("获取预警参数成功",dictAlarmParamService.getParamsByTableName(tableName)); + public AjaxResult getParamsByTableName() { + return AjaxResult.success("获取预警参数成功",dictAlarmParamService.getParamsByTableName()); } /** * 查询【请填写功能名称】列表 diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlertMessage.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlertMessage.java index f8c3a44b..c80ad07f 100644 --- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlertMessage.java +++ b/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") diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/AlertMessageMapper.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/AlertMessageMapper.java index 8ff587fa..98050cf4 100644 --- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/AlertMessageMapper.java +++ b/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 selectAlertMessageList(AlertMessage alertMessage); + public List selectAlertMessageList(AlertDto alertMessage); public ArrayList selectAlertMessageByEquId(Long Equid); /** diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquBaseMapper.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquBaseMapper.java index 9c99d3b8..bddf5e62 100644 --- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquBaseMapper.java +++ b/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; diff --git a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml index 9dc35987..646b96a9 100644 --- a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml +++ b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml @@ -300,11 +300,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - UPDATE equ_base