bug修复

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/WtAlysisDayService.java

@@ -64,7 +64,6 @@ public class WtAlysisDayService {
             //执行查询
             proEconWtAlysisDayService.page(pageInfo, queryWrapper);
 
-
             QueryWrapper<TurbineInfoDay> qw = new QueryWrapper<>();
             qw.lambda().eq(TurbineInfoDay::getTurbineId, wtId).between(TurbineInfoDay::getRecordDate, begin, end)
                     .orderByAsc(TurbineInfoDay::getRecordDate);
@@ -74,17 +73,20 @@ public class WtAlysisDayService {
 
             pageInfo.getRecords().forEach(rsl -> {
                 TurbineInfoDay day = dayMap.get(rsl.getRecordDate());
-                rsl.setRfdl(NumberUtil.round(day.getRfdl(),2).doubleValue());
+                rsl.setRfdl(NumberUtil.round(day.getRfdl() / 1000,2).doubleValue());
                 double yfdl = calFdl(rsl.getWindturbineId(), "month", rsl.getRecordDate());
-                rsl.setYfdl(NumberUtil.round(yfdl,2).doubleValue());
+                rsl.setYfdl(NumberUtil.round(yfdl / 1000,2).doubleValue());
                 double nfdl = calFdl(rsl.getWindturbineId(), "year", rsl.getRecordDate());
-                rsl.setNfdl(NumberUtil.round(nfdl,2).doubleValue());
+                rsl.setNfdl(NumberUtil.round(nfdl / 1000,2).doubleValue());
                 rsl.setRpjfs(NumberUtil.round(day.getPjfs(),2).doubleValue());
                 double v = day.getGzss() + day.getJhjxss() + day.getXdss() + day.getXnss() + day.getSlss();
-                rsl.setRssdl(NumberUtil.round(v,2).doubleValue());
+                rsl.setRssdl(NumberUtil.round(v / 1000,2).doubleValue());
                 rsl.setRgzxs(NumberUtil.round(day.getGzMin() / 60,2).doubleValue());
                 rsl.setRjxxs(NumberUtil.round(day.getJxMin() / 60,2).doubleValue());
                 rsl.setRyxxs(NumberUtil.round(day.getYxMin() / 60,2).doubleValue());
+                rsl.setRyfdl(NumberUtil.round(rsl.getRyfdl() /1000,2).doubleValue());
+                rsl.setYyfdl(NumberUtil.round(rsl.getYyfdl() /1000,2).doubleValue());
+                rsl.setNyfdl(NumberUtil.round(rsl.getNyfdl() /1000,2).doubleValue());
             });
 
         }

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/WtwindDayInfoService.java

@@ -1,5 +1,6 @@
 package com.gyee.runeconomy.service;
 
+import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.util.DateUtils;
 import com.gyee.common.vo.benchmark.ValueVo;
@@ -97,7 +98,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getN() ? winfo.getN() : 0.0;
                             temp3 = null != winfo.getN2() ? winfo.getN2() : 0.0;
 
-                            vo.setName("N (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("N (" + NumberUtil.round(temp1,2) + "/" + NumberUtil.round(temp2,2) + ")");
                             vo.setData1(temp3);
                             //						vo.setName("N(" + winfo.getN4() + "/" + winfo.getN() + ")");
                             //
@@ -108,7 +109,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNne() ? winfo.getNne() : 0.0;
                             temp3 = null != winfo.getNne2() ? winfo.getNne2() : 0.0;
 
-                            vo.setName("NNE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NNE (" + NumberUtil.round(temp1,2) + "/" + NumberUtil.round(temp2,2) + ")");
                             vo.setData1(temp3);
                             //						vo.setName("NNE(" + winfo.getNne4() + "/" + winfo.getNne() + ")");
                             //
@@ -119,7 +120,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNe() ? winfo.getNe() : 0.0;
                             temp3 = null != winfo.getNe2() ? winfo.getNe2() : 0.0;
 
-                            vo.setName("NE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NE (" + NumberUtil.round(temp1,2) + "/" + NumberUtil.round(temp2,2) + ")");
                             vo.setData1(temp3);
                             //						vo.setName("NE(" + winfo.getNe4() + "/" + winfo.getNe() + ")");
                             //
@@ -130,7 +131,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getEne() ? winfo.getEne() : 0.0;
                             temp3 = null != winfo.getEne2() ? winfo.getEne2() : 0.0;
 
-                            vo.setName("ENE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("ENE (" + NumberUtil.round(temp1,2) + "/" + NumberUtil.round(temp2,2) + ")");
                             vo.setData1(temp3);
                             //						vo.setName("ENE(" + winfo.getEne4() + "/" + winfo.getEne() + ")");
                             //
@@ -142,7 +143,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getE() ? winfo.getE() : 0.0;
                             temp3 = null != winfo.getE2() ? winfo.getE2() : 0.0;
 
-                            vo.setName("E (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("E (" + NumberUtil.round(temp1,2) + "/" + NumberUtil.round(temp2,2) + ")");
                             vo.setData1(temp3);
                             //vo.setName("E(" + winfo.getE4() + "/" + winfo.getE() + ")");
 
@@ -152,7 +153,7 @@ public class WtwindDayInfoService {
                             temp1 = null != winfo.getEse4() ? winfo.getEse4() : 0.0;
                             temp2 = null != winfo.getEse() ? winfo.getEse() : 0.0;
                             temp3 = null != winfo.getEse2() ? winfo.getEse2() : 0.0;
-                            vo.setName("ESE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("ESE (" + NumberUtil.round(temp1,2) + "/" + NumberUtil.round(temp2,2) + ")");
                             //vo.setName("ESE(" + winfo.getEse4() + "/" + winfo.getEse() + ")");
 
                             vo.setData1(temp3);
@@ -162,7 +163,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSe() ? winfo.getSe() : 0.0;
                             temp3 = null != winfo.getSe2() ? winfo.getSe2() : 0.0;
 
-                            vo.setName("SE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SE (" + NumberUtil.round(temp1,2) + "/" + NumberUtil.round(temp2,2) + ")");
                             //vo.setName("SE(" + winfo.getSe4() + "/" + winfo.getSe() + ")");
 
                             vo.setData1(temp3);
@@ -171,7 +172,7 @@ public class WtwindDayInfoService {
                             temp1 = null != winfo.getSse4() ? winfo.getSse4() : 0.0;
                             temp2 = null != winfo.getSse() ? winfo.getSse() : 0.0;
                             temp3 = null != winfo.getSse2() ? winfo.getSse2() : 0.0;
-                            vo.setName("SSE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SSE (" + NumberUtil.round(temp1,2) + "/" + NumberUtil.round(temp2,2) + ")");
                             //	vo.setName("SSE(" + winfo.getSse4() + "/" + winfo.getSse() + ")");
 
                             vo.setData1(temp3);
@@ -180,7 +181,7 @@ public class WtwindDayInfoService {
                             temp1 = null != winfo.getS4() ? winfo.getS4() : 0.0;
                             temp2 = null != winfo.getS() ? winfo.getS() : 0.0;
                             temp3 = null != winfo.getS2() ? winfo.getS2() : 0.0;
-                            vo.setName("S (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("S (" + NumberUtil.round(temp1,2) + "/" + NumberUtil.round(temp2,2) + ")");
                             //vo.setName("S(" + winfo.getS4() + "/" + winfo.getS() + ")");
 
                             vo.setData1(temp3);
@@ -190,7 +191,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSsw() ? winfo.getSsw() : 0.0;
                             temp3 = null != winfo.getSsw2() ? winfo.getSsw2() : 0.0;
 
-                            vo.setName("SSW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SSW (" + NumberUtil.round(temp1,2) + "/" + NumberUtil.round(temp2,2) + ")");
                             vo.setData1(temp3);
 
                             //						vo.setName("SSW(" + winfo.getSsw4() + "/" + winfo.getSsw() + ")");
@@ -201,7 +202,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSw() ? winfo.getSw() : 0.0;
                             temp3 = null != winfo.getSw2() ? winfo.getSw2() : 0.0;
 
-                            vo.setName("SW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SW (" + NumberUtil.round(temp1,2) + "/" + NumberUtil.round(temp2,2) + ")");
                             vo.setData1(temp3);
                             //						vo.setName("SW(" + winfo.getSw4() + "/" + winfo.getSw() + ")");
                             //

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

@@ -1944,7 +1944,7 @@ public class SpecificService {
             Date date = Date.from(instant);
             vo.setYear(DateUtils.getYear(date));
             vo.setMonth(DateUtils.getMonth(date));
-            vo.setCurrent(DoubleUtils.keepPrecision(i.getCydl().doubleValue(), 2));
+            vo.setCurrent(DoubleUtils.keepPrecision(i.getCydl().doubleValue()/100, 2));
             resultList.add(vo);
         });
         resultList.stream().forEach(i -> {
@@ -1954,7 +1954,7 @@ public class SpecificService {
                     .findFirst();
             if (optional.isPresent()) {
                 StationInfoDay tqinfoday = optional.get();
-                i.setSameperiod(DoubleUtils.keepPrecision(tqinfoday.getCydl().doubleValue(), 2));
+                i.setSameperiod(DoubleUtils.keepPrecision(tqinfoday.getCydl().doubleValue()/100, 2));
                 i.setCompare(i.getCurrent().compareTo(i.getSameperiod()));
             } else {
                 i.setSameperiod(0.0);
@@ -2250,7 +2250,7 @@ public class SpecificService {
             Date date = Date.from(instant);
             vo.setYear(DateUtils.getYear(date));
             vo.setMonth(DateUtils.getMonth(date));
-            vo.setCurrent(DoubleUtils.keepPrecision(i.getGwdl().doubleValue(), 2));
+            vo.setCurrent(DoubleUtils.keepPrecision(i.getGwdl().doubleValue()/1000, 2));
             resultList.add(vo);
         });
         resultList.stream().forEach(i -> {
@@ -2259,7 +2259,7 @@ public class SpecificService {
                     .findFirst();
             if (optional.isPresent()) {
                 StationInfoDay tqinfoday = optional.get();
-                i.setSameperiod(DoubleUtils.keepPrecision(tqinfoday.getGwdl().doubleValue(), 2));
+                i.setSameperiod(DoubleUtils.keepPrecision(tqinfoday.getGwdl().doubleValue()/1000, 2));
                 i.setCompare(i.getCurrent().compareTo(i.getSameperiod()));
             } else {
                 i.setSameperiod(0.0);
@@ -2555,7 +2555,7 @@ public class SpecificService {
             Date date = Date.from(instant);
             vo.setYear(DateUtils.getYear(date));
             vo.setMonth(DateUtils.getMonth(date));
-            vo.setCurrent(DoubleUtils.keepPrecision(i.getSwdl().doubleValue(), 2));
+            vo.setCurrent(DoubleUtils.keepPrecision(i.getSwdl().doubleValue()/1000, 2));
             resultList.add(vo);
         });
         resultList.stream().forEach(i -> {
@@ -2564,7 +2564,7 @@ public class SpecificService {
                     .findFirst();
             if (optional.isPresent()) {
                 StationInfoDay tqinfoday = optional.get();
-                i.setSameperiod(DoubleUtils.keepPrecision(tqinfoday.getSwdl().doubleValue(), 2));
+                i.setSameperiod(DoubleUtils.keepPrecision(tqinfoday.getSwdl().doubleValue()/1000, 2));
                 i.setCompare(i.getCurrent().compareTo(i.getSameperiod()));
             } else {
                 i.setSameperiod(0.0);
@@ -3308,8 +3308,8 @@ public class SpecificService {
             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;
+            double llfdl = i.getLlfdl() != null ? i.getLlfdl() : 0.0;
+            double rfdl = i.getGzss() != null ? i.getGzss() : 0.0;
             if (llfdl != 0) {
                 Double calculatedValue = DoubleUtils.keepPrecision(rfdl / llfdl * 100, 2);
                 vo.setCurrent(calculatedValue);