资源分析补充提交

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

@@ -207,7 +207,11 @@ public class Electricityservice {
                         vo.setDqzql(dqzqlsum);
 
                         //添加日发电量预测
-                        vo.setRfdlyc(rfdlyclsum);
+                        if (rfdlyclsum!=null) {
+                            vo.setRfdlyc(rfdlyclsum.divide(BigDecimal.valueOf(10000),2));
+                        }else {
+                            vo.setRfdlyc(BigDecimal.valueOf(0.0));
+                        }
 
                         firstDayZeroHour = DateUtils.addMonths(firstDayZeroHour, +1);
 
@@ -262,7 +266,7 @@ public class Electricityservice {
                             rfdlychjsum = dqyc.stream().map(ProEconStationPower::getDayPowerForecast).reduce(BigDecimal.ZERO, BigDecimal::add);
                         }
                         map.put("bnjhdlhj", MathUtil.twoBit(yeardlsum));
-                        map.put("rfdlychj", rfdlychjsum);
+                        map.put("rfdlychj", rfdlychjsum.divide(BigDecimal.valueOf(10000),2));
                         map.put("bnsjdlhj", MathUtil.twoBit((bnsjdlhjsum / 10000) + (rfdlsjhj / 10000)));
                         if (yeardlsum!=0) {
                             map.put("qnzbhj", StringUtils.round(((bnsjdlhjsum / 10000) / yeardlsum) * 100, 0));

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/StationPower/StationPowerService.java

@@ -1,21 +1,12 @@
 package com.gyee.runeconomy.service.StationPower;
 
-import com.gyee.common.contant.ContantXk;
-import com.gyee.common.model.PointData;
-import com.gyee.common.util.DateUtils;
-import com.gyee.common.util.SortUtils;
-import com.gyee.runeconomy.dto.ForecastVo;
-import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
-import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
-import com.gyee.runeconomy.model.auto.ProBasicProject;
+import com.gyee.runeconomy.service.auto.IProBasicPowerPointService;
 import com.gyee.runeconomy.service.auto.IProBasicPowerstationPointService;
-import com.gyee.runeconomy.util.StringUtils;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.Map;
 
 @Service
 public class StationPowerService {
@@ -26,352 +17,11 @@ public class StationPowerService {
     @Resource
     private IProBasicPowerstationPointService proBasicPowerstationPointService;
 
-    public Map<String, Object> getcockpittype(String beginDate, String endDate, String type) throws Exception {
-
-        Date starttime = DateUtils.parseDate(beginDate);
-        Date endtime = DateUtils.parseDate(endDate);
-
-        String wpId = null;
-
-
-        List<ProBasicProject> pjls = CacheContext.pjls;
-
-        List<ProBasicProject> pjllist = null;
-
-        List<ProBasicPowerstation> wplLs = CacheContext.wpls;
-        SortUtils.sort(wplLs, "orderNum", SortUtils.ASC);
-
-        List<ForecastVo> vos = null;
-        Map<String, Object> map = new LinkedHashMap<>();
-        ProBasicPowerstationPoint pjfs = null;
-        ProBasicPowerstationPoint fsyc = null;
-        ProBasicPowerstationPoint ycgl = null;
-        ProBasicPowerstationPoint sjgl = null;
-        ProBasicPowerstationPoint llgl = null;
-
-        for (ProBasicPowerstation Wp : wplLs) {
-            if (Wp.getId().contains("MLJ"))continue;
-            wpId = Wp.getId();
-
-
-            pjllist = new ArrayList();
-            //得到此循环场站期次
-            for (ProBasicProject pj : pjls) {
-                if (wpId.equals(pj.getWindpowerstationId())) {
-                    pjllist.add(pj);
-                }
-            }
-
-            List<ProBasicPowerstation> station = new ArrayList<>();
-            for (ProBasicPowerstation wp1 : CacheContext.wpls) {
-                if (wpId.equals(wp1.getId())) {
-                    station.add(wp1);
-                }
-            }
-
-            if (wpId.contains("GJY") | wpId.contains("TZ_GDC_STA") | wpId.contains("PTZ_FDC_STA") | wpId.contains("NJL") | wpId.contains("SY")) {
-                for (ProBasicProject wp : pjllist) {
-                    List<ForecastVo> vos1 = new ArrayList<>();
-                    List<ForecastVo> vos2 = new ArrayList<>();
-                    List<ForecastVo> vos3 = new ArrayList<>();
-                    List<ForecastVo> vos4 = new ArrayList<>();
-                    List<ForecastVo> vos5 = new ArrayList<>();
-
-                    // 在每次循环开始前将变量置为null
-                    pjfs = null;
-                    fsyc = null;
-                    ycgl = null;
-                    sjgl = null;
-                    llgl = null;
-
-                    if (wpId.endsWith("FDC_STA") && type.equals("F")) {
-                        ycgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.ZYCGL);
-                        sjgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.PJGL15);
-                    }
-                    if (wpId.endsWith("GDC_STA") && type.equals("G")) {
-                        ycgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.ZYCGL);
-                        sjgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.PJGL15);
-                    }
-
-                    if (sjgl != null) {
-                        List<PointData> ycglls = edosUtil.getHistoryDatasSnap(ycgl, starttime.getTime() / 1000, endtime.getTime() / 1000, null, 900L);
-                        List<PointData> sjglls = edosUtil.getHistoryDatasSnap(sjgl, starttime.getTime() / 1000, endtime.getTime() / 1000, null, 900L);
-
-                        double temp1 = 0;
-                        double temp2 = 0;
-                        double temp3 = 0;
-                        double temp4 = 0;
-                        double temp5 = 0;
-
-                        if (wpId.contains("GJY")) {
-                            for (int i = 0; i < sjglls.size(); i++) {
-                                ForecastVo vo = new ForecastVo();
-                                vo.setPjfs(0.0); //平均风速
-                                vo.setYcfs(0.0); //预测风速
-                                vo.setSjgl(0.0); //实际功率
-                                vo.setYcgl(0.0); //功率预测
-                                vo.setLlgl(0.0); //理论功率
-                                vo.setHours(2023L);  //时间戳
-                                vo.setName(wpId);
-
-                                vo.setHours(sjglls.get(i).getPointTime());
-                                vo.setName("平鲁高家堰风电场");
-
-                                vo.setId(wpId);
-
-                                temp3 = ycglls.get(i).getPointValueInDouble();
-                                vo.setYcgl(StringUtils.round(temp3, 2));
-
-                                temp4 = sjglls.get(i).getPointValueInDouble();
-                                vo.setSjgl(StringUtils.round(temp4 /1000, 2));
-
-                                vos1.add(vo);
-                            }
-                        }
-
-                        if (wpId.contains("TZ_GDC_STA")) {
-                            for (int i = 0; i < sjglls.size(); i++) {
-                                ForecastVo vo2 = new ForecastVo();
-                                vo2.setPjfs(0.0); //平均风速
-                                vo2.setYcfs(0.0); //预测风速
-                                vo2.setSjgl(0.0); //实际功率
-                                vo2.setYcgl(0.0); //功率预测
-                                vo2.setLlgl(0.0); //理论功率
-                                vo2.setHours(2023L);  //时间戳
-                                vo2.setName(wpId);
-
-                                vo2.setHours(sjglls.get(i).getPointTime());
-                                vo2.setName("天镇电站");
-                                vo2.setId(wpId);
-
-                                temp3 = ycglls.get(i).getPointValueInDouble();
-                                vo2.setYcgl(StringUtils.round(temp3, 2));
-
-                                temp4 = sjglls.get(i).getPointValueInDouble();
-                                vo2.setSjgl(StringUtils.round(temp4 /1000, 2));
-
-                                vos2.add(vo2);
-                            }
-                        }
-
-                        if (wpId.contains("PTZ_FDC_STA")) {
-                            for (int i = 0; i < sjglls.size(); i++) {
-                                ForecastVo vo3 = new ForecastVo();
-                                vo3.setPjfs(0.0); //平均风速
-                                vo3.setYcfs(0.0); //预测风速
-                                vo3.setSjgl(0.0); //实际功率
-                                vo3.setYcgl(0.0); //功率预测
-                                vo3.setLlgl(0.0); //理论功率
-                                vo3.setHours(2023L);  //时间戳
-                                vo3.setName(wpId);
-
-                                vo3.setHours(sjglls.get(i).getPointTime());
-
-                                vo3.setName("寿阳平头镇风电场");
-
-                                vo3.setId(wpId);
-
-                                temp3 = ycglls.get(i).getPointValueInDouble();
-                                vo3.setYcgl(StringUtils.round(temp3, 2));
-
-                                temp4 = sjglls.get(i).getPointValueInDouble();
-                                vo3.setSjgl(StringUtils.round(temp4 /1000, 2));
-                                vos3.add(vo3);
-                            }
-                        }
-
-                        if (wpId.contains("NJL")) {
-                            for (int i = 0; i < sjglls.size(); i++) {
-                                ForecastVo vo4 = new ForecastVo();
-                                vo4.setPjfs(0.0); //平均风速
-                                vo4.setYcfs(0.0); //预测风速
-                                vo4.setSjgl(0.0); //实际功率
-                                vo4.setYcgl(0.0); //功率预测
-                                vo4.setLlgl(0.0); //理论功率
-                                vo4.setHours(2023L);  //时间戳
-                                vo4.setName(wpId);
-
-                                vo4.setHours(sjglls.get(i).getPointTime());
-
-                                vo4.setName("朔城牛家岭风电场");
-
-                                vo4.setId(wpId);
-
-                                temp3 = ycglls.get(i).getPointValueInDouble();
-                                vo4.setYcgl(StringUtils.round(temp3, 2));
-
-                                temp4 = sjglls.get(i).getPointValueInDouble();
-                                vo4.setSjgl(StringUtils.round(temp4 /1000, 2));
-                                vos4.add(vo4);
-                            }
-                        }
-
-                        if (wpId.contains("SY")) {
-                            for (int i = 0; i < sjglls.size(); i++) {
-                                ForecastVo vo5 = new ForecastVo();
-                                vo5.setPjfs(0.0); //平均风速
-                                vo5.setYcfs(0.0); //预测风速
-                                vo5.setSjgl(0.0); //实际功率
-                                vo5.setYcgl(0.0); //功率预测
-                                vo5.setLlgl(0.0); //理论功率
-                                vo5.setHours(2023L);  //时间戳
-                                vo5.setName(wpId);
-
-                                vo5.setHours(sjglls.get(i).getPointTime());
-                                vo5.setName("山阴电站");
-                                vo5.setId(wpId);
-
-                                 temp3 = ycglls.get(i).getPointValueInDouble();
-                                vo5.setYcgl(StringUtils.round(temp3, 2));
-
-                                temp4 = sjglls.get(i).getPointValueInDouble();
-                                vo5.setSjgl(StringUtils.round(temp4 /1000, 2));
-
-                                vos5.add(vo5);
-                            }
-                        }
-
-
-                        if (wpId.contains("GJY")) {
-                            if (map.containsKey("SXJ_KGDL_GJYF01_EG")) {
-                                List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_GJYF01_EG");
-                                for (int i = 0; i < vos1.size(); i++) {
-                                    ForecastVo previousVo1 = previousVos1.get(i);
-                                    ForecastVo currentVo1 = vos1.get(i);
-
-                                    currentVo1.setSjgl(previousVo1.getSjgl() + currentVo1.getSjgl());
-                                    currentVo1.setYcgl(previousVo1.getYcgl() + currentVo1.getYcgl());
-
-                                }
-                            }
-                        } else if (wpId.contains("TZ_GDC_STA")) {
-                            if (map.containsKey("SXJ_KGDL_TZG01_EG")) {
-                                List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_TZG01_EG");
-                                for (int i = 0; i < vos2.size(); i++) {
-                                    ForecastVo previousVo1 = previousVos1.get(i);
-                                    ForecastVo currentVo1 = vos2.get(i);
-
-                                    currentVo1.setSjgl(previousVo1.getSjgl() + currentVo1.getSjgl());
-                                    currentVo1.setYcgl(previousVo1.getYcgl() + currentVo1.getYcgl());
-
-                                }
-                            }
-                        } else if (wpId.contains("SY")) {
-                            if (map.containsKey("SXJ_KGDL_SYG01_EG")) {
-                                List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_SYG01_EG");
-                                for (int i = 0; i < vos5.size(); i++) {
-                                    ForecastVo previousVo1 = previousVos1.get(i);
-                                    ForecastVo currentVo1 = vos5.get(i);
-
-                                    currentVo1.setSjgl(previousVo1.getSjgl() + currentVo1.getSjgl());
-                                    currentVo1.setYcgl(previousVo1.getYcgl() + currentVo1.getYcgl());
-
-                                }
-                            }
-                        } else if (wpId.contains("NJL")) {
-                            if (map.containsKey("SXJ_KGDL_NJLF01_EG")) {
-                                List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_NJLF01_EG");
-                                for (int i = 0; i < vos4.size(); i++) {
-                                    ForecastVo previousVo1 = previousVos1.get(i);
-                                    ForecastVo currentVo1 = vos4.get(i);
-
-                                    currentVo1.setSjgl(previousVo1.getSjgl() + currentVo1.getSjgl());
-                                    currentVo1.setYcgl(previousVo1.getYcgl() + currentVo1.getYcgl());
-                                }
-                            }
-                        } else if (wpId.contains("PTZ_FDC_STA")) {
-                            if (map.containsKey("SXJ_KGDL_PTZF01_EG")) {
-                                List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_PTZF01_EG");
-                                for (int i = 0; i < vos3.size(); i++) {
-                                    ForecastVo previousVo1 = previousVos1.get(i);
-                                    ForecastVo currentVo1 = vos3.get(i);
-
-                                    currentVo1.setSjgl(previousVo1.getSjgl() + currentVo1.getSjgl());
-                                    currentVo1.setYcgl(previousVo1.getYcgl() + currentVo1.getYcgl());
-                                }
-                            }
-                        }
-
-                        if (wpId.contains("GJY")) {
-                            map.put("SXJ_KGDL_GJY_FDC_STA", vos1);
-
-                        }
-                        if (wpId.contains("NJL")) {
-                            map.put("SXJ_KGDL_NJL_FDC_STA", vos4);
-
-                        }
-                        if (wpId.contains("PTZ_FDC_STA")) {
-                            map.put("SXJ_KGDL_PTZ_FDC_STA", vos3);
-
-                        }
-
-                        if (wpId.contains("TZ_GDC_STA")) {
-                            map.put("SXJ_KGDL_TZ_GDC_STA", vos2);
-                        }
-
-                        if (wpId.contains("SY")) {
-                            map.put("SXJ_KGDL_SY_FDC_STA", vos5);
-                        }
-
-                    }
-                }
-
-            } else {
-                for (ProBasicPowerstation wp : station) {
-                    vos = new ArrayList<>();
-
-                    ProBasicPowerstationPoint pjfs1 = null;
-                    ProBasicPowerstationPoint fsyc1 = null;
-                    ProBasicPowerstationPoint ycgl1 = null;
-                    ProBasicPowerstationPoint sjgl1 = null;
-                    ProBasicPowerstationPoint llgl1 = null;
-
-                    if (wpId.endsWith("FDC_STA") && type.equals("F")) {
-
-                        ycgl1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.ZYCGL);
-                        sjgl1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.PJGL15);
-                    }
-                    if (wpId.endsWith("GDC_STA") && type.equals("G")) {
-                        ycgl1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.ZYCGL);
-                        sjgl1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.PJGL15);
-                    }
-                    if (sjgl1 != null) {
-                        List<PointData> ycglls = edosUtil.getHistoryDatasSnap(ycgl1, starttime.getTime() / 1000, endtime.getTime() / 1000, null, 900L);
-                        List<PointData> sjglls = edosUtil.getHistoryDatasSnap(sjgl1, starttime.getTime() / 1000, endtime.getTime() / 1000, null, 900L);
-                         double temp1 = 0;
-                        double temp2 = 0;
-                        double temp3 = 0;
-                        double temp4 = 0;
-                        double temp5 = 0;
-                        for (int i = 0; i < sjglls.size(); i++) {
-
-                            ForecastVo vo = new ForecastVo();
-                            vo.setPjfs(0.0); //平均风速
-                            vo.setYcfs(0.0); //平均风速
-                            vo.setSjgl(0.0); //实际功率
-                            vo.setYcgl(0.0); //功率预测
-                            vo.setLlgl(0.0); //超短期功率预测
-                            vo.setHours(2023L);  //时间戳
-                            vo.setName(wpId);
-
-                            temp3 = ycglls.get(i).getPointValueInDouble();
-                            vo.setYcgl(StringUtils.round(temp3, 2));
-
-                            temp4 = sjglls.get(i).getPointValueInDouble();
-                            vo.setSjgl(StringUtils.round(temp4 /1000, 2));
-                            vo.setHours(sjglls.get(i).getPointTime());
-
-                            vo.setName(wp.getAname());
-                            vo.setId(wpId);
+    @Resource
+    private IProBasicPowerPointService powerPointService;
 
-                            vos.add(vo);
-                        }
-                        map.put(wp.getId(), vos);
+    public Map<String, Object> getcockpittype() throws Exception {
 
-                    }
-                }
-            }
-        }
-        return map;
+        return null;
     }
 }

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

@@ -68,18 +68,20 @@ public class AnalysisNewService {
         // 设置 beginDate 为前一天的0点
         calendar.add(Calendar.DAY_OF_MONTH, -1);
         Date beginDate = calendar.getTime();
-
+        // 初始化初始值
+        Date initialFirstDayZeroHour = (Date) beginDate.clone();
         // 设置 endDate 为当天的0点
         calendar.add(Calendar.DAY_OF_MONTH, 1);
         Date endDate = calendar.getTime();
 
         List<ProEconAnalysisSubtableBottom> stringList = 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")) {
-//
-//                for (int g = 0; g <= 42; g++) {
+
+//                for (int g = 0; g <= 56; g++) {
 
             List<ProBasicMeterPoint> meterPoints = proBasicMeterPointService.getBaseMapper().selectList(null);
 
@@ -122,6 +124,8 @@ public class AnalysisNewService {
 //                    calendar.add(Calendar.DAY_OF_MONTH, -1);
 //                    endDate = calendar.getTime();
 //                }
+//            // 恢复初始值
+//            beginDate = initialFirstDayZeroHour;
 //            }