首页电量及利用小时修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/monitor/MonitorController.java

@@ -33,6 +33,7 @@ import java.util.Map;
 public class MonitorController {
     @Autowired
     private MonitorService monitorService;
+
     @Autowired
     private ProjectPlanService planService;
 
@@ -45,6 +46,8 @@ public class MonitorController {
     @Resource
     private MonitorprojectplanService monitorprojectplanService;
 
+    @Resource
+    private MonitorvalueService hoursvalue;
     @GetMapping("/monitor")
     @ResponseBody
     @ApiOperation(value = "首页", notes = "首页")
@@ -118,7 +121,7 @@ public class MonitorController {
 
         List<PowercurveVo> resultList = new ArrayList<>();
         if (StringUtils.notEmp(wpId)) {
-            resultList = monitorService.hoursvalue(wpId, timetype);
+            resultList = hoursvalue.hoursvalue(wpId, timetype);
         }
 
         if (null != resultList) {

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/ProjectplanVo.java

@@ -5,8 +5,17 @@ public class ProjectplanVo {
 
     private Double sjdl;
 
+    private Double lyxs;
+
     private Integer hours;
 
+    public Double getLyxs() {
+        return lyxs;
+    }
+
+    public void setLyxs(Double lyxs) {
+        this.lyxs = lyxs;
+    }
 
     public Double getJhdl() {
         return jhdl;

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Comprehensive/ComprehensiveelectricityService.java

@@ -146,7 +146,8 @@ public class ComprehensiveelectricityService {
                     zhcydlsum += zhcydl;
                     //发电量取值
                     if (calFirstMonth == currentMonth && currentyear == dqnf) {
-                        sjdl = (zbls.get(0).getYfdldb().doubleValue() / 10000) + (rfdlsj / 10000);
+//                        sjdl = (zbls.get(0).getYfdldb().doubleValue() / 10000) + (rfdlsj / 10000);
+                        sjdl = (zbls.get(0).getYfdldb().doubleValue() / 10000);
                     } else {
                         sjdl = zbls.get(0).getYfdldb().doubleValue() / 10000;
                     }

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

@@ -190,7 +190,8 @@ public class Electricityservice {
 //                        PointData data = edosUtil.getSectionData(month, endOfDayOfLastDayOfMonth.getTime());
 //                        PointData data = edosUtil.getSectionData(month, date1.getTime());
                         if (calFirstMonth == currentMonth && currentyear == dqnf) {
-                            vo.setSjdl(StringUtils.round((bysjdlhjsum / 10000) + (rfdlsj /10000), 2));
+//                            vo.setSjdl(StringUtils.round((bysjdlhjsum / 10000) + (rfdlsj /10000), 2));
+                            vo.setSjdl(StringUtils.round(bysjdlhjsum / 10000, 2));
                         } else {
                             vo.setSjdl(StringUtils.round(bysjdlhjsum / 10000, 2));
                         }
@@ -280,7 +281,8 @@ public class Electricityservice {
                         }
                         map.put("bnjhdlhj", MathUtil.twoBit(yeardlsum));
                         map.put("rfdlychj", rfdlychjsum.divide(BigDecimal.valueOf(10000),2));
-                        map.put("bnsjdlhj", MathUtil.twoBit((bnsjdlhjsum / 10000) + (rfdlsjhj / 10000)));
+//                        map.put("bnsjdlhj", MathUtil.twoBit((bnsjdlhjsum / 10000) + (rfdlsjhj / 10000)));
+                        map.put("bnsjdlhj", MathUtil.twoBit(bnsjdlhjsum / 10000));
                         if (yeardlsum!=0) {
                             map.put("qnzbhj", StringUtils.round(((bnsjdlhjsum / 10000) / yeardlsum) * 100, 0));
                         } else {
@@ -430,7 +432,8 @@ public class Electricityservice {
             vo.setHours(i);
             //添加实际电量
             if (calFirstMonth == currentMonth && dqnf==currentyear) {
-                vo.setSjdl(StringUtils.round((bysjdlhjsum / 10000) + (rfdlsj / 10000), 2));
+//                vo.setSjdl(StringUtils.round((bysjdlhjsum / 10000) + (rfdlsj / 10000), 2));
+                vo.setSjdl(StringUtils.round(bysjdlhjsum / 10000, 2));
             } else {
                 vo.setSjdl(StringUtils.round(bysjdlhjsum / 10000, 2));
             }
@@ -488,7 +491,8 @@ public class Electricityservice {
 
         map.put("jhdlhj",StringUtils.round(yeardlsum,2));
         map.put("kydlhj",StringUtils.round(kyyeardlsum,2));
-        map.put("sjdlhj",StringUtils.round(((bnsjdlhjsum / 10000)) + (rfdlsjhj / 10000),2));
+//        map.put("sjdlhj",StringUtils.round(((bnsjdlhjsum / 10000)) + (rfdlsjhj / 10000),2));
+        map.put("sjdlhj",StringUtils.round(bnsjdlhjsum / 10000,2));
         if (yeardlsum != 0) {
             map.put("wcqkhj", StringUtils.round(((bnsjdlhjsum / 10000) / yeardlsum) * 100, 0));
         }else {

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Irradiationinput/IrradiationinputService.java

@@ -30,7 +30,7 @@ public class IrradiationinputService {
         Date currentDate = DateUtils.getCurrentDate();
         List<String> wpPoints = new ArrayList<>();
         List<PointData> thls = new ArrayList<>();
-        List<PointData> realData = new ArrayList<>(); // 创建realData列表
+        List<PointData> realData = new ArrayList<>();
 
         if (!qwtList.isEmpty() || qwtList.size() >= 1) {
             for (ProEconIrradiationInput lr : qwtList) {
@@ -41,13 +41,14 @@ public class IrradiationinputService {
                     realData.addAll(edosUtil.getHistMatrix(wpPoints, currentDate.getTime() / 1000));
                     for (PointData data : realData) {
                         data.setEdnaId(lr.getNemCode());
-                        thls.add(data);
+//                        thls.add(data);
+                        edosUtil.sendSinglePoint(data);
                     }
                     realData.clear(); // 清空realData
                     wpPoints.clear(); // 清空wpPoints,为下一次循环准备
                 }
             }
-            edosUtil.sendMultiPoint(thls);
+//            edosUtil.sendMultiPoint(thls);
         }
     }
 }

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

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
 import com.gyee.common.util.DateUtils;
-import com.gyee.common.util.DoubleUtils;
-import com.gyee.common.util.SortUtils;
 import com.gyee.runeconomy.dto.PowercurveVo;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.*;
@@ -822,9 +820,11 @@ public class MonitorService {
                     for (ProBasicCompany cp : cpls) {
                             sxzjrl += (cp.getJrwindCapacity() + cp.getJrCapacity()) / 10000;
                     }
-                    qt.put("ylyxs", StringUtils.round(((yfdl8 + rfdlsj) / 10000) / sxzjrl,2));
+//                    qt.put("ylyxs", StringUtils.round(((yfdl8 + rfdlsj) / 10000) / sxzjrl,2));
+                    qt.put("ylyxs", StringUtils.round(((yfdl8) / 10000) / sxzjrl,2));
 //                    qt.put("nlyxs", MathUtil.twoBit(nfdl / 1000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000));
-                    qt.put("nlyxs", StringUtils.round(((nfdl8 + rfdlsj) / 10000) / sxzjrl,2));
+//                    qt.put("nlyxs", StringUtils.round(((nfdl8 + rfdlsj) / 10000) / sxzjrl,2));
+                    qt.put("nlyxs", StringUtils.round(((nfdl8) / 10000) / sxzjrl,2));
                 }
             }
 
@@ -847,8 +847,10 @@ public class MonitorService {
                     }
 //                    qt.put("ylyxs", MathUtil.twoBit(yfdl / 1000) / ((wp.getJrwindCapacity() + wp.getJrCapacity()) / 1000));
 //                    qt.put("nlyxs", MathUtil.twoBit(nfdl / 1000) / ((wp.getJrwindCapacity() + wp.getJrCapacity()) / 1000));
-                    qt.put("ylyxs", MathUtil.twoBit((yfdl8 + rfdlsj) / 10000) / ((wp.getJrwindCapacity() + wp.getJrCapacity()) / 10000));
-                    qt.put("nlyxs", MathUtil.twoBit((nfdl8 + rfdlsj)/ 10000) / ((wp.getJrwindCapacity() + wp.getJrCapacity()) / 10000));
+//                    qt.put("ylyxs", MathUtil.twoBit((yfdl8 + rfdlsj) / 10000) / ((wp.getJrwindCapacity() + wp.getJrCapacity()) / 10000));
+//                    qt.put("nlyxs", MathUtil.twoBit((nfdl8 + rfdlsj)/ 10000) / ((wp.getJrwindCapacity() + wp.getJrCapacity()) / 10000));
+                    qt.put("ylyxs", MathUtil.twoBit((yfdl8) / 10000) / ((wp.getJrwindCapacity() + wp.getJrCapacity()) / 10000));
+                    qt.put("nlyxs", MathUtil.twoBit((nfdl8)/ 10000) / ((wp.getJrwindCapacity() + wp.getJrCapacity()) / 10000));
                 }
             }
             fnlyl= Math.random() * 10 + 90;
@@ -1446,172 +1448,4 @@ public class MonitorService {
 
         return vos;
     }
-
-    //利用小时
-    public List<PowercurveVo> hoursvalue(String wpId, String timetype) throws Exception {
-
-
-        Calendar twoyear = Calendar.getInstance();
-        twoyear.add(Calendar.YEAR, -2);
-        Date twoDate = twoyear.getTime();
-//        Date beginDate = DateUtils.truncate(beginDate1);
-
-        Calendar oneyear = Calendar.getInstance();
-        oneyear.add(Calendar.YEAR, -1);
-        Date oneDate = oneyear.getTime();
-
-        Calendar currentyear = Calendar.getInstance();
-        currentyear.add(Calendar.YEAR, 0);
-        Date currentDate = currentyear.getTime();
-
-
-        double zjrl = 0.0;
-
-        Map<String, Object> zjrlmap = new HashMap<>();
-        List<PowercurveVo> vos = new ArrayList<PowercurveVo>();
-        if (wpId.endsWith(QS) || wpId.endsWith(FD) || wpId.endsWith(GF) || CacheContext.wpmapls.containsKey(wpId)) {
-
-            List<ProBasicPowerstation> wplist = new ArrayList<>();
-            if (CacheContext.wpmapls.containsKey(wpId)) {
-                wplist = CacheContext.wpmapls.get(wpId);
-            }
-            HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
-            List<ProBasicPowerstation> wplsToken = tokenService.getWpls(request);
-            for (ProBasicPowerstation wp : wplsToken) {
-                if (wpId.contains(FD)) {
-                    if (wp.getId().endsWith("FDC_STA")) {
-                        wplist.add(wp);
-                    }
-                } else if (wpId.contains(GF)) {
-                    if (wp.getId().endsWith("GDC_STA")) {
-                        wplist.add(wp);
-                    }
-                } else if (wpId.contains(QS)) {
-                    wplist.add(wp);
-                }
-            }
-
-
-            if (wpId.contains(QS) || wpId.contains(FD) || wpId.contains(GF)) {
-                for (ProBasicRegion rg : CacheContext.rgls) {
-                    if (wpId.contains(rg.getId())) {
-                        zjrl += rg.getJrCapacity() + rg.getJrwindCapacity();
-                    }
-                }
-                for (ProBasicCompany cp : CacheContext.cpls) {
-                    if (wpId.contains(cp.getId())) {
-                        zjrl += cp.getJrCapacity() + cp.getJrwindCapacity();
-                    }
-                }
-            }
-
-            for (ProBasicPowerstation wp : wplsToken) {
-                if (wpId.equals(wp.getId())) {
-                    zjrl += wp.getJrCapacity() + wp.getJrwindCapacity();
-                }
-            }
-            for (ProBasicProject pj : CacheContext.pjls) {
-                if (wpId.equals(pj.getId())) {
-                    zjrl += pj.getCapacity();
-                }
-            }
-            for (ProBasicLine ln : CacheContext.lnls) {
-                if (wpId.equals(ln.getId())) {
-                    zjrl += ln.getCapacity();
-                }
-            }
-
-
-            zjrlmap.put("zjrl", zjrl);
-
-
-            Map<String, ProBasicPowerstationPoint> wtpointmap = null;
-            Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap = CacheContext.wppointmap;
-            Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap1 = CacheContext.companypointmap;
-            Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap2 = CacheContext.regionpointmap;
-            Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap3 = CacheContext.grouppointmap;
-
-            if (pointwpmap.containsKey(wpId)) {
-                wtpointmap = pointwpmap.get(wpId);
-            } else if (pointwpmap1.containsKey(wpId)) {
-                wtpointmap = pointwpmap1.get(wpId);
-            } else if (pointwpmap2.containsKey(wpId)) {
-                wtpointmap = pointwpmap2.get(wpId);
-            } else if (pointwpmap3.containsKey(wpId)) {
-                wtpointmap = pointwpmap3.get(wpId);
-            }
-
-            List<String> year = new ArrayList<>();
-            year.add(wtpointmap.get(ContantXk.NFDL).getNemCode());
-
-            String month = wtpointmap.get(ContantXk.YFDL).getNemCode();
-
-            if (timetype.contains("year")) {
-
-                List<PointData> currentls = edosUtil.getHistMatrix(year, currentDate.getTime() / 1000);
-                List<PointData> onels = edosUtil.getHistMatrix(year, oneDate.getTime() / 1000);
-                List<PointData> twols = edosUtil.getHistMatrix(year, twoDate.getTime() / 1000);
-
-                List<PointData> sj = new ArrayList<>();
-                if (!currentls.isEmpty() && !onels.isEmpty() && !twols.isEmpty()) {
-                    sj.add(currentls.get(0));
-                    sj.add(onels.get(0));
-                    sj.add(twols.get(0));
-                }
-
-
-                double temp0 = 0;
-                double temp1 = 0;
-                double temp2 = 0;
-
-                for (int i = 0; i < 3; i++) {
-                    PowercurveVo vo2 = new PowercurveVo();
-                    vo2.setLlgl(0.0); //理论功率
-                    vo2.setRfdl(0.0); //日发电量
-                    vo2.setYfdl(0.0); //月发电量
-                    vo2.setNfdl(0.0); //年发电量
-                    vo2.setBzgl(0.0); //保证功率
-                    vo2.setSjgl(0.0); //实际功率
-                    vo2.setSsfs(0.0); //实时风速
-                    vo2.setGzzs(0.0); //光照指数
-                    vo2.setFnlyl(0.0); //风能利用率
-                    vo2.setHours(i);  //时间戳
-                    vo2.setName(wpId);
-                    vos.add(vo2);
-                }
-
-                if (!sj.isEmpty() && sj.size() == 3) {
-                    temp0 = sj.get(0).getPointValueInDouble();
-                    temp1 = sj.get(1).getPointValueInDouble();
-                    temp2 = sj.get(2).getPointValueInDouble();
-                    vos.get(0).setNfdl(StringUtils.round((temp0 / 1000) / (zjrl / 1000), 2));
-                    vos.get(1).setNfdl(StringUtils.round((temp1 / 1000) / (zjrl / 1000), 2));
-                    vos.get(2).setNfdl(StringUtils.round((temp2 / 1000) / (zjrl / 1000), 2));
-
-                }
-
-            }
-
-            if (timetype.contains("month")) {
-
-                int month1 = DateUtils.getMonth(new Date());//4
-                DateUtils.getMonthLast(new Date());//4.30
-                Date date = DateUtils.getCurrentDate();
-
-                for (int i = month1; i > 0; i--) {
-
-                    PointData data = edosUtil.getSectionData(month, DateUtils.getEndOfDay(DateUtils.getMonthLast(date)).getTime());
-                    PowercurveVo vo1 = new PowercurveVo();
-                    vo1.setYfdl(DoubleUtils.keepPrecision((data.getPointValueInDouble() / 1000) / (zjrl / 1000), 2));
-                    vo1.setHours(i);
-                    vos.add(vo1);
-                    date = DateUtils.addMonths(date, -1);
-                }
-                SortUtils.sort(vos, "hours", SortUtils.ASC);
-
-
-            }
-        }
-        return vos;
-    }
 }

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

@@ -353,14 +353,18 @@ public class MonitorprojectplanService {
 //                }
                 if (wpId.endsWith("0") ||wpId.endsWith("-1")) {
 //                    fd_r_sjdl1 = fd_r_sjdl1;
-                    fd_y_sjdl1 = fdyf.add(fd_r_sjdl1);
-                    fd_n_sjdl1 = fdnf.add(fd_r_sjdl1);
+//                    fd_y_sjdl1 = fdyf.add(fd_r_sjdl1);
+//                    fd_n_sjdl1 = fdnf.add(fd_r_sjdl1);
+                    fd_y_sjdl1 = fdyf;
+                    fd_n_sjdl1 = fdnf;
                 }
 
                 if (wpId.endsWith("0") ||wpId.endsWith("-2")) {
 //                    gf_r_sjdl1 = gf_r_sjdl1;
-                    gf_y_sjdl1 = gfyf.add(gf_r_sjdl1);
-                    gf_n_sjdl1 = gfnf.add(gf_r_sjdl1);
+//                    gf_y_sjdl1 = gfyf.add(gf_r_sjdl1);
+//                    gf_n_sjdl1 = gfnf.add(gf_r_sjdl1);
+                    gf_y_sjdl1 = gfyf;
+                    gf_n_sjdl1 = gfnf;
                 }
             }
 
@@ -403,8 +407,10 @@ public class MonitorprojectplanService {
                         }
 
                         fd_r_sjdl1 = BigDecimal.valueOf(rfdlsj);
-                        fd_y_sjdl1 = yfdl2.add(BigDecimal.valueOf(rfdlsj));
-                        fd_n_sjdl1 = nfdl2.add(BigDecimal.valueOf(rfdlsj));
+//                        fd_y_sjdl1 = yfdl2.add(BigDecimal.valueOf(rfdlsj));
+//                        fd_n_sjdl1 = nfdl2.add(BigDecimal.valueOf(rfdlsj));
+                        fd_y_sjdl1 = yfdl2;
+                        fd_n_sjdl1 = nfdl2;
 
 //                        fd_r_sjdl1 = BigDecimal.valueOf(rfdlsj);
 //                        fd_y_sjdl1 = BigDecimal.valueOf(yfdlsj);
@@ -441,8 +447,10 @@ public class MonitorprojectplanService {
                         }
 
                         gf_r_sjdl1 = BigDecimal.valueOf(rfdlsj);
-                        gf_y_sjdl1 = yfdl2.add(BigDecimal.valueOf(rfdlsj));
-                        gf_n_sjdl1 = nfdl2.add(BigDecimal.valueOf(rfdlsj));
+//                        gf_y_sjdl1 = yfdl2.add(BigDecimal.valueOf(rfdlsj));
+//                        gf_n_sjdl1 = nfdl2.add(BigDecimal.valueOf(rfdlsj));
+                        gf_y_sjdl1 = yfdl2;
+                        gf_n_sjdl1 = nfdl2;
                     }
                     gf_r_jhdl = gf_r_jhdl + yfdljh / 30;
                     gf_y_jhdl = gf_y_jhdl + yfdljh;

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

@@ -8,10 +8,7 @@ import com.gyee.common.util.DoubleUtils;
 import com.gyee.common.util.SortUtils;
 import com.gyee.runeconomy.dto.ProjectplanVo;
 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.ProBasicProjectPlan;
-import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay5;
+import com.gyee.runeconomy.model.auto.*;
 import com.gyee.runeconomy.service.TokenService;
 import com.gyee.runeconomy.service.auto.*;
 import com.gyee.runeconomy.util.StringUtils;
@@ -86,7 +83,7 @@ public class ProjectPlanService {
                     wplist.add(wp);
                 }
             }
-
+            List<ProBasicCompany> cpls = CacheContext.cpls;
             // 获取当前日期 暂时
             Date currentDate5 = new Date();
 
@@ -197,6 +194,7 @@ public class ProjectPlanService {
                     ProjectplanVo vo = new ProjectplanVo();
                     vo.setJhdl(0.0);
                     vo.setSjdl(0.0);
+                    vo.setLyxs(0.0);
                     vo.setHours(i);
                     vos.add(vo);
                 }
@@ -327,16 +325,28 @@ public class ProjectPlanService {
                     twosjdlsum = qn.stream().map(ProEconPowerstationInfoDay5::getNfdldb).reduce(BigDecimal.ZERO, BigDecimal::add); //去年计划电量合
 
                     threesjdlsum = qyn.stream().map(ProEconPowerstationInfoDay5::getNfdldb).reduce(BigDecimal.ZERO, BigDecimal::add); //前年计划电量合
+                   double sxzjrl = 0.0;
+                    if (!wpId.contains("_STA")) {
+                        for (ProBasicCompany cp : cpls) {
+                            sxzjrl += (cp.getJrwindCapacity() + cp.getJrCapacity()) / 10000;
+                        }
+                    } else  {
+                        List<ProBasicPowerstation> collect = CacheContext.wpls.stream().filter(ww -> wpId.equals(ww.getId())).collect(Collectors.toList());
+                        sxzjrl += (collect.get(0).getJrCapacity()+collect.get(0).getJrwindCapacity()) /10000;
+                    }
 
                     vos.get(0).setJhdl(StringUtils.round(bnjhdlsum, 2));
                     vos.get(1).setJhdl(StringUtils.round(twojhdlsum, 2));
                     vos.get(2).setJhdl(StringUtils.round(threejhdlsum, 2));
 
+
+
                     Date date = DateUtils.getCurrentDate(); //当前时间
                     PointData data = edosUtil.getSectionData(rfdl, DateUtils.getEndOfDay(date).getTime());
                     Double rfdlsj = (DoubleUtils.keepPrecision(data.getPointValueInDouble() / 10000, 2));
 
-                    double bnsjdlhj = (bnsjdlsum.doubleValue() /10000) + rfdlsj;
+//                    double bnsjdlhj = (bnsjdlsum.doubleValue() /10000) + rfdlsj;
+                    double bnsjdlhj = (bnsjdlsum.doubleValue() /10000);
                     double qnsjdlhj = twosjdlsum.doubleValue() /10000;
                     double qynsjdlhj = threesjdlsum.doubleValue() /10000;
 
@@ -344,6 +354,11 @@ public class ProjectPlanService {
                     vos.get(1).setSjdl(StringUtils.round(qnsjdlhj, 2));
                     vos.get(2).setSjdl(StringUtils.round(qynsjdlhj, 2));
 
+                    vos.get(0).setLyxs(StringUtils.round(bnsjdlhj / sxzjrl,2));
+                    vos.get(1).setLyxs(StringUtils.round(qnsjdlhj / sxzjrl,2));
+                    vos.get(2).setLyxs(StringUtils.round(qynsjdlhj / sxzjrl,2));
+
+
                 }
             }
 
@@ -449,13 +464,25 @@ public class ProjectPlanService {
                         }else {
                             bnsjdlsum = list.stream().map(ProEconPowerstationInfoDay5::getYfdldb).reduce(BigDecimal.ZERO, BigDecimal::add);
                         }
+                        double sxzjrl = 0;
+                        if (!wpId.contains("_STA")) {
+                            for (ProBasicCompany cp : cpls) {
+                                sxzjrl += (cp.getJrwindCapacity() + cp.getJrCapacity()) / 10000;
+                            }
+                        } else  {
+                            List<ProBasicPowerstation> collect = CacheContext.wpls.stream().filter(ww -> wpId.equals(ww.getId())).collect(Collectors.toList());
+                            sxzjrl += (collect.get(0).getJrCapacity()+ collect.get(0).getJrwindCapacity()) / 10000;
+                        }
                         Date date1 = DateUtils.getCurrentDate(); //当前时间
                         PointData data = edosUtil.getSectionData(rfdl, DateUtils.getEndOfDay(date1).getTime());
                         Double rfdlsj = (DoubleUtils.keepPrecision(data.getPointValueInDouble() / 10000, 2));
                         if (i==month2) {
-                            vo.setSjdl(StringUtils.round((bnsjdlsum.doubleValue() / 10000) + rfdlsj,2));
+//                            vo.setSjdl(StringUtils.round((bnsjdlsum.doubleValue() / 10000) + rfdlsj,2));
+                            vo.setSjdl(StringUtils.round(bnsjdlsum.doubleValue() / 10000,2));
+                            vo.setLyxs(StringUtils.round((bnsjdlsum.doubleValue() / 10000) /sxzjrl,2));
                         }else {
                             vo.setSjdl(StringUtils.round(bnsjdlsum.doubleValue() / 10000,2));
+                            vo.setLyxs(StringUtils.round((bnsjdlsum.doubleValue() / 10000) /sxzjrl,2));
                         }
                         date = DateUtils.addMonths(date, -1);
                         dyxtsj = DateUtils.addMonths(dyxtsj, -1);

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

@@ -228,11 +228,13 @@ public class StationMonitorService {
         double yfdl = realData.get(22).getPointValueInDouble();
         yfdl = new BigDecimal(yfdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
         yfdl1 = yfdl1.divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP);
-        resultMap.put("yfdl", yfdl1.add(BigDecimal.valueOf(rfdl)));
+//        resultMap.put("yfdl", yfdl1.add(BigDecimal.valueOf(rfdl)));
+        resultMap.put("yfdl", yfdl1);
         double nfdl = realData.get(23).getPointValueInDouble();
         nfdl = new BigDecimal(nfdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
         nfdl1 = nfdl1.divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP);
-        resultMap.put("nfdl", nfdl1.add(BigDecimal.valueOf(rfdl)));
+//        resultMap.put("nfdl", nfdl1.add(BigDecimal.valueOf(rfdl)));
+        resultMap.put("nfdl", nfdl1);
         if (proBasicPowerstation.getWindType().equals("-1")) {
             resultMap.put("sspjfsgzd", realData.get(24).getPointValueInDouble());
         }else {

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/util/realtimesource/EdosUtil.java

@@ -1537,8 +1537,12 @@ public class EdosUtil implements IEdosUtil {
 
     @Override
     public void sendSinglePoint(PointData point) throws Exception {
-        String url = baseURL + "/latest";
+//        String url = baseURL + "/latest";
 
+        String url = baseURL + "/latest";
+        if (point.getEdnaId().startsWith("GF-")) {
+            url = baseURL2 + "/latest";
+        }
 
         try {
             String result = restTemplate.postForObject(url, convertPointData(point), String.class);