bug调整

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/config/GeneratorCodeConfig.java

@@ -40,7 +40,7 @@ public class GeneratorCodeConfig {
         GlobalConfig gc = new GlobalConfig();
         String projectPath = System.getProperty("user.dir");
 //        gc.setOutputDir("D:\\work\\workspaces\\sis\\web\\runeconomy-xk\\src\\main\\java");
-        gc.setOutputDir("E:\\idea_workspace\\sis\\web\\runeconomy-xk\\src\\main\\java");
+        gc.setOutputDir("D:\\work\\workspaces\\sis\\web\\runeconomy-xk\\src\\main\\java");
         gc.setAuthor("wang");
         gc.setOpen(false);
         //实体属性 Swagger2 注解

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

@@ -816,9 +816,9 @@ public class MonitorService {
                        StringUtils.round(yfdl8 += dl.getYfdldb().doubleValue(),2);
                        StringUtils.round(nfdl8 += dl.getNfdldb().doubleValue(),2);
                     }
-                    qt.put("ylyxs", StringUtils.round(((yfdl8 + rfdlsj) / 10000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000),2));
+                    qt.put("ylyxs", StringUtils.round(((yfdl8 + rfdlsj) / 10000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 10000),2));
 //                    qt.put("nlyxs", MathUtil.twoBit(nfdl / 1000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000));
-                    qt.put("nlyxs", StringUtils.round(((nfdl8 + rfdlsj) / 10000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000),2));
+                    qt.put("nlyxs", StringUtils.round(((nfdl8 + rfdlsj) / 10000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 10000),2));
                 }
             }
 
@@ -840,8 +840,8 @@ 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()) / 1000));
-                    qt.put("nlyxs", MathUtil.twoBit((nfdl8 + rfdlsj)/ 10000) / ((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));
                 }
             }
             fnlyl= Math.random() * 10 + 90;

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

@@ -232,9 +232,9 @@ public class StationMonitorService {
 
         BigDecimal zjrl = null;
         if (proBasicPowerstation.getWindType().equals("-1")) {
-            zjrl = BigDecimal.valueOf(proBasicPowerstation.getJrwindCapacity() / 1000);
+            zjrl = BigDecimal.valueOf(proBasicPowerstation.getJrwindCapacity() / 10000);
         } else if (proBasicPowerstation.getWindType().equals("-2")) {
-            zjrl = BigDecimal.valueOf(proBasicPowerstation.getJrCapacity() / 1000);
+            zjrl = BigDecimal.valueOf(proBasicPowerstation.getJrCapacity() / 10000);
         }
         resultMap.put("ylyxs", yfdl1.add(BigDecimal.valueOf(rfdl)).divide(zjrl ,2, RoundingMode.HALF_UP));
 //        resultMap.put("nlyxs", realData.get(27).getPointValueInDouble());