Merge remote-tracking branch 'origin/master'

realtime/generationXK-service/src/main/java/com/gyee/generation/service/CoefficientService.java

@@ -214,9 +214,9 @@ public class CoefficientService {
             for (ProEconActivePowerData data : dataList) {
                 Double p1 = data.getPower();
                 Double speed = data.getSpeed();
-                if (speed < 3 || speed > 25) {
-                    continue;
-                }
+//                if (speed < 3 || speed > 25) {
+//                    continue;
+//                }
 
                 if (CacheContext.wtmap.containsKey(windturbineId)) {
                     ProBasicEquipment wt = CacheContext.wtmap.get(windturbineId);

realtime/generationXK-service/src/main/java/com/gyee/generation/service/EquipmentInfo4Service.java

@@ -62,6 +62,9 @@ public class EquipmentInfo4Service {
 
     @Resource
     private IProEconWindturbineGoodnessService proEconWindturbineGoodnessService;
+
+
+
    
     public void calEquipmentInfoDay(Date recordDate) throws Exception {
         Calendar c = Calendar.getInstance();
@@ -315,15 +318,29 @@ public class EquipmentInfo4Service {
 
                     point = wtpointmap.get(ContantXk.BZGL);
                     List<PointData> bzglls = edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime() / 1000, end.getTime() / 1000);
-                    if (!bzglls.isEmpty() && glls.size() == bzglls.size()) {
+                    point = wtpointmap.get(ContantXk.CJ_FX);
+                    List<PointData> fxls = edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime() / 1000, end.getTime() / 1000);
+
+                    if (!bzglls.isEmpty() && !fsls.isEmpty() && glls.size() == bzglls.size() && fsls.size() == bzglls.size()) {
                         double number = 0.0;
-                        for (int i = 0; i < bzglls.size(); i++) {
+                        double totalnumbere=0.0;
+                        double lastvalue=-1;
+                        for (int i = 0; i < fxls.size(); i++) {
                             double bzgl = bzglls.get(i).getPointValueInDouble();
                             double sjgl = glls.get(i).getPointValueInDouble();
-                            //日对风偏差次数（-50 +50之间）
-                            if (Math.abs(bzgl - sjgl) < 50) {
-                                number++;
+                            double fx = fxls.get(i).getPointValueInDouble();
+
+                            if(lastvalue!=fx)
+                            {
+                                //日对风偏差大于（-50 +50之间）
+                                if (Math.abs(bzgl - sjgl) > 50) {
+                                    //日对风偏差次数
+                                    number++;
+                                }
+                                //对风次数
+                                totalnumbere++;
                             }
+
                         }
 
                         pewp.setRdfpcl(number);

realtime/generationXK-service/src/main/java/com/gyee/generation/service/InputOrOutPutService.java

@@ -99,7 +99,7 @@ public class InputOrOutPutService {
                     if (!Objects.equals(lastStatus, status))
                     {
 
-                        //    #region 切入切出风速
+                        //     切入切出风速
                         if (lastStatus == 0 && status == 2)
                         {
                             ProEconInputOrOutputSpeed input = new ProEconInputOrOutputSpeed();
@@ -167,6 +167,11 @@ public class InputOrOutPutService {
         Date yearbegin = c.getTime();
 
         for (ProBasicPowerstation wp : CacheContext.wpls) {
+
+            if(wp.getId().contains(WpType.GDC.id))
+            {
+                continue;
+            }
             List<ProBasicEquipment> wtls = null;
             if (CacheContext.wpwtmap.containsKey(wp.getId())) {
                 wtls = CacheContext.wpwtmap.get(wp.getId());
@@ -175,6 +180,7 @@ public class InputOrOutPutService {
             if (null != wtls && !wtls.isEmpty()) {
                 for (ProBasicEquipment wt : wtls) {
 
+
                     ProEconInOrOutSpeedTotal total1 = null;
                     ProEconInOrOutSpeedTotal2 total2 = null;
                     QueryWrapper<ProEconInOrOutSpeedTotal> queryWrapper = new QueryWrapper<>();

realtime/generationXK-service/src/main/java/com/gyee/generation/service/PowerCurveFittingByTimeGfService.java

@@ -31,8 +31,8 @@ public class PowerCurveFittingByTimeGfService {
 
     @Value("${curvefitting.dimension}")
     private Integer dimension;
-    @Value("${curvefitting.scale}")
-    private Double scale;
+
+    private Double scale=1.0;
     @Value("${initialcode}")
     private String initialcode;
     public Map<String, Double> windturbineCapacity;
@@ -164,7 +164,7 @@ public class PowerCurveFittingByTimeGfService {
         List<ProEconCurveFittingMain> mainls=new ArrayList<>();
         for (String key : windMap.keySet()) {
 
-            Double modelpower = 1500.0;
+            Double modelpower = 500.0;
             if (windturbineCapacity.containsKey(key)) {
                 modelpower = windturbineCapacity.get(key);
             }
@@ -340,31 +340,20 @@ public class PowerCurveFittingByTimeGfService {
 
             Map<String, ProBasicEquipmentPoint> windturbinetestingpointnewMap = CacheContext.wtpAimap.get(wt.getId());
             //设备有功功率
-            String pointIdGL = windturbinetestingpointnewMap.get(ContantXk.CJ_SSGL).getNemCode();
+            String pointIdGL = null;
             //设备明细状态
-            String pointIdZT = windturbinetestingpointnewMap.get(ContantXk.MXZT).getNemCode();
-
-            String pointIdFS;
-            if (wt.getWindpowerstationId().contains(WpType.GDC.id)) {   //测风塔70米风速
-
-                if (windturbinetestingpointnewMap.containsKey(ContantXk.FCCFTFS70)) {
-                    ProBasicEquipmentPoint point = windturbinetestingpointnewMap.get(ContantXk.FCCFTFS70);
+            String pointIdZT = null;
 
-                    if (StringUtils.notEmp(point.getNemCode()) && !point.getNemCode().equals(initialcode)) {
-                        pointIdFS = windturbinetestingpointnewMap.get(ContantXk.FCCFTFS70).getNemCode();
-                    } else {
-                        pointIdFS = windturbinetestingpointnewMap.get(ContantXk.CJ_SSFS).getNemCode();
-                    }
-                } else {
-                    pointIdFS = windturbinetestingpointnewMap.get(ContantXk.CJ_SSFS).getNemCode();
-                }
-
-
-            } else {   //设备风速
+            String pointIdFS = null;
+            if (windturbinetestingpointnewMap.containsKey(ContantXk.CJ_SSFS)) {
                 pointIdFS = windturbinetestingpointnewMap.get(ContantXk.CJ_SSFS).getNemCode();
             }
-
-
+            if (windturbinetestingpointnewMap.containsKey(ContantXk.MXZT)) {
+                pointIdZT = windturbinetestingpointnewMap.get(ContantXk.MXZT).getNemCode();
+            }
+            if (windturbinetestingpointnewMap.containsKey(ContantXk.CJ_SSGL)) {
+                pointIdGL = windturbinetestingpointnewMap.get(ContantXk.CJ_SSGL).getNemCode();
+            }
             CureFittingVo item = new CureFittingVo();
 
             item.setPointIdFS(pointIdFS);
@@ -398,16 +387,16 @@ public class PowerCurveFittingByTimeGfService {
             //拟合月功率曲线
             curveFittingBuilder(begin, end, dimension, scale, windMap.get(key).getPointIdGL(), windMap.get(key).getPointIdFS(), windMap.get(key).getPointIdZT(), windMap.get(key).getYsjglPoints(), windMap.get(key).getYzyglPoints(), key);
 
-            List<PointVo> vos = windMap.get(key).getYsjglPoints().stream().filter(it -> it.getX() >= 0 && it.getX() <= 25).sorted(Comparator.comparing(PointVo::getX)).collect(Collectors.toList());
+            List<PointVo> vos = windMap.get(key).getYsjglPoints().stream().filter(it -> it.getX() >= 0 ).sorted(Comparator.comparing(PointVo::getX)).collect(Collectors.toList());
             windMap.get(key).setYsjglPoints(vos);
-            vos = windMap.get(key).getYzyglPoints().stream().filter(it -> it.getX() >= 0 && it.getX() <= 25).sorted(Comparator.comparing(PointVo::getX)).collect(Collectors.toList());
+            vos = windMap.get(key).getYzyglPoints().stream().filter(it -> it.getX() >= 0 ).sorted(Comparator.comparing(PointVo::getX)).collect(Collectors.toList());
             windMap.get(key).setYzyglPoints(vos);
 
         }
         List<ProEconCurveFittMonthMain> mainls=new ArrayList<>();
         for (String key : windMap.keySet()) {
 
-            Double modelpower = 1500.0;
+            Double modelpower = 500.0;
             if (windturbineCapacity.containsKey(key)) {
                 modelpower = windturbineCapacity.get(key);
             }
@@ -690,7 +679,7 @@ public class PowerCurveFittingByTimeGfService {
         List<ProEconCurveFittYearMain> mainls=new ArrayList<>();
         for (String key : windMap.keySet()) {
 
-            Double modelpower = 1500.0;
+            Double modelpower = 500.0;
             if (windturbineCapacity.containsKey(key)) {
                 modelpower = windturbineCapacity.get(key);
             }
@@ -1560,13 +1549,13 @@ public class PowerCurveFittingByTimeGfService {
                             } else {
                                 if (z == 2) {
 
-                                    b = (x >= 0 && x <= 30 && y >= 0 && y <= maxPower);
+                                    b = (x >= 0 && x <= 1000 && y >= 0 && y <= maxPower);
 
                                     if (b) {
-                                        if (x > 3 && y <= 0) {
+                                        if (x > 0 && y <= 0) {
                                             b = false;
                                         }
-                                        if (x <= 3 && y > 0) {
+                                        if (x <= 0 && y > 0) {
                                             b = false;
                                         }
                                     }
@@ -1616,13 +1605,13 @@ public class PowerCurveFittingByTimeGfService {
                             } else {
                                 if (z == 2) {
 
-                                    b = (x >= 0 && x <= 30 && y >= 0 && y <= maxPower);
+                                    b = (x >= 0 && x <= 1000 && y >= 0 && y <= maxPower);
 
                                     if (b) {
-                                        if (x > 3 && y <= 0) {
+                                        if (x > 0 && y <= 0) {
                                             b = false;
                                         }
-                                        if (x <= 3 && y > 0) {
+                                        if (x <= 0 && y > 0) {
                                             b = false;
                                         }
                                     }
@@ -1650,7 +1639,7 @@ public class PowerCurveFittingByTimeGfService {
                 }
                 sjglnhpoints.add(new PointfVo(0.0, 0.0));
 
-                sjglnhpoints = sjglnhpoints.stream().filter(it -> it.getX() >= 3).sorted(Comparator.comparing(PointfVo::getX)).collect(Collectors.toList());
+                sjglnhpoints = sjglnhpoints.stream().filter(it -> it.getX() >= 0).sorted(Comparator.comparing(PointfVo::getX)).collect(Collectors.toList());
 //                if (sjglnhpoints.stream().min(Comparator.comparing(PointfVo::getX)).isPresent()) {
 //                    double  Xmax = sjglnhpoints.stream().max(Comparator.comparing(PointfVo::getX)).get().getX();
 //                    double  Ymax = sjglnhpoints.stream().max(Comparator.comparing(PointfVo::getX)).get().getY();
@@ -1668,7 +1657,7 @@ public class PowerCurveFittingByTimeGfService {
                 if (!zyglnhpoints.containsKey(0.0))
                     zyglnhpoints.put(0.0, new PointfVo(0.0, 0.0));
 
-                List<PointfVo> zygltemp = zyglnhpoints.values().stream().filter(it -> it.getX() >= 3).sorted(Comparator.comparing(PointfVo::getX)).collect(Collectors.toList());
+                List<PointfVo> zygltemp = zyglnhpoints.values().stream().filter(it -> it.getX() >= 0).sorted(Comparator.comparing(PointfVo::getX)).collect(Collectors.toList());
                 if (zygltemp.size() != 0) {
                     temp = LineUtil.buildLine(zygltemp.stream().mapToDouble(PointfVo::getX).toArray(), zygltemp.stream().mapToDouble(PointfVo::getY).toArray(), zygltemp.size(), dimension, scale);
                 }
@@ -1683,15 +1672,15 @@ public class PowerCurveFittingByTimeGfService {
     private static void buildMyPoints(List<PointVo> sjglPoints, double scale) {
         int coefficient = 1;
         int dec = 0;
-        int smax = 25;
-        if (scale == 0.01) {
-            coefficient = 100;
-            dec = 2;
-        }
-        if (scale == 0.1) {
-            coefficient = 10;
-            dec = 1;
-        }
+        int smax = 1000;
+//        if (scale == 0.01) {
+//            coefficient = 100;
+//            dec = 2;
+//        }
+//        if (scale == 0.1) {
+//            coefficient = 10;
+//            dec = 1;
+//        }
 
         smax *= coefficient;
 

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WpwindDayInfoService.java

@@ -5,6 +5,7 @@ import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
+import com.gyee.generation.model.vo.WpType;
 import com.gyee.generation.service.auto.IProBasicWeatherStationService;
 import com.gyee.generation.service.auto.IProEconWpwindDayInfoService;
 import com.gyee.generation.util.DateUtils;
@@ -58,7 +59,7 @@ public class WpwindDayInfoService {
 
         List<ProEconWpwindDayInfo> dayls = new ArrayList<>();
         for (ProBasicWeatherStation ws : CacheContext.wsls) {
-            if (CacheContext.wspointmap.containsKey(ws.getId())) {
+            if (CacheContext.wspointmap.containsKey(ws.getId()) && ws.getWindpowerstationId().contains(WpType.FDC.id)) {
                 Map<String, ProBasicPowerstationPoint> pointmap = CacheContext.wspointmap.get(ws.getId());
 
                 ProEconWpwindDayInfo pewp = new ProEconWpwindDayInfo();

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WtwindDayInfoService.java

@@ -59,7 +59,7 @@ public class WtwindDayInfoService {
 
         List<ProEconWtwindDayInfo> dayls = new ArrayList<>();
         for (ProBasicEquipment wt : CacheContext.wtls) {
-            if (CacheContext.wtpAimap.containsKey(wt.getId())) {
+            if (CacheContext.wtpAimap.containsKey(wt.getId()) && wt.getWindpowerstationId().contains(WpType.FDC.id)) {
               
                 Map<String, ProBasicEquipmentPoint> pointmap = CacheContext.wtpAimap.get(wt.getId());
                 ProEconWtwindDayInfo pewp = new ProEconWtwindDayInfo();

realtime/generationXK-service/src/main/java/com/gyee/generation/task/SaticSchedulePgTask.java

@@ -372,6 +372,8 @@ public class SaticSchedulePgTask {
         XxlJobHelper.log("等级评估统计调度程序执行开始!........");
         try {
             equipmentInfoDayTopService.calEquipmentInfoDayTop(new Date());
+            equipmentInfoDayTopService.calEquipmentInfoMonthTop(new Date());
+            equipmentInfoDayTopService.calEquipmentInfoYearTop(new Date());
         } catch (Exception e) {
             e.printStackTrace();
         }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicLogicalUnitController.java

@@ -4,7 +4,6 @@ package com.gyee.backconfig.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProBasicLogicalUnit;
-import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
 import com.gyee.backconfig.service.auto.IProBasicLogicalUnitService;
 import com.gyee.backconfig.service.auto.impl.ProEconLogicalUnitServiceImpl;
 import io.swagger.annotations.ApiOperation;

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProEconEquipmentmodelController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
 import com.gyee.backconfig.service.auto.IProEconEquipmentmodelService;
+import com.gyee.backconfig.service.auto.impl.ProBasicLogicalUnitServiceImpl;
+import com.gyee.backconfig.service.auto.impl.ProEconLogicalUnitServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
@@ -26,7 +28,8 @@ import java.util.Arrays;
 public class ProEconEquipmentmodelController {
     @Resource
     private IProEconEquipmentmodelService proEconEquipmentmodelService;
-
+    @Resource
+    private ProBasicLogicalUnitServiceImpl proBasicLogicalUnitService;
     /**
      * 查询
      * @param id
@@ -62,6 +65,7 @@ public class ProEconEquipmentmodelController {
 
         boolean b = proEconEquipmentmodelService.saveOrUpdate(proEconEquipmentmodel);
         if (b) {
+            proBasicLogicalUnitService.addxh(proEconEquipmentmodel);
             return R.ok().data(b);
         } else {
             return R.error().data("保存失败！");

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProEconLogicalUnitController.java

@@ -25,17 +25,6 @@ public class ProEconLogicalUnitController {
     @Autowired
     private IProEconLogicalUnitService proEconLogicalUnitService;
 
-    @PostMapping(value = "/add")
-    public R addGeneratePoint(@RequestParam(value = "jx", required = false) ProBasicLogicalUnit jx) {
-
-        boolean jxd = proEconLogicalUnitService.addgl(jx);
-        if (!jxd) {
-            return R.ok().data(jxd);
-        } else {
-            return R.error().data("查询失败！");
-        }
-
-    }
 
     /**
      * 查询

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicLogicalUnitService.java

@@ -17,4 +17,6 @@ import java.util.List;
  */
 public interface IProBasicLogicalUnitService extends IService<ProBasicLogicalUnit> {
     IPage<ProBasicLogicalUnit> Bylist(String nemCode, String pageNum, String pageSize);
+
+    public boolean addxh(ProEconEquipmentmodel jx);
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProEconLogicalUnitService.java

@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface IProEconLogicalUnitService extends IService<ProEconLogicalUnit> {
 
-    public boolean addgl(ProBasicLogicalUnit jx);
+    public boolean addgl(ProBasicLogicalUnit bj);
 
     List<ProEconLogicalUnit> list1(String[] modelId);
 

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicLogicalUnitServiceImpl.java

@@ -3,15 +3,20 @@ package com.gyee.backconfig.service.auto.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gyee.backconfig.config.CacheContext;
 import com.gyee.backconfig.model.auto.ProBasicLogicalUnit;
 import com.gyee.backconfig.mapper.auto.ProBasicLogicalUnitMapper;
 import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
+import com.gyee.backconfig.model.auto.ProEconLogicalUnit;
 import com.gyee.backconfig.service.auto.IProBasicLogicalUnitService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.common.model.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -24,6 +29,9 @@ import java.util.List;
 @Service
 public class ProBasicLogicalUnitServiceImpl extends ServiceImpl<ProBasicLogicalUnitMapper, ProBasicLogicalUnit> implements IProBasicLogicalUnitService {
 
+    @Autowired
+    private IProBasicLogicalUnitService proBasicLogicalUnitService;//部件
+
     @Override
     public IPage<ProBasicLogicalUnit> Bylist(String nemCode, String pageNum, String pageSize) {
         QueryWrapper<ProBasicLogicalUnit> qw = new QueryWrapper<>();
@@ -35,4 +43,35 @@ public class ProBasicLogicalUnitServiceImpl extends ServiceImpl<ProBasicLogicalU
         IPage<ProBasicLogicalUnit> companysPage = getBaseMapper().selectPage(page, qw);
         return companysPage;
     }
+
+    @Override
+    public boolean addxh(ProEconEquipmentmodel jx) {
+
+        List<ProBasicLogicalUnit> list = new ArrayList<>();
+        List<ProBasicLogicalUnit> units = CacheContext.unitls;//部件
+
+        List<ProEconEquipmentmodel> list1 = new ArrayList<>();
+        List<ProEconEquipmentmodel> modells = CacheContext.Equipments;//型号
+
+        if (!units.isEmpty()) {
+
+            for (ProBasicLogicalUnit p1 : units) {
+                ProBasicLogicalUnit vo1 = new ProBasicLogicalUnit();
+                if (StringUtils.notEmp(p1.getName())) {
+
+                    for (ProEconEquipmentmodel p2 : modells) {
+                        vo1.setAname(p1.getAname());
+                        vo1.setNemCode(p1.getNemCode());
+                        vo1.setName(p1.getName());
+                    }
+
+                }
+                list.add(vo1);
+            }
+
+        }
+
+
+        return proBasicLogicalUnitService.saveOrUpdateBatch(list);
+    }
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProEconLogicalUnitServiceImpl.java

@@ -38,33 +38,35 @@ public class ProEconLogicalUnitServiceImpl extends ServiceImpl<ProEconLogicalUni
     private IProBasicLogicalUnitService proBasicLogicalUnitService;//部件
 
     @Autowired
-    private IProEconLogicalUnitService proEconLogicalUnitService;
+    private IProEconLogicalUnitService proEconLogicalUnitService; //关联
 
     @Override
-    public boolean addgl(ProBasicLogicalUnit jx) {
+    public boolean addgl(ProBasicLogicalUnit bj) {
 
         QueryWrapper<ProEconLogicalUnit> qw = new QueryWrapper<>(); //关联
         List<ProEconLogicalUnit> list = baseMapper.selectList(qw);
 
-        List<ProBasicLogicalUnit> list1 = new ArrayList<>();
-
+        List<ProEconLogicalUnit> list1 = new ArrayList<>();
         List<ProBasicLogicalUnit> units = CacheContext.unitls;//部件
 
         if (!list.isEmpty()) {
+            ProEconLogicalUnit vo1 = new ProEconLogicalUnit();
             for (ProEconLogicalUnit p1 : list) {
-                if (StringUtils.notEmp(p1.getId())) {
-                    ProEconLogicalUnit vo1 = new ProEconLogicalUnit();
+
+                if (StringUtils.notEmp(p1.getName())) {
+
                     for (ProBasicLogicalUnit p2 : units) {
+                        if (StringUtils.notEmp(p2.getName()))
                         vo1.setAname(p2.getAname());
                         vo1.setName(p2.getName());
                         vo1.setNemCode(p2.getNemCode());
-                        list.add(vo1);
                     }
                 }
             }
+            list1.add(vo1);
         }
 
-        return this.saveOrUpdateBatch(list);
+        return proEconLogicalUnitService.saveOrUpdateBatch(list1);
     }
 
     @Override