pg数据统计接口修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/goodness/WindturbinegoodnessController.java

@@ -64,7 +64,7 @@ public class WindturbinegoodnessController {
 
                     if(CacheContext.modelMap.containsKey(wt.getModelId()))
                     {
-                        pwg.setModelId(CacheContext.modelMap.get(wt.getModelId()).getName());
+                        pwg.setModelId(CacheContext.modelMap.get(wt.getModelId()).getId());
                     }
                 }
 

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/singleanalysis/SingleAnalysisService.java

@@ -454,7 +454,7 @@ public class SingleAnalysisService {
                         ProEconEquipmentInfoDay1 wtd = eqday1map.get(wt.getId());
 
                         fdl = null != wtd.getYfdl() ? wtd.getYfdl() : 0.0;//风机发电量合计
-                        fdl = new BigDecimal(fdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_UP).doubleValue();
+                       // fdl = new BigDecimal(fdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_UP).doubleValue();
                         double fs = null != wtd.getYpjfs() ? wtd.getYpjfs() : 0.0;//风机平均风速
 
                         double gzss = null != wtd.getYgzssdl() ? wtd.getYgzssdl() : 0.0;//风机故障损失合计