单机月度分析数据集处理，风机显示名称处理

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

@@ -429,7 +429,7 @@ public class SingleAnalysisService {
                 for (ProBasicEquipment wt : wtls) {
                     SingleAnalysisVo vo = new SingleAnalysisVo();
                     vo.setWindPowerStationId(wt.getWindpowerstationId());
-                    vo.setWindturbineName(wt.getName());
+                    vo.setWindturbineName(wt.getAname());
                     vo.setWtcode(wt.getAname());
                     if (CacheContext.wpmap.containsKey(wt.getWindpowerstationId())) {
                         ProBasicPowerstation wp = CacheContext.wpmap.get(wt.getWindpowerstationId());
@@ -467,12 +467,12 @@ public class SingleAnalysisService {
 
                         double llfdl = fdl + gzss + jxss + xdss + xnss + slss; //理论发电量
 
-                        vo.setGzss(StringUtils.round(gzss,2));
-                        vo.setJxss(StringUtils.round(jxss,2));
-                        vo.setXdss(StringUtils.round(xdss,2));
-                        vo.setXnss(StringUtils.round(xnss,2));
-                        vo.setSlss(StringUtils.round(xnss,2));
-                        vo.setLlfdl(StringUtils.round(llfdl, 2));
+                        vo.setGzss(StringUtils.round(gzss/10000,2));
+                        vo.setJxss(StringUtils.round(jxss/10000,2));
+                        vo.setXdss(StringUtils.round(xdss/10000,2));
+                        vo.setXnss(StringUtils.round(xnss/10000,2));
+                        vo.setSlss(StringUtils.round(xnss/10000,2));
+                        vo.setLlfdl(StringUtils.round(llfdl/10000, 2));
 
                         double powerProduction=0;
                        if(CacheContext.modelMap.containsKey(wt.getId()))
@@ -486,7 +486,7 @@ public class SingleAnalysisService {
                         }
 
 
-                        vo.setFdl(StringUtils.round(fdl, 2));
+                        vo.setFdl(StringUtils.round(fdl/10000, 2));
                         vo.setRlxs(StringUtils.round(dayTimes, 2));
                         vo.setFs(StringUtils.round(fs, 2));