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 a664300d..0553cf58 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 @@ -109,7 +109,7 @@ public class AlertMessageController extends BaseController @PreAuthorize("@ss.hasPermi('inMonitoring:alertMessage:listByEquId')") @GetMapping("/{equId}") @ApiOperation("获取界面ALlertMessage信息") - public TableDataInfo listByEquId(@PathVariable("equId")Long equId) + public TableDataInfo listByEquId(@PathVariable("equId")String equId) { List list = alertMessageService.selectAlertMessageListByEquId(equId); 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 580fe2a6..ddfdcfbf 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 @@ -47,7 +47,7 @@ public interface AlertMessageMapper public List selectAlertMessageList(AlertDto alertMessage); public List selectStaticAlertMessageList(); - public ArrayList selectAlertMessageByEquId(Long Equid); + public ArrayList selectAlertMessageByEquId(String Equid); /** * 统计设备类型、预警等级、时间的预警次数 diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertMessageService.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertMessageService.java index f528a1ad..03655ea1 100644 --- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertMessageService.java +++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertMessageService.java @@ -32,7 +32,7 @@ public interface IAlertMessageService */ public List selectAlertMessageList(AlertDto alertMessage); public List selectStaticAlertMessageList(); - public List selectAlertMessageListByEquId(Long equId); + public List selectAlertMessageListByEquId(String equId); /** * 统计设备类型、预警等级、时间的预警次数 diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/AlertMessageServiceImpl.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/AlertMessageServiceImpl.java index d0708772..18dedbae 100644 --- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/AlertMessageServiceImpl.java +++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/AlertMessageServiceImpl.java @@ -60,7 +60,7 @@ public class AlertMessageServiceImpl implements IAlertMessageService } @Override - public List selectAlertMessageListByEquId(Long equId) + public List selectAlertMessageListByEquId(String equId) { ArrayList alertMessagelist = alertMessageMapper.selectAlertMessageByEquId(equId); return alertMessagelist; diff --git a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml index ac3e2078..ef1c2c8b 100644 --- a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml +++ b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml @@ -124,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where am.id = #{id} - where g.equ_id = #{equid} AND a.batch = (