Browse Source

状态监视添加返回字段

wangchangsheng 3 years ago
parent
commit
70f52f0cde

+ 11 - 0
src/main/java/com/gyee/frame/model/custom/ZtjsVo.java

@@ -4,6 +4,7 @@ public class ZtjsVo {
 
     private String wpId;
     private String wpName;
+    private String address;
 
     private Double zjrl;
     private Double fdl;
@@ -24,9 +25,19 @@ public class ZtjsVo {
     private Double whss;
     private Double gzss;
     private Double slss;
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
     private Double xdss;
     private Double xnss;
 
+
     public String getWpId() {
         return wpId;
     }

+ 3 - 0
src/main/java/com/gyee/frame/service/websocket/WpInfoPushService.java

@@ -110,12 +110,15 @@ public class WpInfoPushService {
 
             vo.setWpId(wp.getId());
             vo.setWpName(wp.getName());
+            vo.setAddress(wp.getAddress());
+
             vo.setZjrl(zjrl);
             Map<String, Object> jczbmap = new HashMap<>();
 
 //          jczbmap.put("zjrl", zjrl);
             jczbmap.put("zjts", zjts);
             jczbmap.put("name", wp.getName());
+            jczbmap.put("address",wp.getAddress());
             List<String> jczbls = new ArrayList<>();
 
             jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SJGL).getCode());