bug调整

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/analysis/AnalysisNewController.java

@@ -26,12 +26,12 @@ public class AnalysisNewController {
     @GetMapping(value = "/companys")
     @ApiOperation(value = "公司列表", notes = "公司列表")
     public R companys() throws Exception {
-         analysisNewService.companys();
+        analysisNewService.companys();
 
         return null;
     }
 
-    @Scheduled(cron = "0 15 0 * * ?")
+    @Scheduled(cron = "0 30 0 * * ?")
     @GetMapping(value = "/can")
     @ApiOperation(value = "公司列表", notes = "公司列表")
     public R cans() throws Exception {
@@ -56,9 +56,23 @@ public class AnalysisNewController {
         calendar.add(Calendar.DAY_OF_MONTH, 1);
         Date endDate = calendar.getTime();
 
+
+        //补充数据可将其打开
+//        for (int i = 0; i < 44; i++) {
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+//
+//        String beginDateStr = sdf.format(beginDate);
+//        String endDateStr = sdf.format(endDate);
+
+
         String yesterday = DateUtils.getYesterdayStr("yyyy-MM-dd");
         analysisNewService.saveWindProject(yesterday,yesterday);
 
+//          beginDate = DateUtils.addDays(beginDate, -1);
+//          calendar.add(Calendar.DAY_OF_MONTH, -1);
+//          endDate = calendar.getTime();
+//        }
+
         return null;
     }
 }

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

@@ -76,6 +76,11 @@ public class AnalysisNewService {
         List<ProEconAnalysisSubtableBottom> stringList = new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
 
+//            补充数据可将其打开
+//            if (wp.getId().equals("SXJ_KGDL_JR_GDC_STA")) {
+//
+//                for (int g = 0; g <= 44; g++) {
+
             List<ProBasicMeterPoint> meterPoints = proBasicMeterPointService.getBaseMapper().selectList(null);
 
             List<ProBasicMeterPoint> collect = meterPoints.stream().filter(i -> i.getWindpowerstationId().equals(wp.getId())).collect(Collectors.toList());
@@ -91,8 +96,8 @@ public class AnalysisNewService {
                     PointData begin = edosUtil.getSectionData(point, beginDate.getTime());
                     PointData end = edosUtil.getSectionData(point, endDate.getTime());
 
-                    double temp1 =0.0;
-                    double temp2 =0.0;
+                    double temp1 = 0.0;
+                    double temp2 = 0.0;
 
                     temp1 = begin.getPointValueInDouble();
                     temp2 = end.getPointValueInDouble();
@@ -113,8 +118,12 @@ public class AnalysisNewService {
                     proEconAnalysisSubtableBottomService.batchAdd(stringList);
                 }
             }
+//                    beginDate = DateUtils.addDays(beginDate, -1);
+//                    calendar.add(Calendar.DAY_OF_MONTH, -1);
+//                    endDate = calendar.getTime();
+//                }
+//            }
         }
-
     }
 
 
@@ -176,14 +185,14 @@ public class AnalysisNewService {
                                 i.getMeterSort().equals("主") && i.getMeterType().equals("出线") && i.getUniformCode().equals("FXYG") && i.getProjectId().contains(project.getId())
                         )).collect(Collectors.toList());
                 if (fcswmeter!=null &&fcswmeter.size()>1){
-                String[] lineids = fcswmeter.get(0).getLineId().split("\\|");
-
-                fcfdl = Arrays.stream(lineids).map(lineid ->
-                                wpmeterMap.get(project.getWindpowerstationId())
-                                        .stream().filter(j -> j.getMeterSort().equals("主") && j.getMeterType().equals("进线") && j.getUniformCode().equals("ZXYG") && j.getLineId().equals(lineid)).findFirst().get())
-                        .mapToDouble(linemeterpoint2 -> currentDay.stream()
-                                .filter(currentBdz -> currentBdz.getMeterId().equals(linemeterpoint2.getNemCode()))
-                                .findFirst().get().getDayValueModify()).sum();
+                    String[] lineids = fcswmeter.get(0).getLineId().split("\\|");
+
+                    fcfdl = Arrays.stream(lineids).map(lineid ->
+                                    wpmeterMap.get(project.getWindpowerstationId())
+                                            .stream().filter(j -> j.getMeterSort().equals("主") && j.getMeterType().equals("进线") && j.getUniformCode().equals("ZXYG") && j.getLineId().equals(lineid)).findFirst().get())
+                            .mapToDouble(linemeterpoint2 -> currentDay.stream()
+                                    .filter(currentBdz -> currentBdz.getMeterId().equals(linemeterpoint2.getNemCode()))
+                                    .findFirst().get().getDayValueModify()).sum();
 
 
                 }

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

