malijun 1 rok pred
rodič
commit
b0cf69691f

+ 1 - 0
electricity/meter/src/main/java/com/gyee/gaia/meter/service/saveHistory/ReadFromXLSXTest.java

@@ -134,6 +134,7 @@ public class ReadFromXLSXTest {
             System.out.println("场站: " + record.getWindpowerstationId());
             System.out.println();
 
+
 //            QueryWrapper<MeterInfoBottomcode> queryWrapper = new QueryWrapper<>();
 //            queryWrapper
 //                    .eq("start_time", record.getStartTime())

+ 52 - 3
electricity/meter/src/main/java/com/gyee/gaia/meter/service/saveTDengine/TDSaveLLFDL1MinTest.java

@@ -140,10 +140,16 @@ class TDSaveLLFDL1MinTest {
                                 }
                                 //时间
                                 DateTime dateTime = DateTime.of(pointData.getTs());
+
+
+                                BigDecimal llfdl= BigDecimal.valueOf(0);
                                 //1分钟理论发电量
-                                BigDecimal llfdl = new BigDecimal(Double.toString(theoryPower))
-                                        .multiply(new BigDecimal(Double.toString(1)))
-                                        .divide(new BigDecimal(Double.toString(60)), 2, RoundingMode.HALF_UP);
+                                if(theoryPower != null){
+                                     llfdl = new BigDecimal(Double.toString(theoryPower))
+                                            .multiply(new BigDecimal(Double.toString(1)))
+                                            .divide(new BigDecimal(Double.toString(60)), 2, RoundingMode.HALF_UP);
+                                }
+
 
                                 //存入map1,键为风机编码,值为map集合,值的map集合的键为时间,值为1分钟理论发电量
                                 if (map1.containsKey(nemCode)) {
@@ -167,6 +173,49 @@ class TDSaveLLFDL1MinTest {
 
             }
         }
+
+        HashMap<String, BigDecimal> map2 = new HashMap<>();
+        for (String key: map1.keySet() ){
+            Map<Long, BigDecimal> mapValues = map1.get(key);
+            BigDecimal llfdl= BigDecimal.valueOf(0);
+            for (BigDecimal mapValue : mapValues.values() ) {
+                llfdl=llfdl.add(mapValue);
+            }
+            map2.put(key,llfdl);
+        }
+        System.out.println(map2);
+
+        BigDecimal mhsllfdl= BigDecimal.valueOf(0);
+        BigDecimal nssllfdl= BigDecimal.valueOf(0);
+        BigDecimal qsllfdl= BigDecimal.valueOf(0);
+        BigDecimal sbqllfdl= BigDecimal.valueOf(0);
+        BigDecimal xsllfdl= BigDecimal.valueOf(0);
+
+        for (String key: map2.keySet()) {
+            if(key.contains("NX_GDDL_MHS_F_WT_")){
+                mhsllfdl=mhsllfdl.add(map2.get(key));
+            }
+            if(key.contains("NX_GDDL_NSS_F_WT_")){
+                nssllfdl=nssllfdl.add(map2.get(key));
+            }
+            if(key.contains("NX_GDDL_QS_F_WT_")){
+                qsllfdl=qsllfdl.add(map2.get(key));
+            }
+            if(key.contains("NX_GDDL_SBQ_F_WT_")){
+                sbqllfdl=sbqllfdl.add(map2.get(key));
+            }
+            if(key.contains("NX_GDDL_XS_F_WT_")){
+                xsllfdl=xsllfdl.add(map2.get(key));
+            }
+
+
+        }
+        System.out.println("麻黄山理论发电量:"+mhsllfdl.divide(BigDecimal.valueOf(10000),4,RoundingMode.HALF_EVEN));
+        System.out.println("牛首山理论发电量:"+nssllfdl.divide(BigDecimal.valueOf(10000),4,RoundingMode.HALF_EVEN));
+        System.out.println("青山理论发电量:"+qsllfdl.divide(BigDecimal.valueOf(10000),4,RoundingMode.HALF_EVEN));
+        System.out.println("石板泉理论发电量:"+sbqllfdl.divide(BigDecimal.valueOf(10000),4,RoundingMode.HALF_EVEN));
+        System.out.println("香山理论发电量:"+xsllfdl.divide(BigDecimal.valueOf(10000),4,RoundingMode.HALF_EVEN));
+
     }
 
 }

+ 3 - 3
electricity/meter/src/main/resources/bootstrap.yaml

@@ -3,7 +3,7 @@ spring:
     name: meter
   profiles:
     # 环境配置
-    active: dev
+    active: prod
 
   cloud:
     nacos:
@@ -17,9 +17,9 @@ spring:
         # 配置文件格式
         file-extension: yml
         #开发环境配置命名空间
-        namespace: fe339fbd-7113-405f-8d2a-70659c5d53e4
+#        namespace: fe339fbd-7113-405f-8d2a-70659c5d53e4
         #生产环境配置命名空间
-#        namespace: d148acca-95e7-4e07-a566-9a69012bcf01
+        namespace: d148acca-95e7-4e07-a566-9a69012bcf01
         group: meter
         refresh-enabled: true
         # 共享配置