单机偏差分析增加年份筛选框3

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/WindDirection/WindDirectionController.java

@@ -49,9 +49,9 @@ public class WindDirectionController {
      * @return
      */
     @GetMapping("/machine")
-    public JSONObject Deviationmachine(String wpid) throws Exception {
+    public JSONObject Deviationmachine(String wpid,int year) throws Exception {
 
-        Object o = windMachineService.machine(wpid);
+        Object o = windMachineService.machine(wpid,year);
         return JsonResult.successData(ResultCode.SUCCESS, o);
     }
 
@@ -61,9 +61,9 @@ public class WindDirectionController {
      * @return
      */
     @GetMapping("/weatherMachine")
-    public JSONObject weathermachine(String wpid) throws Exception {
+    public JSONObject weathermachine(String wpid,int year) throws Exception {
 
-        Object o = windMachineService.weathermachine(wpid);
+        Object o = windMachineService.weathermachine(wpid,year);
         return JsonResult.successData(ResultCode.SUCCESS, o);
     }
 

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/WindDirection/WindMachineService.java

@@ -25,9 +25,10 @@ public class WindMachineService {
     private IStationInfoDayService stationInfoDayService;
 
 
-    public Object machine(String wpid) throws Exception {
+    public Object machine(String wpid,int year) throws Exception {
         // 获取当前日期
         int currentYear = LocalDate.now().getYear();
+        currentYear = year;
 
         List<ProBasicEquipment> collect = CacheContext.wtls.stream()
                 .filter(wt -> wpid.equals(wt.getWindpowerstationId()))
@@ -168,9 +169,10 @@ public class WindMachineService {
      * @return
      * @throws Exception
      */
-    public Object weathermachine(String wpid) throws Exception {
+    public Object weathermachine(String wpid,int year) throws Exception {
         // 获取当前日期
         int currentYear = LocalDate.now().getYear();
+        currentYear= year;
 
         List<ProBasicEquipment> collect = CacheContext.wtls.stream()
                 .filter(wt -> wpid.equals(wt.getWindpowerstationId()))

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MatrixService.java

@@ -106,6 +106,7 @@ public class MatrixService {
         wpls.parallelStream().forEach(wp -> {
             List<MatrixVo> volist = new ArrayList<>();
             List<String> wpPoints = new ArrayList<>();
+            List<String> wpglPoints = new ArrayList<>();
             List<String> wtPoints = new ArrayList<>();
             List<String> wtmxPoints = new ArrayList<>();
             List<String> wtPoints1 = new ArrayList<>();
@@ -127,6 +128,7 @@ public class MatrixService {
             wpPoints.add(pointMap.get(ContantXk.SSZBZGL).getNemCode());
             wpPoints.add(pointMap.get(ContantXk.SSZNHGLZS).getNemCode());
             wpPoints.add(pointMap.get(ContantXk.SSZGL).getNemCode());
+            wpglPoints.add(pointMap.get(ContantXk.SSZLLGL).getNemCode());
 
             List<ProBasicEquipment> equipments = wpwtmap.get(wp.getId());
             equipments.stream().forEach(wt -> {
@@ -153,6 +155,7 @@ public class MatrixService {
                 List<PointData> wtRealdatas = edosUtil.getRealData(wtPoints);
                 List<PointData> wtmxRealdatas = edosUtil.getRealData(wtmxPoints);
                 List<PointData> wtRealdatas1 = edosUtil.getRealData(wtPoints1);
+                List<PointData> wpRealdatagl = edosUtil.getRealData(wpglPoints);
 //                List<PointData> wpRealdatas = edosUtil.getRealData(wpPoints);