bug修复

generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo1Service.java

@@ -1506,7 +1506,7 @@ public class WindPowerInfo1Service {
 
     public void writeReportHistory2(Date date) throws Exception {
 //        String[] dateTime = {"2024-12-13 01:00:00", "2024-12-13 05:00:00", "2024-12-13 09:00:00","2024-12-13 13:00:00", "2024-12-13 17:00:00", "2024-12-13 21:00:00"};
-        String[] dateTime = {"2024-12-27 01:00:00", "2024-12-27 05:00:00", "2024-12-27 09:00:00","2024-12-27 13:00:00", "2024-12-27 17:00:00", "2024-12-27 21:00:00"};
+        String[] dateTime = {"2025-01-21 01:00:00", "2025-01-21 05:00:00", "2025-01-21 09:00:00","2025-01-21 13:00:00", "2025-01-21 17:00:00", "2025-01-21 21:00:00"};
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         String[] split = repInfo2.split(",");
@@ -1514,7 +1514,7 @@ public class WindPowerInfo1Service {
         for (String s : dateTime) {
             Date date1 = simpleDateFormat.parse(s);
             long timestamp = date1.getTime();
-            for (long i = timestamp; i < 1736287200000L; i += 86400000) {
+            for (long i = timestamp; i < 1738748311000L; i += 86400000) {
             List<StationInfoHour> shs = new ArrayList<>();
             for (String l : ls) {
                 Map<String, PointData2> historySection = adapter.getHistorySection(goldenUri(), l, timestamp);

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/homepage/EconomyHomePageController.java

@@ -120,22 +120,6 @@ public class EconomyHomePageController {
     /**
      * 首页 发电量
      */
-//    @GetMapping(value = "/generating-capacity")
-//    @ApiOperation(value = "首页-发电量", notes = "首页-发电量")
-//    public ResultMsg getHomeGeneratingCapacity(@RequestParam(value = "companyId", required = false) String companyId) throws Exception {
-//
-//        Map<String, Object> map = economyPointHomePageService.getGeneratingCapacity2(companyId);
-//        if (null != map) {
-//            return ResultMsg.ok(map);
-//        } else {
-//            return ResultMsg.error();
-//        }
-//    }
-
-
-    /**
-     * 首页 发电量
-     */
     @GetMapping(value = "/generating-capacity")
     @ApiOperation(value = "首页-发电量", notes = "首页-发电量")
     public ResultMsg getHomeGeneratingCapacity2(@RequestParam(value = "companyId", required = false) String companyId) throws Exception {
@@ -149,21 +133,6 @@ public class EconomyHomePageController {
     }
 
 
-    /**
-     * 首页 右侧模块
-     */
-//    @GetMapping(value = "/home-right")
-//    @ApiOperation(value = "首页-右侧模块", notes = "首页-右侧模块")
-//    public ResultMsg getHomeRight(@RequestParam(value = "companyId", required = false) String companyId) throws Exception {
-//
-//        Map<String, Object> map = economyPointHomePageService.getHomeRight(companyId);
-//        if (null != map) {
-//            return ResultMsg.ok(map);
-//        } else {
-//            return ResultMsg.error();
-//        }
-//    }
-
     @GetMapping(value = "/home-right")
     @ApiOperation(value = "首页-右侧模块", notes = "首页-右侧模块")
     public ResultMsg getHomeRight(@RequestParam(value = "companyId", required = false) String companyId) throws Exception {

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -1104,11 +1104,11 @@ public class BenchmarkingService {
         if (StringUtils.isNotEmpty(wpid)) {
             qw.eq("station_id", wpid);
         }
-        if (companys.endsWith("RGN")) {
-            qw.eq("region_id", companys);
-        } else {
-            qw.eq("company_id", companys);
-        }
+//        if (companys.endsWith("RGN")) {
+//            qw.eq("region_id", companys);
+//        } else {
+//            qw.eq("company_id", companys);
+//        }
         if (type.equals("-1")) {
             qw.like("turbine_id", "_WT_");
         } else {

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/homepage/EconomyPointHomePageService.java

@@ -1769,23 +1769,26 @@ public class EconomyPointHomePageService {
             String text = year1 + "-" + mon;
             for (ValueVo vv : vexdl) {
                 if (vv.getText().equals(text)) {
-                    vv.setValue(day1s2.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add));
+                    BigDecimal bxdl = day1s2.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    vv.setValue(BigDecimal.valueOf(bxdl.doubleValue() / 1000));
                 }
             }
             for (ValueVo vv : vessdl) {
                 if (vv.getText().equals(text)) {
-                    vv.setValue(day1s2.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add)
+                    BigDecimal bssdl = day1s2.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add)
                             .add(day1s2.stream().map(TurbineInfoDay::getJhjxss).reduce(BigDecimal.ZERO, BigDecimal::add)
                                     .add(day1s2.stream().map(TurbineInfoDay::getFjhjxss).reduce(BigDecimal.ZERO, BigDecimal::add)
                                             .add(day1s2.stream().map(TurbineInfoDay::getSlss).reduce(BigDecimal.ZERO, BigDecimal::add))
                                             .add(day1s2.stream().map(TurbineInfoDay::getXnss).reduce(BigDecimal.ZERO, BigDecimal::add))
                                             .add(day1s2.stream().map(TurbineInfoDay::getDjss).reduce(BigDecimal.ZERO, BigDecimal::add))
-                                            .add(day1s2.stream().map(TurbineInfoDay::getGzss).reduce(BigDecimal.ZERO, BigDecimal::add)))));
+                                            .add(day1s2.stream().map(TurbineInfoDay::getGzss).reduce(BigDecimal.ZERO, BigDecimal::add))));
+                    vv.setValue(BigDecimal.valueOf(bssdl.doubleValue() / 1000));
                 }
             }
             for (ValueVo vv : vefdl) {
                 if (vv.getText().equals(text)) {
-                    vv.setValue(day1s2.stream().map(TurbineInfoDay::getRfdl).reduce(BigDecimal.ZERO, BigDecimal::add));
+                    BigDecimal bfdl = day1s2.stream().map(TurbineInfoDay::getRfdl).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    vv.setValue(BigDecimal.valueOf(bfdl.doubleValue() / 1000));
                 }
             }
 
@@ -1824,23 +1827,26 @@ public class EconomyPointHomePageService {
                 String text = year1 + "-" + mon2;
                 for (ValueVo vv : vxdl2) {
                     if (vv.getText().equals(text)) {
-                        vv.setValue(day1s4.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add));
+                        BigDecimal bxdl2 = day1s4.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add);
+                        vv.setValue(BigDecimal.valueOf(bxdl2.doubleValue() / 1000));
                     }
                 }
                 for (ValueVo vv : vssdl2) {
                     if (vv.getText().equals(text)) {
-                        vv.setValue(day1s4.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add)
+                        BigDecimal bssl2 = day1s4.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add)
                                 .add(day1s4.stream().map(TurbineInfoDay::getJhjxss).reduce(BigDecimal.ZERO, BigDecimal::add)
                                         .add(day1s4.stream().map(TurbineInfoDay::getFjhjxss).reduce(BigDecimal.ZERO, BigDecimal::add)
                                                 .add(day1s4.stream().map(TurbineInfoDay::getSlss).reduce(BigDecimal.ZERO, BigDecimal::add))
                                                 .add(day1s4.stream().map(TurbineInfoDay::getXnss).reduce(BigDecimal.ZERO, BigDecimal::add))
                                                 .add(day1s4.stream().map(TurbineInfoDay::getDjss).reduce(BigDecimal.ZERO, BigDecimal::add))
-                                                .add(day1s4.stream().map(TurbineInfoDay::getGzss).reduce(BigDecimal.ZERO, BigDecimal::add)))));
+                                                .add(day1s4.stream().map(TurbineInfoDay::getGzss).reduce(BigDecimal.ZERO, BigDecimal::add))));
+                        vv.setValue(BigDecimal.valueOf(bssl2.doubleValue() / 1000));
                     }
                 }
                 for (ValueVo vv : vfdl2) {
                     if (vv.getText().equals(text)) {
-                        vv.setValue(day1s4.stream().map(TurbineInfoDay::getRfdl).reduce(BigDecimal.ZERO, BigDecimal::add));
+                        BigDecimal bfl2 = day1s4.stream().map(TurbineInfoDay::getRfdl).reduce(BigDecimal.ZERO, BigDecimal::add);
+                        vv.setValue(BigDecimal.valueOf(bfl2.doubleValue() / 1000));
                     }
                 }
             }
@@ -1952,9 +1958,9 @@ public class EconomyPointHomePageService {
             StationInfoMin day1 = day1s.get(0);
             GeneratingCapacityVo rfdl = new GeneratingCapacityVo();
             rfdl.setName("日发电量");
-            rfdl.setValue(Double.valueOf(String.format("%.2f", day1.getRfdl())));
-            Double llgl = day1.getLlgl();
-            rfdl.setTotal(calDivide(llgl, 4.0));
+            rfdl.setValue(Double.valueOf(String.format("%.2f", day1.getRfdl() / 1000)));
+            Double llgl = day1.getLlgl() / 1000;
+            rfdl.setTotal(calDivide(llgl / 1000, 4.0));
             Double rbfb = calDivide(rfdl.getValue(), rfdl.getTotal());
             rfdl.setBfb(new BigDecimal(rbfb * 100).setScale(2, RoundingMode.HALF_UP).doubleValue());
             ls.add(rfdl);
@@ -2007,7 +2013,7 @@ public class EconomyPointHomePageService {
             cv.setRecodedate2(0);
             cv.setOperation(100);
         } else {
-            cv.setRecodedate2(day2s.get(0).getRfdl());
+            cv.setRecodedate2(day2s.get(0).getRfdl() / 1000);
             cv.setOperation(calDivide(cv.getRecodedate() - cv.getRecodedate2(), cv.getRecodedate2()));
         }
 
@@ -2062,7 +2068,6 @@ public class EconomyPointHomePageService {
         if (null != lastCalDate || LocalDate.now().equals(lastCalDate) || !yfdlCal.isEmpty()) {
             return;
         }
-        DecimalFormat df = new DecimalFormat("#.##");
         LocalDate yesterday = LocalDate.now().atStartOfDay().toLocalDate();
         QueryWrapper<TurbineInfoDay> currentqw = new QueryWrapper<>();
         currentqw.select("station_id,SUM(rfdl) AS rfdl,sum(llfdl) as llfdl")
@@ -2072,8 +2077,10 @@ public class EconomyPointHomePageService {
                 .groupBy("station_id");
         List<TurbineInfoDay> yearData = iTurbineInfoDayService.list(currentqw);
         Integer intYear = LocalDate.now().getYear();
-        nfdlCal.put(intYear, new BigDecimal(df.format(yearData.get(0).getRfdl())));
-        nllfdlCal.put(intYear, new BigDecimal(df.format(yearData.get(0).getLlfdl())));
+        Double nfdlc = calDivide(yearData.get(0).getRfdl().doubleValue(), 1000.0);
+        Double nllfdlc = calDivide(yearData.get(0).getLlfdl(), 1000.0);
+        nfdlCal.put(intYear, new BigDecimal(nfdlc));
+        nllfdlCal.put(intYear, new BigDecimal(nllfdlc));
         currentqw.clear();
         currentqw.select("station_id,MAX(record_date) AS record_date,SUM(rfdl) AS rfdl,SUM(llfdl) as llfdl")
                 .ge("record_date", LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()))  // 大于等于本月的第一天
@@ -2082,8 +2089,10 @@ public class EconomyPointHomePageService {
                 .groupBy("station_id");
         List<TurbineInfoDay> monthData = iTurbineInfoDayService.list(currentqw);
         String yearAndMonth = LocalDate.now().getYear() + "-" + LocalDate.now().getMonthValue();
-        yfdlCal.put(yearAndMonth, new BigDecimal(df.format(monthData.get(0).getRfdl())));
-        yllfdlCal.put(yearAndMonth, new BigDecimal(df.format(monthData.get(0).getLlfdl())));
+        Double yfdlc = calDivide(monthData.get(0).getRfdl().doubleValue(), 1000.0);
+        Double yllfdlc = calDivide(monthData.get(0).getLlfdl(), 1000.0);
+        yfdlCal.put(yearAndMonth, new BigDecimal(yfdlc));
+        yllfdlCal.put(yearAndMonth, new BigDecimal(yllfdlc));
         currentqw.clear();
         lastCalDate = LocalDate.now();
     }
@@ -2104,7 +2113,8 @@ public class EconomyPointHomePageService {
         if (null == weekData || weekData.isEmpty()) {
             return 0.0;
         }
-        return weekData.get(0).getRfdl().add(new BigDecimal(generatingCapacity15min.get("日发电量").getValue())).doubleValue();
+        Double weekfdlc = calDivide(weekData.get(0).getRfdl().doubleValue(), 1000.0);
+        return weekfdlc + generatingCapacity15min.get("日发电量").getValue();
     }
 
 }

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/specific/SpecificService.java

@@ -1489,27 +1489,171 @@ public class SpecificService {
     }
 
 
+//    public List<SpecificTarget> fdlList(String companys, String type, String year) {
+//        //获取年份所有当月的数据
+//        QueryWrapper<StationInfoDay> currentqw = new QueryWrapper<>();
+//        currentqw.select("station_id,max(record_date) record_date,sum(rfdl_fj) rfdl_fj");
+////        currentqw.eq("location", "wp");
+//        currentqw.eq("to_char(record_date,'yyyy')", year);
+//        if (type.equals("-1")) {
+//            currentqw.like("station_id", "_FDC_");
+//        } else {
+//            currentqw.like("station_id", "_GDC_");
+//        }
+////        if (companys.endsWith("ZGS")) {
+////            currentqw.eq("company_id", companys);
+////        } else {
+////            currentqw.eq("region_id", companys);
+////        }
+//        currentqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
+//        List<StationInfoDay> currentList = iStationInfoDayService.list(currentqw);
+//        currentqw.clear();
+//        currentqw.select("station_id,max(record_date) record_date,sum(rfdl_fj) rfdl_fj");
+////        currentqw.eq("foreign_key_id", companys + type);
+//        currentqw.eq("to_char(record_date,'yyyy')", year);
+//        currentqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
+//        currentList.addAll(iStationInfoDayService.list(currentqw));
+//
+//        int subYear = Integer.parseInt(year) - 1;
+//        QueryWrapper<StationInfoDay> sameperiodqw = new QueryWrapper<>();
+//        sameperiodqw.select("station_id,max(record_date) record_date,sum(rfdl_fj) rfdl_fj");
+////        sameperiodqw.eq("location", "wp");
+//        if (type.equals("-1")) {
+//            currentqw.like("station_id", "_FDC_");
+//        } else {
+//            currentqw.like("station_id", "_GDC_");
+//        }
+////        if (companys.endsWith("ZGS")) {
+////            currentqw.eq("company_id", companys);
+////        } else {
+////            currentqw.eq("region_id", companys);
+////        }
+//        sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
+//        sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
+//        List<StationInfoDay> sameperiodList = iStationInfoDayService.list(sameperiodqw);
+//        sameperiodqw.clear();
+//        sameperiodqw.select("station_id,max(record_date) record_date,sum(rfdl_fj) rfdl_fj");
+////        sameperiodqw.eq("foreign_key_id", companys + type);
+//        sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
+//        sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
+//        sameperiodList.addAll(iStationInfoDayService.list(sameperiodqw));
+//
+//        //合并当月与同期数据为返回结果
+//        List<SpecificTargetVo> resultList = new ArrayList<>();
+//
+//        currentList.stream().forEach(i -> {
+//            SpecificTargetVo vo = new SpecificTargetVo();
+//            String wpid = i.getStationId();
+//            vo.setWpid(wpid);
+////            if (wpid.contains("_ZGS") || wpid.contains("_FGS" + type)) {
+////                vo.setWpname(CacheContext.cpmap.get(companys).getAname());
+////            } else if (wpid.contains("_RGN")) {
+////                vo.setWpname(CacheContext.rgmap.get(companys).getAname());
+////            } else {
+//            vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+////            }
+//            Instant instant = i.getRecordDate().atStartOfDay(ZoneId.systemDefault()).toInstant();
+//            Date date = Date.from(instant);
+//            vo.setYear(DateUtils.getYear(date));
+//            vo.setMonth(DateUtils.getMonth(date));
+//            vo.setCurrent(DoubleUtils.keepPrecision(i.getRfdlFj().doubleValue(), 2));
+//            resultList.add(vo);
+//        });
+//        resultList.stream().forEach(i -> {
+//            Optional<StationInfoDay> optional = sameperiodList.stream()
+//                    .filter(j -> i.getWpid().equals(j.getStationId())
+//                            && i.getMonth().equals(DateUtils.getMonthFromDate(Date.from(j.getRecordDate().atStartOfDay(ZoneId.systemDefault()).toInstant()))))
+//                    .findFirst();
+//
+//            if (optional.isPresent()) {
+//                StationInfoDay tqinfoday = optional.get();
+//                i.setSameperiod(DoubleUtils.keepPrecision(tqinfoday.getRfdlFj().doubleValue(), 2));
+//                i.setCompare(i.getCurrent().compareTo(i.getSameperiod()));
+//            } else {
+//                i.setSameperiod(0.0);
+//                i.setCompare(0);
+//            }
+//        });
+//        List<SpecificTarget> resultendList = new ArrayList<>();
+//
+//        Map<String, Map<Integer, SpecificTargetVo>> map = new HashMap<>();
+//
+//        resultList.stream().forEach(i -> {
+//            if (map.containsKey(i.getWpid())) {
+//                Map<Integer, SpecificTargetVo> integerListMap = map.get(i.getWpid());
+//                if (!integerListMap.containsKey(i.getMonth())) {
+//                    map.get(i.getWpid()).put(i.getMonth(), i);
+//                } else {
+//
+//                }
+//            } else {
+//                Map<Integer, SpecificTargetVo> tempMap = new HashMap<>();
+//                tempMap.put(i.getMonth(), i);
+//                map.put(i.getWpid(), tempMap);
+//            }
+//        });
+//        Set<String> wpids = map.keySet();
+//        if (StringUtils.isNotNull(wpids)) {
+//            wpids.stream().forEach(wpid -> {
+//                SpecificTarget vo = new SpecificTarget();
+//                vo.setWpid(wpid);
+//                int orderNum = 100;
+////                if (wpid.contains("_ZGS")|| wpid.contains("_FGS" + type)) {
+////                    vo.setWpname(CacheContext.cpmap.get(companys).getAname());
+////                } else if (wpid.contains("_RGN")) {
+////                    vo.setWpname(CacheContext.rgmap.get(companys).getAname());
+////                } else {
+//                vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+//                orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+////                }
+//                vo.setOrderNum(orderNum);
+//                List<SpecificTargetVo> tempList = new ArrayList<>();
+//
+//                Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
+//                for (int x = 1; x <= 12; x++) {
+//                    if (listMap.containsKey(x)) {
+//                        tempList.add(listMap.get(x));
+//                    } else {
+//                        SpecificTargetVo vo1 = new SpecificTargetVo();
+//                        vo1.setWpid(wpid);
+////                        if (wpid.contains("_ZGS")|| wpid.contains("_FGS" + type)) {
+////                            vo1.setWpname(CacheContext.cpmap.get(companys).getAname());
+////                        } else if (wpid.contains("_RGN")) {
+////                            vo1.setWpname(CacheContext.rgmap.get(companys).getAname());
+////                        } else {
+//                        vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+////                        }
+//                        vo1.setYear(Integer.parseInt(year));
+//                        vo1.setMonth(x);
+//                        tempList.add(vo1);
+//                    }
+//                }
+//
+//
+//                vo.setTargetList(tempList);
+//                resultendList.add(vo);
+//            });
+//        }
+//        SortUtils.sort(resultendList, "orderNum", SortUtils.ASC);
+//
+//        return resultendList;
+//    }
+
+
     public List<SpecificTarget> fdlList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<StationInfoDay> currentqw = new QueryWrapper<>();
         currentqw.select("station_id,max(record_date) record_date,sum(rfdl_fj) rfdl_fj");
-//        currentqw.eq("location", "wp");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         if (type.equals("-1")) {
             currentqw.like("station_id", "_FDC_");
         } else {
             currentqw.like("station_id", "_GDC_");
         }
-//        if (companys.endsWith("ZGS")) {
-//            currentqw.eq("company_id", companys);
-//        } else {
-//            currentqw.eq("region_id", companys);
-//        }
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
         List<StationInfoDay> currentList = iStationInfoDayService.list(currentqw);
         currentqw.clear();
         currentqw.select("station_id,max(record_date) record_date,sum(rfdl_fj) rfdl_fj");
-//        currentqw.eq("foreign_key_id", companys + type);
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
         currentList.addAll(iStationInfoDayService.list(currentqw));
@@ -1517,41 +1661,26 @@ public class SpecificService {
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<StationInfoDay> sameperiodqw = new QueryWrapper<>();
         sameperiodqw.select("station_id,max(record_date) record_date,sum(rfdl_fj) rfdl_fj");
-//        sameperiodqw.eq("location", "wp");
         if (type.equals("-1")) {
             currentqw.like("station_id", "_FDC_");
         } else {
             currentqw.like("station_id", "_GDC_");
         }
-//        if (companys.endsWith("ZGS")) {
-//            currentqw.eq("company_id", companys);
-//        } else {
-//            currentqw.eq("region_id", companys);
-//        }
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
         List<StationInfoDay> sameperiodList = iStationInfoDayService.list(sameperiodqw);
         sameperiodqw.clear();
         sameperiodqw.select("station_id,max(record_date) record_date,sum(rfdl_fj) rfdl_fj");
-//        sameperiodqw.eq("foreign_key_id", companys + type);
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
         sameperiodList.addAll(iStationInfoDayService.list(sameperiodqw));
-
         //合并当月与同期数据为返回结果
         List<SpecificTargetVo> resultList = new ArrayList<>();
-
         currentList.stream().forEach(i -> {
             SpecificTargetVo vo = new SpecificTargetVo();
             String wpid = i.getStationId();
             vo.setWpid(wpid);
-//            if (wpid.contains("_ZGS") || wpid.contains("_FGS" + type)) {
-//                vo.setWpname(CacheContext.cpmap.get(companys).getAname());
-//            } else if (wpid.contains("_RGN")) {
-//                vo.setWpname(CacheContext.rgmap.get(companys).getAname());
-//            } else {
             vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
-//            }
             Instant instant = i.getRecordDate().atStartOfDay(ZoneId.systemDefault()).toInstant();
             Date date = Date.from(instant);
             vo.setYear(DateUtils.getYear(date));
@@ -1598,14 +1727,8 @@ public class SpecificService {
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
                 int orderNum = 100;
-//                if (wpid.contains("_ZGS")|| wpid.contains("_FGS" + type)) {
-//                    vo.setWpname(CacheContext.cpmap.get(companys).getAname());
-//                } else if (wpid.contains("_RGN")) {
-//                    vo.setWpname(CacheContext.rgmap.get(companys).getAname());
-//                } else {
                 vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
                 orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
-//                }
                 vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
@@ -1616,22 +1739,21 @@ public class SpecificService {
                     } else {
                         SpecificTargetVo vo1 = new SpecificTargetVo();
                         vo1.setWpid(wpid);
-//                        if (wpid.contains("_ZGS")|| wpid.contains("_FGS" + type)) {
-//                            vo1.setWpname(CacheContext.cpmap.get(companys).getAname());
-//                        } else if (wpid.contains("_RGN")) {
-//                            vo1.setWpname(CacheContext.rgmap.get(companys).getAname());
-//                        } else {
                         vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
-//                        }
                         vo1.setYear(Integer.parseInt(year));
                         vo1.setMonth(x);
                         tempList.add(vo1);
                     }
                 }
-
-
                 vo.setTargetList(tempList);
                 resultendList.add(vo);
+
+                SpecificTarget vo2 = new SpecificTarget();
+                vo2.setWpid(vo.getWpid());
+                vo2.setTargetList(vo.getTargetList());
+                vo2.setOrderNum(vo.getOrderNum() + 1);
+                vo2.setWpname(CacheContext.cpmap.get(companys).getAname());
+                resultendList.add(vo2);
             });
         }
         SortUtils.sort(resultendList, "orderNum", SortUtils.ASC);
@@ -1639,6 +1761,7 @@ public class SpecificService {
         return resultendList;
     }
 
+
     public List<SpecificTarget> zhcydlList2(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<ProEconPowerstationInfoDay5> currentqw = new QueryWrapper<>();
@@ -1929,6 +2052,13 @@ public class SpecificService {
 
                 vo.setTargetList(tempList);
                 resultendList.add(vo);
+
+                SpecificTarget vo2 = new SpecificTarget();
+                vo2.setWpid(vo.getWpid());
+                vo2.setTargetList(vo.getTargetList());
+                vo2.setOrderNum(vo.getOrderNum() + 1);
+                vo2.setWpname(CacheContext.cpmap.get(companys).getAname());
+                resultendList.add(vo2);
             });
         }
         SortUtils.sort(resultendList, "orderNum", SortUtils.ASC);
@@ -2227,6 +2357,13 @@ public class SpecificService {
 
                 vo.setTargetList(tempList);
                 resultendList.add(vo);
+
+                SpecificTarget vo2 = new SpecificTarget();
+                vo2.setWpid(vo.getWpid());
+                vo2.setTargetList(vo.getTargetList());
+                vo2.setOrderNum(vo.getOrderNum() + 1);
+                vo2.setWpname(CacheContext.cpmap.get(companys).getAname());
+                resultendList.add(vo2);
             });
         }
         SortUtils.sort(resultendList, "orderNum", SortUtils.ASC);
@@ -2525,6 +2662,13 @@ public class SpecificService {
 
                 vo.setTargetList(tempList);
                 resultendList.add(vo);
+
+                SpecificTarget vo2 = new SpecificTarget();
+                vo2.setWpid(vo.getWpid());
+                vo2.setTargetList(vo.getTargetList());
+                vo2.setOrderNum(vo.getOrderNum() + 1);
+                vo2.setWpname(CacheContext.cpmap.get(companys).getAname());
+                resultendList.add(vo2);
             });
         }
         SortUtils.sort(resultendList, "orderNum", SortUtils.ASC);
@@ -2860,6 +3004,13 @@ public class SpecificService {
 
                 vo.setTargetList(tempList);
                 resultendList.add(vo);
+
+                SpecificTarget vo2 = new SpecificTarget();
+                vo2.setWpid(vo.getWpid());
+                vo2.setTargetList(vo.getTargetList());
+                vo2.setOrderNum(vo.getOrderNum() + 1);
+                vo2.setWpname(CacheContext.cpmap.get(companys).getAname());
+                resultendList.add(vo2);
             });
         }
         SortUtils.sort(resultendList, "orderNum", SortUtils.ASC);