Browse Source

首页明细状态修改

wangb 2 years ago
parent
commit
3a0ca3ac9b

+ 136 - 47
web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MonitorService.java

@@ -178,28 +178,63 @@ public class MonitorService {
 
             /**********************************************首页明细状态统计**********************************************************/
 
-            //运行
-            double fd_yxnum = 0;
-            //检修
-            double fd_jxnum = 0;
-            //故障
-            double fd_gznum = 0;
+            //待风
+            double fd_dfnum = 0;
+            //手动停机
+            double fd_sdtjnum = 0;
+            //正常发电
+            double fd_zcfdnum = 0;
+            //降出力运行
+            double fd_jclyxnum = 0;
+            //限电降出力
+            double fd_xdjclnum = 0;
+            //停机
+            double fd_tjnum = 0;
+            //故障停机
+            double fd_sltjnum = 0;
+            //故障场内受累
+            double fd_gzcnslnum = 0;
+            //检修停机
+            double fd_jxtjnum = 0;
+            //检修场内受累
+            double fd_jxclslnum = 0;
+            //受累电网
+            double fd_sldwnum = 0;
+            //受累环境
+            double fd_slhjnum = 0;
             //离线
             double fd_lxnum = 0;
-            //待机
-            double fd_djnum = 0;
-            //限电
-            double fd_xdnum = 0;
-            //受累
-            double fd_slnum = 0;
-
-            double gf_yxnum = 0;
-            double gf_jxnum = 0;
-            double gf_gznum = 0;
+            //未知
+            double fd_wznum = 0;
+
+            //待风
+            double gf_dfnum = 0;
+            //手动停机
+            double gf_sdtjnum = 0;
+            //正常发电
+            double gf_zcfdnum = 0;
+            //降出力运行
+            double gf_jclyxnum = 0;
+            //限电降出力
+            double gf_xdjclnum = 0;
+            //停机
+            double gf_tjnum = 0;
+            //故障停机
+            double gf_sltjnum = 0;
+            //故障场内受累
+            double gf_gzcnslnum = 0;
+            //检修停机
+            double gf_jxtjnum = 0;
+            //检修场内受累
+            double gf_jxlslnum = 0;
+            //受累电网
+            double gf_sldwnum = 0;
+            //受累环境
+            double gf_slhjnum = 0;
+            //离线
             double gf_lxnum = 0;
-            double gf_djnum = 0;
-            double gf_xdnum = 0;
-            double gf_slnum = 0;
+            //未知
+            double gf_wznum = 0;
 
             Map<String, Double> mxztmap = new HashMap<>();
 
@@ -229,39 +264,66 @@ public class MonitorService {
                         double fjzt = MathUtil.twoBit(MathUtil.twoBit(fjztlist.get(i).getPointValueInDouble()));
                         switch (Double.valueOf(fjzt).intValue()) {
                             case 0:
-                                fd_djnum++;
+                                fd_dfnum++;
                                 break;
                             case 1:
-                                fd_yxnum++;
+                                fd_sdtjnum++;
                                 break;
                             case 2:
-                                fd_gznum++;
+                                fd_zcfdnum++;
                                 break;
                             case 3:
-                                fd_lxnum++;
+                                fd_jclyxnum++;
                                 break;
                             case 4:
-                                fd_jxnum++;
+                                fd_sltjnum++;
                                 break;
                             case 5:
-                                fd_xdnum++;
+                                fd_gzcnslnum++;
                                 break;
                             case 6:
-                                fd_slnum++;
+                                fd_jxtjnum++;
+                                break;
+                            case 7:
+                                gf_jxlslnum++;
+                                break;
+                            case 8:
+                                fd_xdjclnum++;
+                                break;
+                            case 9:
+                                fd_tjnum++;
+                                break;
+                            case 10:
+                                fd_sldwnum++;
+                                break;
+                            case 11:
+                                fd_slhjnum++;
+                                break;
+                            case 12:
+                                fd_wznum ++;
+                                break;
+                            case 13:
+                                fd_lxnum++;
                                 break;
-
                             default:
                                 break;
                         }
                     }
 
-                    mxztmap.put("fd_djnum", fd_djnum);
-                    mxztmap.put("fd_yxnum", fd_yxnum);
-                    mxztmap.put("fd_gznum", fd_gznum);
+                    mxztmap.put("fd_dfnum", fd_dfnum);
+                    mxztmap.put("fd_sdtjnum", fd_sdtjnum);
+                    mxztmap.put("fd_zcfdnum", fd_zcfdnum);
+                    mxztmap.put("fd_jclyxnum", fd_jclyxnum);
+                    mxztmap.put("fd_sltjnum", fd_sltjnum);
+                    mxztmap.put("fd_gzcnslnum", fd_gzcnslnum);
+                    mxztmap.put("fd_jxtjnum", fd_jxtjnum);
+                    mxztmap.put("gf_jxlslnum", gf_jxlslnum);
+                    mxztmap.put("fd_xdjclnum", fd_xdjclnum);
+                    mxztmap.put("fd_tjnum", fd_tjnum);
+                    mxztmap.put("fd_sldwnum", fd_sldwnum);
+                    mxztmap.put("fd_slhjnum", fd_slhjnum);
+                    mxztmap.put("fd_wznum", fd_wznum);
                     mxztmap.put("fd_lxnum", fd_lxnum);
-                    mxztmap.put("fd_jxnum", fd_jxnum);
-                    mxztmap.put("fd_xdnum", fd_xdnum);
-                    mxztmap.put("fd_slnum", fd_slnum);
                 }
 
                 if (!gfztlist.isEmpty() && gfztlist.size() == gfztls.size()) {
@@ -269,39 +331,66 @@ public class MonitorService {
                         double gfzt = MathUtil.twoBit(MathUtil.twoBit(gfztlist.get(i).getPointValueInDouble()));
                         switch (Double.valueOf(gfzt).intValue()) {
                             case 0:
-                                gf_djnum++;
+                                gf_dfnum++;
                                 break;
                             case 1:
-                                gf_yxnum++;
+                                gf_sdtjnum++;
                                 break;
                             case 2:
-                                gf_gznum++;
+                                gf_zcfdnum++;
                                 break;
                             case 3:
-                                gf_lxnum++;
+                                gf_jclyxnum++;
                                 break;
                             case 4:
-                                gf_jxnum++;
+                                gf_sltjnum++;
                                 break;
                             case 5:
-                                gf_xdnum++;
+                                gf_gzcnslnum++;
                                 break;
                             case 6:
-                                gf_slnum++;
+                                gf_jxtjnum++;
+                                break;
+                            case 7:
+                                gf_jxlslnum++;
+                                break;
+                            case 8:
+                                gf_xdjclnum++;
+                                break;
+                            case 9:
+                                gf_tjnum++;
+                                break;
+                            case 10:
+                                gf_sldwnum++;
+                                break;
+                            case 11:
+                                gf_slhjnum++;
+                                break;
+                            case 12:
+                                gf_wznum ++;
+                                break;
+                            case 13:
+                                gf_lxnum++;
                                 break;
-
                             default:
                                 break;
                         }
                     }
 
-                    mxztmap.put("gf_djnum", gf_djnum);
-                    mxztmap.put("gf_yxnum", gf_yxnum);
-                    mxztmap.put("gf_gznum", gf_gznum);
+                    mxztmap.put("gf_dfnum", gf_dfnum);
+                    mxztmap.put("gf_sdtjnum", gf_sdtjnum);
+                    mxztmap.put("gf_zcfdnum", gf_zcfdnum);
+                    mxztmap.put("gf_jclyxnum", gf_jclyxnum);
+                    mxztmap.put("gf_sltjnum", gf_sltjnum);
+                    mxztmap.put("gf_gzcnslnum", gf_gzcnslnum);
+                    mxztmap.put("gf_jxtjnum", gf_jxtjnum);
+                    mxztmap.put("gf_jxlslnum", gf_jxlslnum);
+                    mxztmap.put("gf_xdjclnum", gf_xdjclnum);
+                    mxztmap.put("gf_tjnum", gf_tjnum);
+                    mxztmap.put("gf_sldwnum", gf_sldwnum);
+                    mxztmap.put("gf_slhjnum", gf_slhjnum);
+                    mxztmap.put("gf_wznum", gf_wznum);
                     mxztmap.put("gf_lxnum", gf_lxnum);
-                    mxztmap.put("gf_jxnum", gf_jxnum);
-                    mxztmap.put("gf_xdnum", gf_xdnum);
-                    mxztmap.put("gf_slnum", gf_slnum);
                 }
 
             }