字段增加后修改

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/monitor/MonitorService.java

@@ -763,58 +763,58 @@ public class MonitorService {
 
 
             for (ProBasicOrganizeTree reg : wpls) {
-                if (reg.getOrderNum().equals(1)) {
-                    sxcyfdcsl = reg.getWindNumber();
-                    sxcyfdzjrl = reg.getWindCapacity();
-                    sxcygfcsl = reg.getNumber();
-                    sxcygfzjrl = reg.getCapacity();
-
-                    sxgsfdcsl = reg.getJrWindNumber();
-                    sxgsfdzjrl = reg.getJrWindCapacity();
-                    sxgsgfcsl = reg.getJrNumber();
-                    sxgsgfzjrl = reg.getJrCapacity();
-                }
-                if (reg.getOrderNum().equals(4)) {
-                    hbcyfdcsl = reg.getWindNumber();
-                    hbcyfdzjrl = reg.getWindCapacity();
-                    hbcygfcsl = reg.getNumber();
-                    hbcygfzjrl = reg.getCapacity();
-                }
-                if (reg.getOrderNum().equals(3)) {
-                    xscyfdcsl = reg.getWindNumber();
-                    xscyfdzjrl = reg.getWindCapacity();
-                    xscygfcsl = reg.getNumber();
-                    xscygfzjrl = reg.getCapacity();
-                }
-                if (reg.getOrderNum().equals(5)) {
-                    sdcyfdcsl = reg.getWindNumber();
-                    sdcyfdzjrl = reg.getWindCapacity();
-                    sdcygfcsl = reg.getNumber();
-                    sdcygfzjrl = reg.getCapacity();
-                }
-                if (reg.getOrderNum().equals(6)) {
-                    xzcyfdcsl = reg.getWindNumber();
-                    xzcyfdzjrl = reg.getWindCapacity();
-                    xzcygfcsl = reg.getNumber();
-                    xzcygfzjrl = reg.getCapacity();
-                }
-                if (reg.getOrderNum().equals(2)) {
-                    nmcyfdcsl = reg.getWindNumber();
-                    nmcyfdzjrl = reg.getWindCapacity();
-                    nmcygfcsl = reg.getNumber();
-                    nmcygfzjrl = reg.getCapacity();
-
-                    nmgsfdcsl = reg.getJrWindNumber();
-                    nmgsfdzjrl = reg.getJrWindCapacity();
-                    nmgsgfcsl = reg.getJrNumber();
-                    nmgsgfzjrl = reg.getJrCapacity();
-                }
-                if (reg.getOrderNum().equals(7)) {
-                    xjcyfdcsl = reg.getWindNumber();
-                    xjcyfdzjrl = reg.getWindCapacity();
-                    xjcygfcsl = reg.getNumber();
-                    xjcygfzjrl = reg.getCapacity();
-                }
+//                if (reg.getOrderNum().equals(1)) {
+//                    sxcyfdcsl = reg.getWindNumber();
+//                    sxcyfdzjrl = reg.getWindCapacity();
+//                    sxcygfcsl = reg.getNumber();
+//                    sxcygfzjrl = reg.getCapacity();
+//
+//                    sxgsfdcsl = reg.getJrWindNumber();
+//                    sxgsfdzjrl = reg.getJrWindCapacity();
+//                    sxgsgfcsl = reg.getJrNumber();
+//                    sxgsgfzjrl = reg.getJrCapacity();
+//                }
+//                if (reg.getOrderNum().equals(4)) {
+//                    hbcyfdcsl = reg.getWindNumber();
+//                    hbcyfdzjrl = reg.getWindCapacity();
+//                    hbcygfcsl = reg.getNumber();
+//                    hbcygfzjrl = reg.getCapacity();
+//                }
+//                if (reg.getOrderNum().equals(3)) {
+//                    xscyfdcsl = reg.getWindNumber();
+//                    xscyfdzjrl = reg.getWindCapacity();
+//                    xscygfcsl = reg.getNumber();
+//                    xscygfzjrl = reg.getCapacity();
+//                }
+//                if (reg.getOrderNum().equals(5)) {
+//                    sdcyfdcsl = reg.getWindNumber();
+//                    sdcyfdzjrl = reg.getWindCapacity();
+//                    sdcygfcsl = reg.getNumber();
+//                    sdcygfzjrl = reg.getCapacity();
+//                }
+//                if (reg.getOrderNum().equals(6)) {
+//                    xzcyfdcsl = reg.getWindNumber();
+//                    xzcyfdzjrl = reg.getWindCapacity();
+//                    xzcygfcsl = reg.getNumber();
+//                    xzcygfzjrl = reg.getCapacity();
+//                }
+//                if (reg.getOrderNum().equals(2)) {
+//                    nmcyfdcsl = reg.getWindNumber();
+//                    nmcyfdzjrl = reg.getWindCapacity();
+//                    nmcygfcsl = reg.getNumber();
+//                    nmcygfzjrl = reg.getCapacity();
+//
+//                    nmgsfdcsl = reg.getJrWindNumber();
+//                    nmgsfdzjrl = reg.getJrWindCapacity();
+//                    nmgsgfcsl = reg.getJrNumber();
+//                    nmgsgfzjrl = reg.getJrCapacity();
+//                }
+//                if (reg.getOrderNum().equals(7)) {
+//                    xjcyfdcsl = reg.getWindNumber();
+//                    xjcyfdzjrl = reg.getWindCapacity();
+//                    xjcygfcsl = reg.getNumber();
+//                    xjcygfzjrl = reg.getCapacity();
+//                }
 
             }
 

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/monitor/StationMonitorService.java

@@ -63,12 +63,12 @@ public class StationMonitorService {
             points.add(powerstationPointMap.get(ContantXk.SSPJFS).getNemCode());
             resultMap.put("czlx","风电场");
             resultMap.put("jrrl",proBasicPowerstation.getJrWindCapacity());
-            resultMap.put("zzjrl",proBasicPowerstation.getWindCapacity());
+            resultMap.put("zzjrl",proBasicPowerstation.getJrWindCapacity()+proBasicPowerstation.getJrWindCapacityLd()+proBasicPowerstation.getJrWindCapacityHs());
         }else {
             points.add(powerstationPointMap.get(ContantXk.SSPJGZD).getNemCode());
             resultMap.put("czlx","光电场");
             resultMap.put("jrrl",proBasicPowerstation.getJrCapacity());
-            resultMap.put("zzjrl",proBasicPowerstation.getCapacity());
+            resultMap.put("zzjrl",proBasicPowerstation.getJrCapacityZl()+proBasicPowerstation.getJrCapacityJl());
         }
         points.add(powerstationPointMap.get(ContantXk.SSZGL).getNemCode());
         points.add(powerstationPointMap.get(ContantXk.YLYXS).getNemCode());
@@ -144,7 +144,7 @@ public class StationMonitorService {
         resultMap.put("nfdl",realData.get(23).getPointValueInDouble());
         resultMap.put("sspjfsgzd",realData.get(24).getPointValueInDouble());
         resultMap.put("yggl",realData.get(25).getPointValueInDouble());
-        resultMap.put("fhl",(proBasicPowerstation.getJrWindCapacity()+proBasicPowerstation.getJrCapacity())!=0?realData.get(25).getPointValueInDouble()/(proBasicPowerstation.getJrwindCapacity()+proBasicPowerstation.getJrCapacity())*100:0);
+        resultMap.put("fhl",(proBasicPowerstation.getJrWindCapacity()+proBasicPowerstation.getJrCapacity())!=0?realData.get(25).getPointValueInDouble()/(proBasicPowerstation.getJrWindCapacity()+proBasicPowerstation.getJrCapacity())*100:0);
         resultMap.put("ylyxs",realData.get(26).getPointValueInDouble());
         resultMap.put("nlyxs",realData.get(27).getPointValueInDouble());
         resultMap.put("yfgnlyl",realData.get(28).getPointValueInDouble());
@@ -173,12 +173,12 @@ public class StationMonitorService {
         resultMap.put("hzrl",proBasicPowerstation.getAppCapacity());
         resultMap.put("zjrl",proBasicPowerstation.getConCapacity());
         resultMap.put("bwrl",proBasicPowerstation.getGridCapacity());
-        resultMap.put("dzrl",proBasicPowerstation.getHoiCapacity());
+//        resultMap.put("dzrl",proBasicPowerstation.getHoiCapacity());
         resultMap.put("jwd",proBasicPowerstation.getLongitude()+","+proBasicPowerstation.getLatitude());
         resultMap.put("spbwsj",proBasicPowerstation.getFirstGridTime());
         resultMap.put("zctysj",proBasicPowerstation.getWholeGridTime());
-        resultMap.put("cftsl",proBasicPowerstation.getAnemoNumber());
-        resultMap.put("syzsl",proBasicPowerstation.getStationNumber());
+//        resultMap.put("cftsl",proBasicPowerstation.getAnemoNumber());
+//        resultMap.put("syzsl",proBasicPowerstation.getStationNumber());
         resultMap.put("czwz",proBasicPowerstation.getAddress());
         return resultMap;
     }