代码优化

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/impl/IvPvCurveFittingService.java

@@ -9,10 +9,7 @@ import com.gyee.power.fitting.common.spring.InitialRunner;
 import com.gyee.power.fitting.common.util.DateUtils;
 import com.gyee.power.fitting.common.util.FileUtil;
 import com.gyee.power.fitting.common.util.PowerFittingUtil;
-import com.gyee.power.fitting.model.ProBasicPowerstationPoint;
-import com.gyee.power.fitting.model.ProEconPowerFittingAnalySis;
-import com.gyee.power.fitting.model.Windpowerstationtestingpoint2;
-import com.gyee.power.fitting.model.Windturbinetestingpointai2;
+import com.gyee.power.fitting.model.*;
 import com.gyee.power.fitting.model.anno.AnnotationTool;
 import com.gyee.power.fitting.model.anno.FixedVo;
 import com.gyee.power.fitting.model.custom.FjjxbVo;
@@ -20,6 +17,7 @@ import com.gyee.power.fitting.model.custom.PhotovoltaicInfo;
 import com.gyee.power.fitting.model.custom.TableTitle;
 import com.gyee.power.fitting.model.custom.TsDoubleData;
 import com.gyee.power.fitting.service.IWindpowerstationtestingpoint2Service;
+import com.gyee.power.fitting.service.ProBasicEquipmentPointService;
 import com.gyee.power.fitting.service.Windturbinetestingpointai2Service;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.math3.fitting.WeightedObservedPoints;
@@ -58,6 +56,8 @@ public class IvPvCurveFittingService {
     @Value("${gf3xjscz}")
     private String gf3xjscz;
 
+    @Resource
+    private ProBasicEquipmentPointService proBasicEquipmentPointService;
 
     public void getDatas2File(String stationid, long start, long end) {
 
@@ -596,32 +596,32 @@ public class IvPvCurveFittingService {
         switch (key) {
             case "zgl":
                 //总功率
-                return InitialRunner.zglMap.get(stationid).stream().collect(Collectors.toMap(Windturbinetestingpointai2::getWindturbineid, Windturbinetestingpointai2::getCode));
+                return InitialRunner.newzglMap.get(stationid).stream().collect(Collectors.toMap(ProBasicEquipmentPoint::getWindturbineId, ProBasicEquipmentPoint::getNemCode));
             case "ady":
-                List<Windturbinetestingpointai2> adyPoints = null;
+                List<ProBasicEquipmentPoint> adyPoints = null;
                 if ("HZJ_GDC".equals(stationid)) {
                     //电网A相电压
-                    adyPoints = windPointService.getPoints(stationid, null, "AIG063");
+                    adyPoints = proBasicEquipmentPointService.getPoints(stationid, null, "AIG005");
                 } else {
                     //电网A相电压
-                    adyPoints = windPointService.getPoints(stationid, null, uniforcodes.get("A相电压"));
+                    adyPoints = proBasicEquipmentPointService.getPoints(stationid, null, "AIG005");
                 }
-                return adyPoints.stream().collect(Collectors.toMap(Windturbinetestingpointai2::getWindturbineid, Windturbinetestingpointai2::getCode));
+                return adyPoints.stream().collect(Collectors.toMap(ProBasicEquipmentPoint::getWindturbineId, ProBasicEquipmentPoint::getNemCode));
             case "bdy":
-                List<Windturbinetestingpointai2> bdyPoints = windPointService.getPoints(stationid, null, uniforcodes.get("B相电压"));
-                return bdyPoints.stream().collect(Collectors.toMap(Windturbinetestingpointai2::getWindturbineid, Windturbinetestingpointai2::getCode));
+                List<ProBasicEquipmentPoint> bdyPoints = proBasicEquipmentPointService.getPoints(stationid, null, "AIG008");
+                return bdyPoints.stream().collect(Collectors.toMap(ProBasicEquipmentPoint::getWindturbineId, ProBasicEquipmentPoint::getNemCode));
             case "cdy":
-                List<Windturbinetestingpointai2> cdyPoints = windPointService.getPoints(stationid, null, uniforcodes.get("C相电压"));
-                return cdyPoints.stream().collect(Collectors.toMap(Windturbinetestingpointai2::getWindturbineid, Windturbinetestingpointai2::getCode));
+                List<ProBasicEquipmentPoint> cdyPoints = proBasicEquipmentPointService.getPoints(stationid, null, "AIG011");
+                return cdyPoints.stream().collect(Collectors.toMap(ProBasicEquipmentPoint::getWindturbineId, ProBasicEquipmentPoint::getNemCode));
             case "adl":
-                List<Windturbinetestingpointai2> adlPoints = windPointService.getPoints(stationid, null, uniforcodes.get("A相电流"));
-                return adlPoints.stream().collect(Collectors.toMap(Windturbinetestingpointai2::getWindturbineid, Windturbinetestingpointai2::getCode));
+                List<ProBasicEquipmentPoint> adlPoints = proBasicEquipmentPointService.getPoints(stationid, null, "AIG004");
+                return adlPoints.stream().collect(Collectors.toMap(ProBasicEquipmentPoint::getWindturbineId, ProBasicEquipmentPoint::getNemCode));
             case "bdl":
-                List<Windturbinetestingpointai2> bdlPoints = windPointService.getPoints(stationid, null, uniforcodes.get("B相电流"));
-                return bdlPoints.stream().collect(Collectors.toMap(Windturbinetestingpointai2::getWindturbineid, Windturbinetestingpointai2::getCode));
+                List<ProBasicEquipmentPoint> bdlPoints = proBasicEquipmentPointService.getPoints(stationid, null, "AIG007");
+                return bdlPoints.stream().collect(Collectors.toMap(ProBasicEquipmentPoint::getWindturbineId, ProBasicEquipmentPoint::getNemCode));
             case "cdl":
-                List<Windturbinetestingpointai2> cdlPoints = windPointService.getPoints(stationid, null, uniforcodes.get("C相电流"));
-                return cdlPoints.stream().collect(Collectors.toMap(Windturbinetestingpointai2::getWindturbineid, Windturbinetestingpointai2::getCode));
+                List<ProBasicEquipmentPoint> cdlPoints = proBasicEquipmentPointService.getPoints(stationid, null, "AIG010");
+                return cdlPoints.stream().collect(Collectors.toMap(ProBasicEquipmentPoint::getWindturbineId, ProBasicEquipmentPoint::getNemCode));
         }
         return new HashMap<>();
     }

power-fitting-JN/src/main/resources/application.yaml

@@ -84,4 +84,7 @@ logging:
   file:
     path: ./logs
 
+#光伏三相电流电压计算功率的场站
+gf3xjscz: HZJ_GDC,AK_GDC
+