利用小时分析补充提交

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/Economic/EconomicController.java

@@ -139,42 +139,4 @@ public class EconomicController {
     }
 
 
-    /**
-     * 利用小时分析
-     * @param companys
-     * @param type
-     * @param wpids
-     * @param windturbineids
-     * @param starttime
-     * @param endtime
-     * @param dateType
-     * @return
-     * @throws Exception
-     */
-
-    @GetMapping("/Utilization")
-    @ResponseBody
-    @CrossOrigin(origins = "*", maxAge = 3600)
-    public R Utilization(@RequestParam(value = "companys", required = true) String companys,
-                        @RequestParam(value = "type", required = true) String type,
-                        @RequestParam(value = "wpids", required = false) String wpids,
-                        @RequestParam(value = "windturbineids", required = false) String windturbineids,
-                        @RequestParam(value = "starttime", required = false) String starttime,
-                        @RequestParam(value = "endtime", required = false) String endtime,
-                        @RequestParam(value = "dateType", required = false) String dateType
-    ) throws Exception {
-        List<Glqx>  Utilization  = null;
-        if (StringUtils.isEmpty(type)) type = "-2";
-        if (StringUtils.isEmpty(dateType)) dateType = "1";
-
-        Utilization  = economicService.Utilization (companys,wpids, type, starttime, endtime, dateType, windturbineids);
-        if (StringUtils.isNotNull(Utilization )) {
-            return R.data(ResultMsg.ok(Utilization ));
-        } else {
-            return R.error(ResultMsg.error());
-        }
-
-    }
-
-
 }

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/Economic/EconomicService.java

@@ -578,54 +578,4 @@ public class EconomicService {
         return map;
     }
 
-    public List<Glqx> Utilization(String companys, String wpids, String type, String starttime, String endtime, String dateType, String windturbineids) throws Exception {
-
-        List<ProBasicOrganizeTree> wpls = CacheContext.wpls;
-        List<Glqx> vo = new ArrayList<>();
-
-        Date beginDate = DateUtils.parseDate1(starttime);
-        Date endDate = DateUtils.parseDate1(endtime);
-        Date current = com.gyee.common.util.DateUtils.getCurrentDate();
-        if (endDate.after(current)) {
-            endDate = current;
-        }
-
-        if (type.equals("-2")) {
-            for (ProBasicOrganizeTree wp : wpls) {
-                if (wpids.contains(wp.getId())) {
-
-//                    ProBasicPowerstationPoint fdl = proBasicPowerstationPointService.getPowerstationPoint(wpids, ContantXk.NFDL);
-                    Optional<ProBasicPowerstationPoint> nfdl = CacheContext.proBasicPowerstationPoint.stream().
-                            filter(pbpp -> "NFDL".equals(pbpp.getUniformCode()) && wpids.equals(pbpp.getWindpowerstationId())).findFirst();
-
-                    String nfdlcd = null;
-                    if (nfdl.isPresent()) {
-                        nfdlcd = nfdl.get().getNemCode();
-                    }
-
-                    List<PointData> nfdlls = edosUtil.getHistoryDatasSnap(nfdlcd, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L);
-
-                    double temp1 = 0;
-                    for (int i = 0; i < nfdlls.size(); i++) {
-                        Glqx vos = new Glqx();
-                        vos.setPjgzd(0.0);
-                        vos.setName("0");
-                        vos.setId("0");
-                        vos.setTime(2023);
-                        temp1 = nfdlls.get(i).getPointValueInDouble();
-                        vos.setTime(nfdlls.get(i).getPointTime());
-                        vos.setId(wp.getId());
-                        vos.setName(wp.getAname());
-                        vos.setPjgzd(StringUtils.round(temp1 /wp.getJrCapacity(), 2));
-                        vo.add(vos);
-                    }
-
-                }
-            }
-        }
-        return vo;
-    }
-
-
-
 }