diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/MonitorLastDto.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/MonitorLastDto.java index 3a571f1f..4cf5d6f9 100644 --- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/MonitorLastDto.java +++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/MonitorLastDto.java @@ -28,6 +28,7 @@ public class MonitorLastDto { private Date installDate; private String inCharge; private String status; + private String brand; private int warranty; private String equImage; diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/MonitorListDto.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/MonitorListDto.java index bf07d07c..c9bc90a9 100644 --- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/MonitorListDto.java +++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/MonitorListDto.java @@ -26,6 +26,7 @@ public class MonitorListDto { private String health; private int fanSpeed; private String contWorkPeriod; + private String brand; private int AlertCount;; private int unhandledAlertCount; 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 04ce9591..528dee53 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 @@ -259,6 +259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" c.health, c.fanSpeed, c.contWorkPeriod, + c.brand, c.unhandledAlertCount, c.AlertCount FROM ( @@ -279,6 +280,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" g.health, g.fan_speed AS fanSpeed, g.cont_work_period AS contWorkPeriod, + b.brand, (SELECT COUNT(1) FROM alert_message a WHERE a.equ_id = b.id AND a.status = 'UNHANDLED') AS unhandledAlertCount, @@ -351,6 +353,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.equ_type as equTypeId, t.name as equTypeName, b.status, + b.brand, b.manufacture as equManuId, m.name as equManuName,