Browse Source

修改风机监视和逆变器监视界面动态配置接口

shilin 2 years ago
parent
commit
7d70e5359f

File diff suppressed because it is too large
+ 763 - 768
web/monitor-hb/src/main/java/com/gyee/frame/service/websocket/MatrixPushByWpService.java


+ 5 - 0
web/monitor-hb/src/main/java/com/gyee/frame/service/websocket/MatrixPushService.java

@@ -205,6 +205,7 @@ public class MatrixPushService {
                 jczbmap.put("xdts", 0.0);
             }
 
+
             fczbmap.put(wp.getId(), jczbmap);
 /*************************************************风场指标统计*************************************************************/
 
@@ -328,6 +329,7 @@ public class MatrixPushService {
                         //受累台数
                         jczbmap.put("slts", slnum);
                         vo.setFjzt(fjzt);
+                        jczbmap.put("jrts",StringUtils.round(djnum+yxnum+gznum+lxnum+whnum+xdnum+slnum,0));
                         vo.setFs(MathUtil.twoBit(fjzblist.get(i * step + 1).getPointValueInDouble()));
                         vo.setGl(MathUtil.twoBit(fjzblist.get(i * step + 2).getPointValueInDouble()));
                         vo.setWtCode(wt.getCode());
@@ -401,6 +403,9 @@ public class MatrixPushService {
                         jczbmap.put("xdts", xdnum);
                         //受累台数
                         jczbmap.put("slts", slnum);
+
+                        jczbmap.put("jrts",StringUtils.round(djnum+yxnum+gznum+lxnum+whnum+xdnum+slnum,0));
+
                         vo.setFjzt(fjzt);
                         vo.setFs(MathUtil.twoBit(fjzblist.get(i * step + 1).getPointValueInDouble()));
                         vo.setGl(MathUtil.twoBit(fjzblist.get(i * step + 2).getPointValueInDouble()));