refactor(runeconomy-xk): 优化代码结构和性能

- 移除未使用的 PointData2 类
- 重构 SpecificService 中的数据查询和处理逻辑
-优化 WindresourceanalysisService 中的数据统计方法
- 调整 BenchmarkingService 中的数值计算方式- 清理 application-nxf.yml 中的注释代码

common/src/main/java/com/gyee/common/model/PointData2.java

@@ -1,115 +0,0 @@
-package com.gyee.common.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-import java.util.Date;
-
-/**
- * 测点数据
- */
-public class PointData2 {
-    /**
-     * 时间戳
-     */
-    private long ts;
-    private Date time;
-    //@JsonInclude(JsonInclude.Include.NON_NULL)
-    private String tagName;
-    /**
-     * 数据
-     */
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    private Double doubleValue;
-    /**
-     * Boolean 数据
-     */
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    private Boolean booleanValue;
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    private Long longValue;
-
-    public PointData2() {
-    }
-
-    public PointData2(Date time, double doubleValue) {
-        this.time = time;
-        this.doubleValue = doubleValue;
-    }
-
-    public long getTs() {
-        if (ts == 0 && time != null) {
-            return time.getTime();
-        }
-        return ts;
-    }
-
-    public void setTs(long ts) {
-        this.ts = ts;
-    }
-
-    @JsonIgnore
-    public TsDataType getDataType() {
-        if (booleanValue != null) {
-            return TsDataType.BOOLEAN;
-        } else if (longValue != null) {
-            return TsDataType.LONG;
-        }
-        return TsDataType.DOUBLE;
-    }
-
-    public Boolean getBooleanValue() {
-        return booleanValue;
-    }
-
-    public Boolean isBooleanValue() {
-        return booleanValue;
-    }
-
-    public void setBooleanValue(boolean booleanValue) {
-        this.booleanValue = booleanValue;
-    }
-
-    public Long getLongValue() {
-        return longValue;
-    }
-
-    public void setLongValue(long longValue) {
-        this.longValue = longValue;
-    }
-
-    public Date getTime() {
-        return time;
-    }
-
-    public void setTime(Date time) {
-        this.time = time;
-    }
-
-    public String getTagName() {
-        return tagName;
-    }
-
-    public void setTagName(String tagName) {
-        this.tagName = tagName;
-    }
-
-    public Double getDoubleValue() {
-        return doubleValue;
-    }
-
-    public void setDoubleValue(double doubleValue) {
-        this.doubleValue = doubleValue;
-    }
-
-    @JsonIgnore
-    public Double getValue() {
-        if (booleanValue != null) {
-            return booleanValue ? 1.0 : 0.0;
-        } else if (longValue != null) {
-            doubleValue = Double.valueOf(longValue);
-        }
-        return doubleValue;
-    }
-
-}

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Windresourceanalysis/WindresourceanalysisService.java

