Browse Source

1.删除devWarn字段,数据库对应删除

hxd 1 month ago
parent
commit
357f59b972

+ 1 - 5
portal-service-common/src/main/java/com/hfln/portal/common/dto/data/device/DeviceDTO.java

@@ -59,11 +59,7 @@ public class DeviceDTO extends BaseVO {
     @Schema(description = "在线状态:0-离线,1-在线")
     private Integer online;
 
-    /**
-     * 设备报警:0-正常,1-报警
-     */
-    @Schema(description = "设备报警:0-正常,1-报警")
-    private Integer devWarn;
+
 
     /**
      * 软件版本号

+ 1 - 4
portal-service-common/src/main/java/com/hfln/portal/common/dto/data/group/GroupDTO.java

@@ -34,10 +34,7 @@ public class GroupDTO extends BaseVO {
      */
     private Integer  onlineDevice;
 
-    /**
-     * 群组下设备告警状态数量
-     */
-    private Integer  warningDevice;
+
 
 
 }

+ 1 - 1
portal-service-common/src/main/java/com/hfln/portal/common/request/device/DeviceListParams.java

@@ -19,7 +19,7 @@ public class DeviceListParams extends BaseVO {
     @Schema(description = "关键词")
     private String keyWord;
 
-    @Schema(description = "状态 不传:全部 / 0:离线 / 1:在线 / 2:报警")
+    @Schema(description = "状态 不传:全部 / 0:离线 / 1:在线 ")
     private Integer status;
 
 

+ 1 - 5
portal-service-common/src/main/java/com/hfln/portal/common/request/web/DeviceAddParam.java

@@ -52,11 +52,7 @@ public class DeviceAddParam extends BaseVO {
     @Schema(description = "在线状态:0-离线,1-在线")
     private Integer online;
 
-    /**
-     * 设备报警:0-正常,1-报警
-     */
-    @Schema(description = "设备报警:0-正常,1-报警")
-    private Integer devWarn;
+
 
     /**
      * 软件版本号

+ 1 - 7
portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/GroupGatewayImpl.java

@@ -207,25 +207,19 @@ public class GroupGatewayImpl implements GroupGateway {
             // 5. 统计设备信息
             int totalDevice = groupDevices.size();
             int onlineDevice = 0;
-            int warningDevice = 0;
 
-            // 6. 统计在线和告警设备数量
+            // 6. 统计在线
             for (DevInfo device : groupDevices) {
                 // 使用online字段判断在线状态(根据DevInfo类定义)
                 if (Objects.nonNull(device.getOnline()) && device.getOnline() == DevInfo.Constants.OnlineStatus.ONLINE) {
                     onlineDevice++;
                 }
 
-                // 使用devWarn字段判断告警状态(根据DevInfo类定义)
-                if (Objects.nonNull(device.getDevWarn()) && device.getDevWarn() == DevInfo.Constants.DevWarnStatus.WARNING) {
-                    warningDevice++;
-                }
             }
 
             // 7. 设置统计值
             dto.setTotalDevice(totalDevice);
             dto.setOnlineDevice(onlineDevice);
-            dto.setWarningDevice(warningDevice);
 
             groupDTOs.add(dto);
         }

+ 2 - 12
portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/DevInfo.java

@@ -62,11 +62,7 @@ public class DevInfo extends BasePO {
     @TableField("onoff_time")
     private LocalDateTime onoffTime;
 
-    /**
-     * 设备报警:0-正常,1-报警
-     */
-    @TableField("dev_warn")
-    private Integer devWarn;
+
 
     /**
      * 软件版本号
@@ -235,13 +231,7 @@ public class DevInfo extends BasePO {
             public static final int EXIST = 1;   // 存在
         }
         
-        /**
-         * 设备报警状态
-         */
-        public static class DevWarnStatus {
-            public static final int NORMAL = 0;   // 正常
-            public static final int WARNING = 1;  // 报警
-        }
+
         
         /**
          * 安装方式

+ 0 - 3
portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/DevInfoServiceImpl.java

@@ -65,9 +65,6 @@ public class DevInfoServiceImpl extends ServiceImpl<DevInfoMapper, DevInfo> impl
                 case 1:
                     wrapper.eq(DevInfo::getOnline, 1);
                     break;
-                case 2:
-                    wrapper.isNotNull(DevInfo::getDevWarn).eq(DevInfo::getDevWarn, 1);
-                    break;
                 default:
                     // 可以添加日志记录未知状态
                     break;