@@ -632,10 +632,10 @@ public class MonitorService {
                 {
                     nfdltemp=nfdltemp+Double.valueOf(map.get("fd_n_sjdl"));
                 }
-                jym = new BigDecimal(nfdltemp * 0.37).divide(new BigDecimal(10000 ), 2, RoundingMode.HALF_EVEN).doubleValue();
-                jys = new BigDecimal(nfdltemp * 3.05).divide(new BigDecimal(10000  ), 2, RoundingMode.HALF_EVEN).doubleValue();
-                co2 = new BigDecimal(nfdltemp * 0.8568).divide(new BigDecimal(10000  ), 2, RoundingMode.HALF_EVEN).doubleValue();
-                so2 = new BigDecimal(nfdltemp * 0.0059).divide(new BigDecimal(10000 ), 2, RoundingMode.HALF_EVEN).doubleValue();
+                jym = new BigDecimal(nfdltemp * 0.37).divide(new BigDecimal(10000*10000 ), 2, RoundingMode.HALF_EVEN).doubleValue();
+                jys = new BigDecimal(nfdltemp * 3.05).divide(new BigDecimal(10000*10000   ), 2, RoundingMode.HALF_EVEN).doubleValue();
+                co2 = new BigDecimal(nfdltemp * 0.8568).divide(new BigDecimal(10000*10000   ), 2, RoundingMode.HALF_EVEN).doubleValue();
+                so2 = new BigDecimal(nfdltemp * 0.0059).divide(new BigDecimal(10000*10000  ), 2, RoundingMode.HALF_EVEN).doubleValue();
 
                 if (wpId.contains(QS)) {
 
@@ -728,6 +728,22 @@ public class MonitorService {
                 ProBasicPowerstationPoint jymvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYM);
                 jym = edosUtil.getRealData(jymvalue).getPointValueInDouble();
 
+                Map<String, Double> map=(Map<String, Double>)plan(wpId).get("proplanmap");
+
+
+                double nfdltemp=0.0;
+                if(map.containsKey("gf_n_sjdl"))
+                {
+                    nfdltemp=nfdltemp+Double.valueOf(map.get("gf_n_sjdl"));
+                }
+                if(map.containsKey("fd_n_sjdl"))
+                {
+                    nfdltemp=nfdltemp+Double.valueOf(map.get("fd_n_sjdl"));
+                }
+                jym = new BigDecimal(nfdltemp * 0.37).divide(new BigDecimal(10000*10000 ), 2, RoundingMode.HALF_EVEN).doubleValue();
+                jys = new BigDecimal(nfdltemp * 3.05).divide(new BigDecimal(10000*10000   ), 2, RoundingMode.HALF_EVEN).doubleValue();
+                co2 = new BigDecimal(nfdltemp * 0.8568).divide(new BigDecimal(10000*10000   ), 2, RoundingMode.HALF_EVEN).doubleValue();
+                so2 = new BigDecimal(nfdltemp * 0.0059).divide(new BigDecimal(10000*10000  ), 2, RoundingMode.HALF_EVEN).doubleValue();
 
             }
             List<ProBasicEnergyGroup> gpls = CacheContext.gpls;
@@ -2296,9 +2312,9 @@ public class MonitorService {
                         ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.NFDL);
                         nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
 
-                        fd_r_sjdl = fd_r_sjdl + rfdlsj;
-                        fd_y_sjdl = fd_y_sjdl + yfdlsj;
-                        fd_n_sjdl = fd_n_sjdl + nfdlsj;
+                        fd_r_sjdl1 = BigDecimal.valueOf(rfdlsj);
+                        fd_y_sjdl1 = BigDecimal.valueOf(yfdlsj);
+                        fd_n_sjdl1 = BigDecimal.valueOf(nfdlsj);
                     }
                     fd_r_jhdl = fd_r_jhdl + yfdljh / 30;
                     fd_y_jhdl = fd_y_jhdl + yfdljh;
@@ -2319,9 +2335,9 @@ public class MonitorService {
                         ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.NFDL);
                         nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
 
-                        gf_r_sjdl = gf_r_sjdl + rfdlsj;
-                        gf_y_sjdl = gf_y_sjdl + yfdlsj;
-                        gf_n_sjdl = gf_n_sjdl + nfdlsj;
+                        gf_r_sjdl1 = BigDecimal.valueOf(rfdlsj);
+                        gf_y_sjdl1 = BigDecimal.valueOf(yfdlsj);
+                        gf_n_sjdl1 = BigDecimal.valueOf(nfdlsj);
                     }
                     gf_r_jhdl = gf_r_jhdl + yfdljh / 30;
                     gf_y_jhdl = gf_y_jhdl + yfdljh;
@@ -2348,13 +2364,13 @@ public class MonitorService {
                 fd_n_sjdl = 0;
             }
 
-            if (wpId.endsWith("-2")){
+            if (wpId.endsWith("-2") || wpId.contains("GDC")){
                 fd_r_sjdl1 = BigDecimal.valueOf(0);
                 fd_y_sjdl1 = BigDecimal.valueOf(0);
                 fd_n_sjdl1 = BigDecimal.valueOf(0);
             }
 
-            if (wpId.endsWith("-1")){
+            if (wpId.endsWith("-1") || wpId.contains("FDC")){
                 gf_r_sjdl1 = BigDecimal.valueOf(0);
                 gf_y_sjdl1 = BigDecimal.valueOf(0);
                 gf_n_sjdl1 = BigDecimal.valueOf(0);