@@ -81,26 +81,28 @@ public class WindresourceanalysisService {
 
             if (pjfs.getNemCode() != null && !pjfs.getNemCode().equals("INITIAL")) {
 
-                List<PointData> maxs = edosUtil.getHistStat(pjfs, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 0);
-                List<PointData> mins = edosUtil.getHistStat(pjfs, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 1);
-                List<PointData> ave = edosUtil.getHistStat(pjfs, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 2);
-
-                double avenum = 0.0;
-                double maxsnum = 0.0;
-                double minsnum = 0.0;
-                if (wp.getId().contains("NJLF01")) {
-                    //                    avenum = ave.get(0).getPointValueInDouble() / 10;
-                    //                    maxsnum = maxs.get(0).getPointValueInDouble() / 10;
-                    //                    minsnum = mins.get(0).getPointValueInDouble() /10;
-                    avenum = (ave != null && !ave.isEmpty()) ? ave.get(0).getPointValueInDouble() : 0.0;
-                    maxsnum = (maxs != null && !maxs.isEmpty()) ? maxs.get(0).getPointValueInDouble() : 0.0;
-                    minsnum = (mins != null && !mins.isEmpty()) ? mins.get(0).getPointValueInDouble() : 0.0;
-
-                } else {
-                    avenum = (ave != null && !ave.isEmpty()) ? ave.get(0).getPointValueInDouble() : 0.0;
-                    maxsnum = (maxs != null && !maxs.isEmpty()) ? maxs.get(0).getPointValueInDouble() : 0.0;
-                    minsnum = (mins != null && !mins.isEmpty()) ? mins.get(0).getPointValueInDouble() : 0.0;
-                }
+                //List<PointData> maxs = edosUtil.getHistStat(pjfs, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 0);
+                //List<PointData> mins = edosUtil.getHistStat(pjfs, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 1);
+                //List<PointData> ave = edosUtil.getHistStat(pjfs, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 2);
+                List<PointData> kkk = edosUtil.getHistoryDatasRaw(pjfs, startTime.getTime() / 1000, endTime.getTime() / 1000);
+                DoubleSummaryStatistics summaried = kkk.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
+
+                double avenum = summaried.getAverage();
+                double maxsnum = summaried.getMax();
+                double minsnum = summaried.getMin();
+                //if (wp.getId().contains("NJLF01")) {
+                //    //                    avenum = ave.get(0).getPointValueInDouble() / 10;
+                //    //                    maxsnum = maxs.get(0).getPointValueInDouble() / 10;
+                //    //                    minsnum = mins.get(0).getPointValueInDouble() /10;
+                //    avenum = (ave != null && !ave.isEmpty()) ? ave.get(0).getPointValueInDouble() : 0.0;
+                //    maxsnum = (maxs != null && !maxs.isEmpty()) ? maxs.get(0).getPointValueInDouble() : 0.0;
+                //    minsnum = (mins != null && !mins.isEmpty()) ? mins.get(0).getPointValueInDouble() : 0.0;
+                //
+                //} else {
+                //    avenum = (ave != null && !ave.isEmpty()) ? ave.get(0).getPointValueInDouble() : 0.0;
+                //    maxsnum = (maxs != null && !maxs.isEmpty()) ? maxs.get(0).getPointValueInDouble() : 0.0;
+                //    minsnum = (mins != null && !mins.isEmpty()) ? mins.get(0).getPointValueInDouble() : 0.0;
+                //}
 
                 vo.setWpid(wp.getWindpowerstationId());
                 vo.setName(collect.get(0).getName());
@@ -111,14 +113,15 @@ public class WindresourceanalysisService {
 
             }
             if (pjfx.getNemCode() != null && !pjfs.getNemCode().equals("INITIAL")) {
-                List<PointData> maxs = edosUtil.getHistStat(pjfx, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 0);
-                List<PointData> mins = edosUtil.getHistStat(pjfx, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 1);
-                List<PointData> ave = edosUtil.getHistStat(pjfx, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 2);
+                //List<PointData> maxs = edosUtil.getHistStat(pjfx, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 0);
+                //List<PointData> mins = edosUtil.getHistStat(pjfx, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 1);
+                //List<PointData> ave = edosUtil.getHistStat(pjfx, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 2);
+                List<PointData> ave = edosUtil.getHistoryDatasRaw(pjfx, startTime.getTime() / 1000, endTime.getTime() / 1000);
                 double avefx = 0.0;
                 if (wp.getId().contains("NJLF01")) {
                     avefx = (ave != null && !ave.isEmpty()) ? ave.get(0).getPointValueInDouble() / 10 : 0.0;
                 } else {
-                    avefx = (ave != null && !ave.isEmpty()) ? ave.get(0).getPointValueInDouble() : 0.0;
+                    avefx = (ave != null && !ave.isEmpty()) ? ave.stream().mapToDouble(PointData::getPointValueInDouble).average().orElse(0) : 0.0;
                 }
                 vo.setPjfx(StringUtils.round(avefx, 2));
                 vos.add(vo);

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Windresourceanalysis/WindresourceanalysisService2.java

@@ -113,6 +113,7 @@ public class WindresourceanalysisService2 {
                     vo.setWpid(ww.getId());
                     vo.setHours(pjfsls.get(i).getTs());
                     vo.setPjfs(temp1);
+                    vo.setPjfx(pjfxls.get(i).getDoubleValue());
                     vos.add(vo);
                 }
 

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

@@ -893,13 +893,13 @@ public class BenchmarkingService {
                 vo.setOrdernum(station.get(i.getStationId()).doubleValue());
             }
 
-            vo.setFdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getRfdl())), 2));
-            vo.setLlfdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getLlfdl())), 2));
-            vo.setJxssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getJhjxss().add(i.getFjhjxss()))) , 2));
-            vo.setGzssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getGzss())),2));
-            vo.setXdssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getXdss())), 2));
-            vo.setSlssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getSlss())), 2));
-            vo.setXnssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getXnss())), 2));
+            vo.setFdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getRfdl()))/1000, 2));
+            vo.setLlfdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getLlfdl()))/1000, 2));
+            vo.setJxssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getJhjxss().add(i.getFjhjxss())))/1000 , 2));
+            vo.setGzssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getGzss()))/1000,2));
+            vo.setXdssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getXdss()))/1000, 2));
+            vo.setSlssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getSlss()))/1000, 2));
+            vo.setXnssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getXnss()))/1000, 2));
             vo.setZssdl(DoubleUtils.keepPrecision(vo.getGzssdl() + vo.getJxssdl() + vo.getXdssdl() + vo.getXnssdl() + vo.getSlssdl(), 2));
             vo.setFnlyl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getFdl() / vo.getLlfdl() * 100, 2) : 0.0);
             vo.setGzssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getGzssdl() / vo.getLlfdl() * 100, 2) : 0.0);

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

