Merge remote-tracking branch 'origin/master'

realtime/generationXK-service/src/main/java/com/gyee/generation/task/SaticScheduleCALTask.java

@@ -200,7 +200,8 @@ public class SaticScheduleCALTask {
 
     /**
      * 区域公司历史指标
-     * 每秒执行一次
+     * 每5分钟执行一次
+     * 59 14/15 * * * ?
      */
     @XxlJob("regionCal_CAL")
     public void regionCal_CAL()  {

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()).getId());
+                        pwg.setModelId(CacheContext.modelMap.get(wt.getModelId()).getAname());
                     }
                 }
 

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

@@ -510,7 +510,7 @@ public class SingleAnalysisService {
 
 
                         double yxfss = dayTimes-gzxs-jxxs;//风机平均有效风
-                        vo.setYxxs(StringUtils.round(yxfss, 2));
+                        vo.setYxfss(StringUtils.round(yxfss, 2));
                         vo.setDxklyxs(StringUtils.round(dxklyxs, 2));
                         vo.setSbklyl(StringUtils.round(sbklyl, 2));
                         vo.setYxxs(StringUtils.round(yxxs, 2));
@@ -1100,7 +1100,7 @@ public class SingleAnalysisService {
                         if(map2.containsKey(wtd.getRecordDate().getTime()))
                         {
                             ProEconEquipmentInfoDay2 daypo=map2.get(wtd.getRecordDate().getTime());
-                            vo.setTjxs(daypo.getRgztjxs());
+                            vo.setTjxs(daypo.getRdjxsmx());
                         }
                     }
 

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

@@ -1,5 +1,5 @@
 spring:
   profiles:
 #    active: jn
-    active: xk
+    active: yun
 #    active: xk