风机功率风速分析 接口

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/agc/AgcDeviateController.java

@@ -100,10 +100,10 @@ public class AgcDeviateController {
 
         DateTime date = DateUtil.date(endTs * 1000);
         Map<String, List<SpeedPowerAnalysis>> map = new HashMap<>();
-        List<SpeedPowerAnalysis> ls = new ArrayList<>();
         String[] wtIds = windturbineId.split(",");
         List<String> wtIdsLs = Arrays.asList(wtIds);
         for (String wtId : wtIdsLs) {
+            List<SpeedPowerAnalysis> ls = new ArrayList<>();
             SpeedPowerAnalysis spa = new SpeedPowerAnalysis();
             List<ProBasicEquipmentPoint> proBasicEquipmentPoints = CacheContext.pointNewMap.get(wtId);
             List<ProBasicEquipmentPoint> speedPoint = proBasicEquipmentPoints.stream().filter(p -> p.getUniformCode().equals("AI066")).collect(Collectors.toList());

runeconomy-xk/src/main/java/com/gyee/runeconomy/model/TemperatureInfo.java

@@ -149,48 +149,6 @@ public class TemperatureInfo implements Serializable {
         isSorted = true;
     }
 
-//    Comparator<TemperatureComponentInfo> comparator = new Comparator<TemperatureComponentInfo>() {
-//        @Override
-//        public int compare(TemperatureComponentInfo t1, TemperatureComponentInfo t2) {
-//            String name1 = t1.getName();
-//            String name2 = t2.getName();
-//
-//            int index1 = order.indexOf(name1);
-//            int index2 = order.indexOf(name2);
-//
-//            if (index1 == -1) {
-//                return index2 == -1 ? 0 : 1;
-//            } else if (index2 == -1) {
-//                return -1;
-//            } else {
-//                return Integer.compare(index1, index2);
-//            }
-//        }
-//    };
-
-
-
-
-//    Comparator<Map<String, TemperatureComponentInfo>> comparator = new Comparator<Map<String, TemperatureComponentInfo>>() {
-//        @Override
-//        public int compare(Map<String, TemperatureComponentInfo> o1, Map<String, TemperatureComponentInfo> o2) {
-//            String name1 = (String) o1.get("name");
-//            Set<String> strings = o1.keySet();
-//            String name2 = (String) o2.get("name");
-//
-//            int index1 = order.indexOf(name1);
-//            int index2 = order.indexOf(name2);
-//
-//            // 如果某个名称不在顺序列表中，则将其放在最后
-//            if (index1 == -1) {
-//                return index2 == -1 ? 0 : 1;
-//            } else if (index2 == -1) {
-//                return -1;
-//            } else {
-//                return Integer.compare(index1, index2);
-//            }
-//        }
-//    };
 
     public List<TemperatureComponentInfo> getTemperatureComponentInfos() {
         if (temperatureComponentInfos == null) {

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -366,6 +366,7 @@ public class BenchmarkingService {
 
         list.stream().forEach(i -> {
             FjjxbVo vo = new FjjxbVo();
+            FjjxbVo vo2 = new FjjxbVo();
             if (sttype.equals("1")) {
                 vo.setId(i.getStationId());
                 vo.setName(CacheContext.wpmap.get(i.getStationId().trim()).getAname());
@@ -412,12 +413,18 @@ public class BenchmarkingService {
                 vo.setId(i.getTurbineId());
                 vo.setName(CacheContext.wtmap.get(i.getTurbineId().trim()).getAname());
                 vo.setOrdernum(CacheContext.wtmap.get(i.getTurbineId().trim()).getOrderNum());
+                vo2.setId(i.getTurbineId());
+                vo2.setName(CacheContext.wtmap.get(i.getTurbineId().trim()).getAname());
+                vo2.setOrdernum(CacheContext.wtmap.get(i.getTurbineId().trim()).getOrderNum());
             }
             vo.setSjfdl(BigDecimalUtils.divide(BigDecimal.valueOf(i.getRfdl()), new BigDecimal(1), 2).doubleValue());
             vo.setLlfdl(BigDecimalUtils.divide(BigDecimal.valueOf(i.getLlfdl()), new BigDecimal(1), 2).doubleValue());
+            vo2.setSjfdl(BigDecimalUtils.divide(BigDecimal.valueOf(i.getRfdl() / 1000), new BigDecimal(1), 2).doubleValue());
+            vo2.setLlfdl(BigDecimalUtils.divide(BigDecimal.valueOf(i.getLlfdl() / 1000), new BigDecimal(1), 2).doubleValue());
 
             if (sttype.isEmpty()) {
                 vo.setSpeed(BigDecimalUtils.divide(BigDecimal.valueOf(i.getPjfs()), new BigDecimal(1), 2).doubleValue());
+                vo2.setSpeed(BigDecimalUtils.divide(BigDecimal.valueOf(i.getPjfs()), new BigDecimal(1), 2).doubleValue());
             }
             vo.setFjhjx(BigDecimalUtils.divide(BigDecimal.valueOf(i.getFjhjxss()), new BigDecimal(1), 2).doubleValue());
             vo.setJhjx(BigDecimalUtils.divide(BigDecimal.valueOf(i.getJhjxss()), new BigDecimal(1), 2).doubleValue());
@@ -428,6 +435,14 @@ public class BenchmarkingService {
             vo.setFnlly(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getSjfdl() / vo.getLlfdl() * 100, 2) : 0);
             vo.setPoint(DoubleUtils.keepPrecision(vo.getLlfdl() * 1.1, 2));
 
+            vo2.setFjhjx(BigDecimalUtils.divide(BigDecimal.valueOf(i.getFjhjxss() / 1000), new BigDecimal(1), 2).doubleValue());
+            vo2.setJhjx(BigDecimalUtils.divide(BigDecimal.valueOf(i.getJhjxss() / 1000), new BigDecimal(1), 2).doubleValue());
+            vo2.setXd(BigDecimalUtils.divide(BigDecimal.valueOf(i.getXdss() / 1000), new BigDecimal(1), 2).doubleValue());
+            vo2.setSl(BigDecimalUtils.divide(BigDecimal.valueOf(i.getSlss() / 1000), new BigDecimal(1), 2).doubleValue());
+            vo2.setXn(BigDecimalUtils.divide(BigDecimal.valueOf(i.getXnss() / 1000), new BigDecimal(1), 2).doubleValue());
+            vo2.setFnlly(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getSjfdl() / vo.getLlfdl() * 100, 2) : 0);
+            vo2.setPoint(DoubleUtils.keepPrecision(vo.getLlfdl() * 1.1, 2));
+
             llfdl.updateAndGet(v -> (double) (v + vo.getLlfdl()));
             sjfdl.updateAndGet(v -> (double) (v + vo.getSjfdl()));
             pjfs.updateAndGet(v -> (double) (v + vo.getSpeed()));
@@ -436,7 +451,7 @@ public class BenchmarkingService {
             xd.updateAndGet(v -> (double) (v + vo.getXd()));
             xn.updateAndGet(v -> (double) (v + vo.getXn()));
             sl.updateAndGet(v -> (double) (v + vo.getSl()));
-            resultList.add(vo);
+            resultList.add(vo2);
         });
         if (StringUtils.isNotEmpty(target) && StringUtils.isNotEmpty(sort)) {
             if (sort.equals("1")) {
@@ -451,14 +466,14 @@ public class BenchmarkingService {
         FjjxbVo vo = new FjjxbVo();
         vo.setId("hj");
         vo.setName("合计");
-        vo.setSjfdl(DoubleUtils.keepPrecision(sjfdl.get()/1000, 2));
-        vo.setLlfdl(DoubleUtils.keepPrecision(llfdl.get()/1000, 2));
+        vo.setSjfdl(DoubleUtils.keepPrecision(sjfdl.get() / 1000, 2));
+        vo.setLlfdl(DoubleUtils.keepPrecision(llfdl.get() / 1000, 2));
         vo.setSpeed(list.size() != 0 ? DoubleUtils.keepPrecision(pjfs.get() / list.size(), 2) : 0.0);
-        vo.setJhjx(DoubleUtils.keepPrecision(wh.get()/1000, 2));
-        vo.setFjhjx(DoubleUtils.keepPrecision(gz.get()/1000, 2));
-        vo.setXd(DoubleUtils.keepPrecision(xd.get()/1000, 2));
-        vo.setXn(DoubleUtils.keepPrecision(xn.get()/1000, 2));
-        vo.setSl(DoubleUtils.keepPrecision(sl.get()/1000, 2));
+        vo.setJhjx(DoubleUtils.keepPrecision(wh.get() / 1000, 2));
+        vo.setFjhjx(DoubleUtils.keepPrecision(gz.get() / 1000, 2));
+        vo.setXd(DoubleUtils.keepPrecision(xd.get() / 1000, 2));
+        vo.setXn(DoubleUtils.keepPrecision(xn.get() / 1000, 2));
+        vo.setSl(DoubleUtils.keepPrecision(sl.get() / 1000, 2));
         vo.setFnlly(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getSjfdl() / vo.getLlfdl() * 100, 2) : 0.0);
         vo.setPoint(DoubleUtils.keepPrecision(vo.getLlfdl() * 1.1, 2));
         resultList.add(vo);