@@ -2846,50 +2846,157 @@ public class SpecificService {
 
     public List<SpecificTarget> lyxsList(String companys, String type, String year) {
         //获取年份所有当月的数据
+        QueryWrapper<TurbineInfoDay> currentqw = new QueryWrapper<>();
+        currentqw.select("station_id,max(record_date) record_date,sum(lyxs) lyxs");
+        currentqw.eq("to_char(record_date,'yyyy')", year);
+        if (type.equals("-1")) {
+            currentqw.like("station_id", "_FDC_");
+        } else {
+            currentqw.like("station_id", "_GDC_");
+        }
+        currentqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
+        List<TurbineInfoDay> currentList = iTurbineInfoDayService.list(currentqw);
+
+        int subYear = Integer.parseInt(year);
+        QueryWrapper<TurbineInfoDay> sameperiodqw = new QueryWrapper<>();
+        sameperiodqw.select("station_id,max(record_date) record_date,sum(lyxs) lyxs");
+        if (type.equals("-1")) {
+            currentqw.like("station_id", "_FDC_");
+        } else {
+            currentqw.like("station_id", "_GDC_");
+        }
+        sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear-1));
+        sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
+        List<TurbineInfoDay> sameperiodList = iTurbineInfoDayService.list(sameperiodqw);
+
+        //合并当月与同期数据为返回结果
+        List<SpecificTargetVo> resultList = new ArrayList<>();
+
+        currentList.stream().forEach(i -> {
+            SpecificTargetVo vo = new SpecificTargetVo();
+            String wpid = i.getStationId();
+            vo.setWpid(wpid);
+            vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+            vo.setYear(DateUtils.getYear(i.getRecordDate()));
+            vo.setMonth(DateUtils.getMonth(i.getRecordDate()));
+            vo.setCurrent(i.getLyxs()/50);
+            resultList.add(vo);
+        });
+        resultList.stream().forEach(i -> {
+            Optional<TurbineInfoDay> optional = sameperiodList.stream()
+                    .filter(j -> i.getWpid().equals(j.getStationId())
+                            && i.getMonth().equals(DateUtils.getMonthFromDate(j.getRecordDate())))
+                    .findFirst();
+
+            if (optional.isPresent()) {
+                TurbineInfoDay tqinfoday = optional.get();
+                i.setSameperiod(tqinfoday.getLyxs()/50);
+                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 {
+                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;
+                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);
+                        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);
+
+        return resultendList;
+    }
+    public List<SpecificTarget> lyxsList3(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("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);
-//        }
+        //        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("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;
+        //        int subYear = Integer.parseInt(year) - 1;
         int subYear = Integer.parseInt(year);
         QueryWrapper<StationInfoDay> sameperiodqw = new QueryWrapper<>();
         sameperiodqw.select("station_id,max(record_date) record_date,sum(rfdl_fj) rfdl_fj");
-//        sameperiodqw.eq("location", "wp");
+        //        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);
-//        }
+        //        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("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));
@@ -2909,13 +3016,13 @@ public class SpecificService {
                 capacity = (gsrl.get(0).getJrCapacity()) + (gsrl.get(0).getJrwindCapacity());
             }
             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 {
+            //            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));
@@ -2971,14 +3078,14 @@ 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 {
+                //                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<>();
 
@@ -2989,13 +3096,13 @@ 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 {
+                        //                        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);
@@ -3230,8 +3337,8 @@ public class SpecificService {
 //            }
 //            Instant instant = i.getRecordDate().atStartOfDay(ZoneId.systemDefault()).toInstant();
 //            Date date2 = Date.from(instant);
-//            vo.setYear(DateUtils.getYear(date2));
-//            vo.setMonth(DateUtils.getMonth(date2));
+            vo.setYear(i.getRecordDate().getYear()+1900);
+            vo.setMonth(i.getRecordDate().getMonth()+1);
 //            vo.setCurrent(DoubleUtils.keepPrecision(i.getLlfdl().doubleValue() != 0 ? (i.getGzss().doubleValue()) / i.getLlfdl().doubleValue() * 100 : 0, 2));
             double llfdl = i.getLlfdl() != null ? i.getLlfdl().doubleValue() : 0.0;
             double rfdl = i.getGzss() != null ? i.getGzss().doubleValue() : 0.0;
@@ -3670,6 +3777,8 @@ public class SpecificService {
             } else {
                 vo.setCurrent(0.0);
             }
+            vo.setYear(i.getRecordDate().getYear()+1900);
+            vo.setMonth(i.getRecordDate().getMonth()+1);
             resultList.add(vo);
         });
         resultList.stream().forEach(i -> {
@@ -3963,8 +4072,8 @@ public class SpecificService {
 //            }
 //            Instant instant = i.getRecordDate().atStartOfDay(ZoneId.systemDefault()).toInstant();
 //            Date date = Date.from(instant);
-//            vo.setYear(DateUtils.getYear(date));
-//            vo.setMonth(DateUtils.getMonth(date));
+            vo.setYear(i.getRecordDate().getYear()+1900);
+            vo.setMonth(i.getRecordDate().getMonth()+1);
 //            vo.setCurrent(DoubleUtils.keepPrecision(i.getLlfdl().doubleValue() != 0 ? (i.getXdss().doubleValue()) / i.getLlfdl().doubleValue() * 100 : 0, 2));
             double llfdl = i.getLlfdl() != null ? i.getLlfdl().doubleValue() : 0.0;
             double rfdl = i.getXdss() != null ? i.getXdss().doubleValue() : 0.0;
@@ -4282,8 +4391,8 @@ public class SpecificService {
             }
 //            Instant instant = i.getRecordDate().atStartOfDay(ZoneId.systemDefault()).toInstant();
 //            Date date = Date.from(instant);
-//            vo.setYear(DateUtils.getYear(date));
-//            vo.setMonth(DateUtils.getMonth(date));
+            vo.setYear(i.getRecordDate().getYear()+1900);
+            vo.setMonth(i.getRecordDate().getMonth()+1);
 //            vo.setCurrent(DoubleUtils.keepPrecision(i.getLlfdl().doubleValue() != 0 ? (i.getXnss().doubleValue()) / i.getLlfdl().doubleValue() * 100 : 0, 2));
             double llfdl = i.getLlfdl() != null ? i.getLlfdl().doubleValue() : 0.0;
             double rfdl = i.getXnss() != null ? i.getXnss().doubleValue() : 0.0;
@@ -4604,8 +4713,8 @@ public class SpecificService {
 //            }
 //            Instant instant = i.getRecordDate().atStartOfDay(ZoneId.systemDefault()).toInstant();
 //            Date date = Date.from(instant);
-//            vo.setYear(DateUtils.getYear(date));
-//            vo.setMonth(DateUtils.getMonth(date));
+            vo.setYear(i.getRecordDate().getYear()+1900);
+            vo.setMonth(i.getRecordDate().getMonth()+1);
 //            vo.setCurrent(DoubleUtils.keepPrecision(i.getLlfdl().doubleValue() != 0 ? (i.getSlss().doubleValue()) / i.getLlfdl().doubleValue() * 100 : 0, 2));
             double llfdl = i.getLlfdl() != null ? i.getLlfdl().doubleValue() : 0.0;
             double rfdl = i.getSlss() != null ? i.getSlss().doubleValue() : 0.0;

runeconomy-xk/src/main/resources/application-nxf.yml

@@ -101,4 +101,11 @@ powerCurveFitting:
   process: process
   fitting: fitting
 
+#devtools:
+#  restart:
+#    enabled: true # 是否启用热重启功能，默认为true
+#  livereload:
+#    enabled: false # 是否启用livereload功能，默认为true
+#    port: 35729 # livereload服务器监听的端口，默认为35729
+