首页调试

src/main/java/com/gyee/frame/netty/websocket/config/SocketPageConfig.java

@@ -56,6 +56,7 @@ public class SocketPageConfig {
               sisConfigMap.put("index_target_windSpeed_power",Createindex_target_windSpeed_powerConfig());//首页第二部分指标模块的子模块2，风速功率模块，包括平均风速、预测风速、实际功率、理论功率
               sisConfigMap.put("index_windturbine_status",Createindex_windturbine_statusConfig());//首页第三部分风机状态模块，包括接入、待机、运行、故障、维护、离线
               sisConfigMap.put("index_electricQuantity",Createindex_electricQuantityConfig());//首页第四部分发电量完成情况模块，包括月计划发电量、年计划发电量
+              sisConfigMap.put("index_target_basic_indicators",Createindex_target_basic_indicatorsConfig());//首页第二部分指标模块的子模块3,基础指标模块，包括月利用小时、年利用小时、综合场用电率、设备可利用率、减排二氧化硫、减排二氧化碳、节约用水、节约标煤、mttr、mtbf
               sisConfigMap.put("targetdetail_target",Createsis_targetdetail_target());//在此处进行功能化布局，表示在socket主页面下的一个功能
               sisConfigMap.put("targetdetail_curve",Createsis_targetdetail_curve());
               sisConfigMap.put("targetdetail_histogram",Createsis_targetdetail_histogram());
@@ -114,6 +115,10 @@ public class SocketPageConfig {
         return new String[]{"pageNumber_6","functionNumber_4"};//首页第四部分发电量完成情况模块，包括月计划发电量、年计划发电量
     }
 
+    private String[] Createindex_target_basic_indicatorsConfig() {
+        return new String[]{"pageNumber_6","functionNumber_5"};//首页第二部分指标模块的子模块3,基础指标模块，包括月利用小时、年利用小时、综合场用电率、设备可利用率、减排二氧化硫、减排二氧化碳、节约用水、节约标煤、mttr、mtbf
+    }
+
     
     private String[] Createsis_targetdetail_target() {
         return new String[]{"pageNumber_8","functionNumber_1"};//气象预测未来16小时数据，按小时预测，包含当前小时，pageNumber_3，功能编号functionNumber_2

src/main/java/com/gyee/frame/service/app/index/IndexService.java

@@ -1,39 +1,24 @@
 package com.gyee.frame.service.app.index;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.SpringApplication;
-import org.springframework.stereotype.Service;
-
-import com.gyee.SpringbootStart;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
-import com.gyee.frame.model.auto.Weatherfd;
-import com.gyee.frame.model.auto.WeatherfdExample;
 import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
-import com.gyee.frame.model.auto.WindPowerstationTestingPoint;
 import com.gyee.frame.model.auto.Windpowerinfoday;
 import com.gyee.frame.model.auto.Windpowerstation;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.enumeration.Messagetype;
 import com.gyee.frame.netty.websocket.util.SocketToolService;
 import com.gyee.frame.service.WindpowerinfodayService;
-import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
-import com.gyee.frame.util.mongodb.IMongodbUtil;
-import com.gyee.frame.util.mongodb.MongodbUtilImpl;
+import com.gyee.frame.util.golden.EdosUtil;
+import com.gyee.frame.util.golden.IEdosUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
 
 /**
  * 
@@ -49,7 +34,7 @@ public class IndexService extends SocketToolService{
 	@Autowired
     private InitialRunner initialRunner;
     private static int decimal_digit = 0;
-    
+	IEdosUtil mongodb = new EdosUtil();
     @Resource
     private WindpowerinfodayService windpowerinfodayService;
 	
@@ -63,7 +48,7 @@ public class IndexService extends SocketToolService{
 	        windpowerstationAll.setId("0");
 	        wpls.add(windpowerstationAll);
 	        Map<String,Map<String,Double>> windpowerstationpointDataMap = new HashMap();
-	        IMongodbUtil mongodb = new MongodbUtilImpl();
+
 
 	        for(Windpowerstation windpowerstation:wpls){
 	            Map<String,Double> pointDataMap = new HashMap();
@@ -148,7 +133,7 @@ public class IndexService extends SocketToolService{
         windpowerstationAll.setId("0");
         wpls.add(windpowerstationAll);
         Map<String,Map<String,Double>> windpowerstationpointDataMap = new HashMap();
-        IMongodbUtil mongodb = new MongodbUtilImpl();
+
 
         for(Windpowerstation windpowerstation:wpls){
             Map<String,Double> pointDataMap = new HashMap();
@@ -384,7 +369,7 @@ public class IndexService extends SocketToolService{
 	        windpowerstationAll.setId("0");
 	        wpls.add(windpowerstationAll);
 	        Map<String,Map<String,Double>> windpowerstationpointDataMap = new HashMap();
-	        IMongodbUtil mongodb = new MongodbUtilImpl();
+
 
 	        for(Windpowerstation windpowerstation:wpls){
 	            Map<String,Double> pointDataMap = new HashMap();
@@ -473,7 +458,7 @@ public class IndexService extends SocketToolService{
 	        windpowerstationAll.setId("0");
 	        wpls.add(windpowerstationAll);
 	        Map<String,Map<String,Double>> windpowerstationpointDataMap = new HashMap();
-	        IMongodbUtil mongodb = new MongodbUtilImpl();
+
 
 	        for(Windpowerstation windpowerstation:wpls){
 	            Map<String,Double> pointDataMap = new HashMap();
@@ -513,7 +498,7 @@ public class IndexService extends SocketToolService{
        windpowerstationAll.setId("0");
        wpls.add(windpowerstationAll);
        Map<String,Map<String,Double>> windpowerstationpointDataMap = new HashMap();
-       IMongodbUtil mongodb = new MongodbUtilImpl();
+
 
        for(Windpowerstation windpowerstation:wpls){
            Map<String,Double> pointDataMap = new HashMap();