1.解决pmsBug

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorInfoDTO.java

@@ -33,16 +33,6 @@ public class PmsMonitorInfoDTO implements Serializable {
      */
     private String powerName;
 
-    /**
-     * 母线id
-     */
-    private String generatrixId;
-
-    /**
-     * 母线名称
-     */
-    private String generatrixName;
-
     /**
      * 监测点id
      */

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatDevSignalVO.java

@@ -1,5 +1,6 @@
 package com.njcn.device.pms.pojo.vo;
 
+import cn.hutool.core.util.StrUtil;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -42,4 +43,28 @@ public class RStatDevSignalVO {
 
     @ApiModelProperty(name = "updateTime", value = "最后通讯时间")
     private String updateTime; //最后通讯时间
+
+    public void setDeviceStatus(String deviceStatus) {
+        if(StrUtil.isNotBlank(deviceStatus)){
+            this.deviceStatus = deviceStatus;
+        }else{
+            this.deviceStatus = "/";
+        }
+    }
+
+    public void setRunStatus(String runStatus) {
+        if(StrUtil.isNotBlank(runStatus)){
+            this.runStatus = runStatus;
+        }else{
+            this.runStatus = "/";
+        }
+    }
+
+    public void setUpdateTime(String updateTime) {
+        if(StrUtil.isNotBlank(updateTime)){
+            this.updateTime = updateTime;
+        }else{
+            this.updateTime = "/";
+        }
+    }
 }