修正首页数据异常

web/monitor-web-sxjn/src/main/java/com/gyee/SpringbootStart.java

@@ -39,10 +39,10 @@ public class SpringbootStart {
 //        System.out.println("开始导出风功率测点。。。。。。");
 //        initialPointGoldenService.initalFgl();
 //        System.out.println("结束导出风功率测点。。。。。。");
+        System.out.println("开始导出地调测点。。。。。。");
+        initialPointGoldenService.initalDd();
+        System.out.println("结束导出地调测点。。。。。。");
 
-////        System.out.println("开始导出地调测点。。。。。。");
-////        initialPointEdosHfService.initalDd();
-////        System.out.println("结束导出地调测点。。。。。。");
 
 //
 //        System.out.println("开始导出逆变器测点。。。。。。");

web/monitor-web-sxjn/src/main/java/com/gyee/frame/common/conf/ZtConfig.java

@@ -0,0 +1,27 @@
+package com.gyee.frame.common.conf;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 预警配置
+ */
+@Component
+@ConfigurationProperties(prefix = "ztconfig")
+public class ZtConfig {
+
+
+    private static Map<String,List<String>> maps;
+
+
+    public static Map<String, List<String>> getMaps() {
+        return maps;
+    }
+
+    public void setMaps(Map<String, List<String>> maps) {
+        this.maps = maps;
+    }
+}

web/monitor-web-sxjn/src/main/java/com/gyee/frame/common/file/ExcelExport.java

@@ -238,8 +238,8 @@ public final class ExcelExport {
 
         if(StringUtils.notEmp(filename))
         {
-            StringBuilder sb=new StringBuilder("/usr/local/gyee/monitor/");
-//            StringBuilder sb=new StringBuilder("d:\\");
+          //  StringBuilder sb=new StringBuilder("/usr/local/gyee/monitor/");
+            StringBuilder sb=new StringBuilder("d:\\");
             sb.append(filename);
             sb.append(".xls");
 

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/initialpoint/InitialPointGoldenService.java

@@ -697,7 +697,7 @@ public class InitialPointGoldenService implements  IinitialPoint{
 
         //创建一个数组用于设置表头
         String[] arr = new String[]{"编号","编码","名称","型号","单位","英文名称","类型编号","所属型号","最大值","最小值","合理最大值",
-                "合理最小值","风机编号","统一编码","短ID","长ID","风场编号","实时配置编号"};
+                "合理最小值","统一编码","短ID","长ID","风场编号","实时配置编号"};
         String heardName="地调测点表";
         //调用Excel导出工具类
         ExcelExport.exportToPath(allpoints,arr,heardName,6,"地调测点");

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/websocket/WpInfoPushService.java

@@ -1,6 +1,7 @@
 package com.gyee.frame.service.websocket;
 
 
+import com.gyee.frame.common.conf.ZtConfig;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.Windpowerstation;
@@ -326,222 +327,64 @@ public class WpInfoPushService {
 
 /***********************************************************************************************************************/
 
-            List<String> zbls = new ArrayList<>();
-            switch (id) {
-                case "MHS_FDC":
-//            MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0037	电压
-//            MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0246	电压
-//            MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0009	电流
-                    zbls.add("MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0037");
-                    zbls.add("MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0246");
-                    zbls.add("MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0009");
-                    zbls.add("MHSDJL.NX_GD_MHSF_DD_P1_L1_001_ZXYG057");
-
-                    List<PointData> zblist = realApiUtil.getRealData(zbls);
-
-                    if (!zblist.isEmpty() && zblist.size() == zbls.size()) {
-                        double temp1 = zblist.get(0).getPointValueInDouble();
-                        double temp2 = zblist.get(1).getPointValueInDouble();
-                        jczbmap.put("uab", MathUtil.twoBit(temp1 + temp2));
-                        double temp3 = zblist.get(2).getPointValueInDouble();
-                        jczbmap.put("ia", MathUtil.twoBit(temp3));
-                        double temp4 = zblist.get(3).getPointValueInDouble();
-                        jczbmap.put("dnlb", MathUtil.twoBit(temp4));
-                    }
-                    break;
-                case "NSS_FDC":
-//            NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0004	电压
-//            NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0085	电压
-//            NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0009	电流
-//            NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0014	电流
-                    zbls.add("NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0004");
-                    zbls.add("NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0085");
-                    zbls.add("NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0009");
-                    zbls.add("NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0014");
-
-                    zbls.add("NSSDJL.NX_GD_NSSF_DD_P1_L1_001_ZXYG025");
-                    zbls.add("NSSDJL.NX_GD_NSSF_DD_P1_L1_001_ZXYG029");
-
-                    zblist = realApiUtil.getRealData(zbls);
-
-                    if (!zblist.isEmpty() && zblist.size() == zbls.size()) {
-                        double temp1 = zblist.get(0).getPointValueInDouble();
-                        double temp2 = zblist.get(1).getPointValueInDouble();
-                        jczbmap.put("uab", MathUtil.twoBit(temp1 + temp2));
-                        double temp3 = zblist.get(2).getPointValueInDouble();
-                        double temp4 = zblist.get(3).getPointValueInDouble();
-                        jczbmap.put("ia", MathUtil.twoBit(temp3 + temp4));
-                        double temp5 = zblist.get(4).getPointValueInDouble();
-                        double temp6 = zblist.get(5).getPointValueInDouble();
-                        jczbmap.put("dnlb", MathUtil.twoBit(temp5 + temp6));
-                    }
-                    break;
-                case "QS_FDC":
-//            QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0007	电压
-//            QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0324	电流
-//            SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0009	电压
-//            SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0004	电流
-                    zbls.add("NX_GD_QSF_DQ_P1_L1_001_AI0007");
-                    zbls.add("SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0009");
-                    zbls.add("QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0324");
-                    zbls.add("SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0004");
-
-//            QSDJL.NX_GD_QSF_DD_P1_L1_001_ZXYG001
-//            SLDJL.NX_GD_QSF_DD_P1_L1_001_ZXYG001
-                    zbls.add("QSDJL.NX_GD_QSF_DD_P1_L1_001_ZXYG001");
-                    zbls.add("SLDJL.NX_GD_QSF_DD_P1_L1_001_ZXYG001");
-                    zblist = realApiUtil.getRealData(zbls);
-                    if (!zblist.isEmpty() && zblist.size() == zbls.size()) {
-                        double temp1 = zblist.get(0).getPointValueInDouble();
-                        double temp2 = zblist.get(1).getPointValueInDouble();
-                        jczbmap.put("uab", MathUtil.twoBit(temp1 + temp2));
-                        double temp3 = zblist.get(2).getPointValueInDouble();
-                        double temp4 = zblist.get(3).getPointValueInDouble();
-                        jczbmap.put("ia", MathUtil.twoBit(temp3 + temp4));
-                        double temp5 = zblist.get(4).getPointValueInDouble();
-                        double temp6 = zblist.get(5).getPointValueInDouble();
-
-                        jczbmap.put("dnlb", MathUtil.twoBit(temp5 + temp6));
-                    }
-                    break;
-                case "SBQ_FDC":
-//            SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0133	电压
-//            SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0141	电压
-//            SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0009	电流
-//            SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0681	电流
-                    zbls.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0133");
-                    zbls.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0141");
-                    zbls.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0009");
-                    zbls.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0681");
-
-                    zbls.add("SBQDJL.NX_GD_SBQF_DD_P1_L1_001_ZXYG009");
-                    zbls.add("SBQDJL.NX_GD_SBQF_DD_P1_L1_001_ZXYG061");
-                    zbls.add("SBQDJL.NX_GD_SBQF_DD_P1_L1_001_ZXYG109");
-//            SBQDJL.NX_GD_SBQF_DD_P1_L1_001_ZXYG009
-//            SBQDJL.NX_GD_SBQF_DD_P1_L1_001_ZXYG061
-//            SBQDJL.NX_GD_SBQF_DD_P1_L1_001_ZXYG109
-                    zblist = realApiUtil.getRealData(zbls);
-
-                    if (!zblist.isEmpty() && zblist.size() == zbls.size()) {
-                        double temp1 = zblist.get(0).getPointValueInDouble();
-                        double temp2 = zblist.get(1).getPointValueInDouble();
-                        jczbmap.put("uab", MathUtil.twoBit(temp1 + temp2));
-                        double temp3 = zblist.get(2).getPointValueInDouble();
-                        double temp4 = zblist.get(3).getPointValueInDouble();
-                        jczbmap.put("ia", MathUtil.twoBit(temp3 + temp4));
-                        double temp5 = zblist.get(4).getPointValueInDouble();
-                        double temp6 = zblist.get(5).getPointValueInDouble();
-                        double temp7 = zblist.get(6).getPointValueInDouble();
-                        jczbmap.put("dnlb", MathUtil.twoBit(temp5 + temp6 + temp7));
-                    }
-                    break;
-                case "XS_FDC":
-//            XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0007	电压
-//            XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0010	电流
-                    zbls.add("XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0007");
-                    zbls.add("XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0010");
-//            XSDJL.NX_GD_XSF_DD_P1_L1_001_ZXYG017
-                    zbls.add("XSDJL.NX_GD_XSF_DD_P1_L1_001_ZXYG017");
-                    zblist = realApiUtil.getRealData(zbls);
-
-                    if (!zblist.isEmpty() && zblist.size() == zbls.size()) {
-                        double temp1 = zblist.get(0).getPointValueInDouble();
-                        jczbmap.put("uab", MathUtil.twoBit(temp1));
-                        double temp3 = zblist.get(1).getPointValueInDouble();
-                        jczbmap.put("ia", MathUtil.twoBit(temp3));
-                        double temp2 = zblist.get(2).getPointValueInDouble();
-                        jczbmap.put("dnlb", MathUtil.twoBit(temp2));
-                    }
-                    break;
-                case "DWK_GDC":
-//            DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0004	电压
-//            DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0001	电流
-                    zbls.add("DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0004");
-                    zbls.add("DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0001");
-                    zbls.add("DWKDJL.NX_GD_DWKG_DD_P1_L1_001_ZXYG001");
 
-                    zblist = realApiUtil.getRealData(zbls);
 
-                    if (!zblist.isEmpty() && zblist.size() == zbls.size()) {
-                        double temp1 = zblist.get(0).getPointValueInDouble();
+            if(ZtConfig.getMaps().containsKey(id+"_UAB"))
+            {
+                List<String> ls = new ArrayList<>();
 
-                        jczbmap.put("uab", MathUtil.twoBit(temp1));
-                        double temp3 = zblist.get(1).getPointValueInDouble();
+                ls= ZtConfig.getMaps().get(id+"_UAB");
+                if(!ls.isEmpty())
+                {
+                    List<PointData> zblist = realApiUtil.getRealData(ls);
+                    double temp =0.0;
+                    if (!zblist.isEmpty() ) {
 
-                        jczbmap.put("ia", MathUtil.twoBit(temp3));
-                        double temp2 = zblist.get(2).getPointValueInDouble();
+                        for(int i=0;i<zblist.size();i++)
+                            temp=temp+ zblist.get(i).getPointValueInDouble();
 
-                        jczbmap.put("dnlb", MathUtil.twoBit(temp2));
-                    }
-                    break;
-                case "PL_GDC":
-//            PLSJ1.NX_GD_PLG_DQ_P1_L1_001_AI0001	电压
-//            PLSJ1.NX_GD_PLG_DQ_P1_L1_001_AI0013	电压
-//            PLSJ1.NX_GD_PLG_DQ_P1_L1_001_AI0047	电流
-//            PLSJ1.NX_GD_PLG_DQ_P1_L1_001_AI0007	电流
-                    zbls.add("PLSJ1.NX_GD_PLG_DQ_P1_L1_001_AI0001");
-                    zbls.add("PLSJ1.NX_GD_PLG_DQ_P1_L1_001_AI0013");
-                    zbls.add("PLSJ1.NX_GD_PLG_DQ_P1_L1_001_AI0047");
-                    zbls.add("PLSJ1.NX_GD_PLG_DQ_P1_L1_001_AI0007");
-
-                    zbls.add("PLSJ1.NX_GD_PLG_DQ_P1_L1_001_PI0963");
-//            PLSJ1.NX_GD_PLG_DQ_P1_L1_001_PI0963
-                    zblist = realApiUtil.getRealData(zbls);
-
-                    if (!zblist.isEmpty() && zblist.size() == zbls.size()) {
-                        double temp1 = zblist.get(0).getPointValueInDouble();
-                        double temp2 = zblist.get(1).getPointValueInDouble();
-                        jczbmap.put("uab", MathUtil.twoBit(temp1 + temp2));
-                        double temp3 = zblist.get(2).getPointValueInDouble();
-                        double temp4 = zblist.get(3).getPointValueInDouble();
-                        jczbmap.put("ia", MathUtil.twoBit(temp3 + temp4));
-                        double temp5 = zblist.get(4).getPointValueInDouble();
-
-                        jczbmap.put("dnlb", MathUtil.twoBit(temp5));
                     }
-                    break;
-                case "XH_GDC":
-
-//            XHDQ.NX_GD_XHG_DQ_P1_L1_001_AI0004	电压
-//            XHDQ.NX_GD_XHG_DQ_P1_L1_001_AI0001	电流
-                    zbls.add("XHDQ.NX_GD_XHG_DQ_P1_L1_001_AI0004");
-                    zbls.add("XHDQ.NX_GD_XHG_DQ_P1_L1_001_AI0001");
-                    zbls.add("XHDJL.NX_GD_XHG_DD_P1_L1_001_ZXYG001");
-//            XHDJL.NX_GD_XHG_DD_P1_L1_001_ZXYG001
-                    zblist = realApiUtil.getRealData(zbls);
-                    if (!zblist.isEmpty() && zblist.size() == zbls.size()) {
-                        double temp1 = zblist.get(0).getPointValueInDouble();
-                        jczbmap.put("uab", MathUtil.twoBit(temp1));
-                        double temp3 = zblist.get(1).getPointValueInDouble();
-
-                        jczbmap.put("ia", MathUtil.twoBit(temp3));
-                        double temp5 = zblist.get(2).getPointValueInDouble();
-
-                        jczbmap.put("dnlb", MathUtil.twoBit(temp5));
+                    jczbmap.put("uab", MathUtil.twoBit(temp));
+                }
+            }
+
+
+            if(ZtConfig.getMaps().containsKey(id+"_IA"))
+            {
+                List<String> ls = new ArrayList<>();
+
+                ls= ZtConfig.getMaps().get(id+"_IA");
+                if(!ls.isEmpty())
+                {
+                    List<PointData> zblist = realApiUtil.getRealData(ls);
+                    double temp =0.0;
+                    if (!zblist.isEmpty() ) {
+
+                        for(int i=0;i<zblist.size();i++)
+                            temp=temp+ zblist.get(i).getPointValueInDouble();
+
                     }
+                    jczbmap.put("ia", MathUtil.twoBit(temp));
+                }
+            }
+
+            if(ZtConfig.getMaps().containsKey(id+"_DNLB"))
+            {
+                List<String> ls = new ArrayList<>();
+
+                ls= ZtConfig.getMaps().get(id+"_DNLB");
+                if(!ls.isEmpty())
+                {
+                    List<PointData> zblist = realApiUtil.getRealData(ls);
+                    double temp =0.0;
+                    if (!zblist.isEmpty() ) {
+
+                        for(int i=0;i<zblist.size();i++)
+                            temp=temp+ zblist.get(i).getPointValueInDouble();
 
-                    break;
-                case "MCH_GDC":
-//            MCHDQ.NX_GD_MCHG_DQ_P1_L1_001_AI0212	电压
-//            MCHDQ.NX_GD_MCHG_DQ_P1_L1_001_AI0044	电压
-//            "MCHDQ.NX_GD_MCHG_DQ_P1_L1_001_AI0013	"	电流
-                    zbls.add("MCHDQ.NX_GD_MCHG_DQ_P1_L1_001_AI0212");
-                    zbls.add("MCHDQ.NX_GD_MCHG_DQ_P1_L1_001_AI0044");
-                    zbls.add("MCHDQ.NX_GD_MCHG_DQ_P1_L1_001_AI0013");
-
-                    zblist = realApiUtil.getRealData(zbls);
-
-                    if (!zblist.isEmpty() && zblist.size() == zbls.size()) {
-                        double temp1 = zblist.get(0).getPointValueInDouble();
-                        double temp2 = zblist.get(1).getPointValueInDouble();
-                        jczbmap.put("uab", MathUtil.twoBit(temp1 + temp2));
-                        double temp3 = zblist.get(2).getPointValueInDouble();
-
-                        jczbmap.put("ia", MathUtil.twoBit(temp3));
                     }
-                    break;
-                default:
-                    break;
+                    jczbmap.put("dnlb", MathUtil.twoBit(temp));
+                }
             }
 
 

web/monitor-web-sxjn/src/main/resources/application-jn.yml

@@ -57,16 +57,16 @@ server :
 #dev环境  mysql7.0
 spring :
   application:
-    name: monitor-hb-provider
-    cloud:
-      nacos:
-        discovery:
-          server-addr: 10.81.3.155:8848
-          #指定yaml格式的配置
-          file-extension: yaml
-          cluster-name: master
-        username: nacos
-        password: nacos
+#    name: monitor-hb-provider
+#    cloud:
+#      nacos:
+#        discovery:
+#          server-addr: 10.81.3.155:8848
+#          #指定yaml格式的配置
+#          file-extension: yaml
+#          cluster-name: master
+#        username: nacos
+#        password: nacos
     #引入其他配置文件，例如ftpHX 未配置文件application-ftpHX.yml
     #include: ftpHX,ftpCloud
   servlet:
@@ -159,6 +159,17 @@ spring :
           config:
             multi-statement-allow: true
 
+#状态监视测点配置
+ztconfig:
+  maps:
+    GJY_FDC_UAB:
+      - FD-GJY-Yuandong.140603F3111MDX01VL004DB0121VL01RAW00
+    GJY_FDC_IA:
+      - FD-GJY-Yuandong.140603F0811BBT01PA009DB0111PA01RAW00
+    GJY_FDC_DNLB:
+      - FD-GJY-Yuandong.140603F5311MDK02PW005DB0121PW01SUM00
+      - FD-GJY-Yuandong.140603F5311MDK02PW005DB0121PW01SUM00
+
 #mysql 8.0
 
 #spring: