Merge branch 'master' of http://124.70.43.205:3000/xieshengjie/sis

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Electricity/Electricityservice.java

@@ -268,8 +268,15 @@ public class Electricityservice {
 
                         List<ProEconStationPower> dqyc = powerService.getlist2(wpls.getId(), firstDayOfYearZeroHour,currentyear);
                         if (!dqyc.isEmpty() && dqyc != null) {
-                            dqzqlhjsum = dqyc.stream().map(ProEconStationPower::getPowerAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
+//                            dqzqlhjsum = dqyc.stream().map(ProEconStationPower::getPowerAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
                             rfdlychjsum = dqyc.stream().map(ProEconStationPower::getDayPowerForecast).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+                            double average = dqyc.stream()
+                                    .mapToDouble(power -> power.getPowerAccuracy().doubleValue())
+                                    .average()
+                                    .orElse(0.0);
+
+                            dqzqlhjsum = BigDecimal.valueOf(StringUtils.round(average,2));
                         }
                         map.put("bnjhdlhj", MathUtil.twoBit(yeardlsum));
                         map.put("rfdlychj", rfdlychjsum.divide(BigDecimal.valueOf(10000),2));

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/analysis/AnalysisNewService.java

@@ -77,9 +77,9 @@ public class AnalysisNewService {
         List<ProEconAnalysisSubtableBottom> Listbat = new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
 //            if (wp.getId().equals("SXJ_KGDL_XWT_FDC_STA")) continue;
-//
+
 ////            补充数据可将其打开
-//            if (wp.getId().equals("SXJ_KGDL_GJY_FDC_STA")) {
+//            if (wp.getId().equals("SXJ_KGDL_YX_GDC_STA")) {
 //
 //                for (int g = 0; g <= 56; g++) {
 
@@ -120,13 +120,12 @@ public class AnalysisNewService {
                 }
 
             }
-                    proEconAnalysisSubtableBottomService.batchAdd(Listbat);
-
 //                    beginDate = DateUtils.addDays(beginDate, -1);
 //                    calendar.add(Calendar.DAY_OF_MONTH, -1);
 //                    endDate = calendar.getTime();
 //                }
-            // 恢复初始值
+            proEconAnalysisSubtableBottomService.batchAdd(Listbat);
+//             恢复初始值
 //            beginDate = initialFirstDayZeroHour;
 //            }
 

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

@@ -19,6 +19,7 @@ import com.gyee.runeconomy.model.auto.*;
 import com.gyee.runeconomy.service.TokenService;
 import com.gyee.runeconomy.service.auto.IProBasicPowerPointService;
 import com.gyee.runeconomy.service.auto.IProBasicPowerstationPointService;
+import com.gyee.runeconomy.service.auto.impl.ProEconManufacturerServiceImpl;
 import com.gyee.runeconomy.util.StringUtils;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;
@@ -48,6 +49,9 @@ public class MatrixService {
     @Resource
     private IProBasicPowerstationPointService pointService;
 
+    @Resource
+    private ProEconManufacturerServiceImpl proEconManufacturerService;
+
     public Map<String, Object> matrixMX(String company, String type) throws Exception {
 
         HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
@@ -835,14 +839,19 @@ public class MatrixService {
             List<ProBasicEquipment> collect = CacheContext.wtls.stream().filter(w -> wtid.equals(w.getId())).collect(Collectors.toList());
             List<ProEconEquipmentmodel> cs = CacheContext.equipmentmodels.stream().filter(m -> collect.get(0).getModelId().equals(m.getId())).collect(Collectors.toList());
 
+            QueryWrapper<ProEconManufacturer> eq = new QueryWrapper<>();
+            eq.lambda().eq(ProEconManufacturer::getId,cs.get(0).getWindturbineManufacturerId());
+            List<ProEconManufacturer> list = proEconManufacturerService.getBaseMapper().selectList(eq);
+
+
             List<ProBasicSquare> squares = CacheContext.sqls.stream().filter(s -> collect.get(0).getSquareId().equals(s.getId())).collect(Collectors.toList());
             if (wtid.contains("F_WT")) {
                 map.put("model", cs.get(0).getId());
-                map.put("manufacturer", cs.get(0).getWindturbineManufacturerId());
+                map.put("manufacturer", list.get(0).getName());
             }
             if (wtid.contains("G_IN")) {
                 map.put("model", cs.get(0).getId());
-                map.put("manufacturer", cs.get(0).getWindturbineManufacturerId());
+                map.put("manufacturer", list.get(0).getName());
                 map.put("squareid", squares.get(0).getTypes());
             }
         }