Browse Source

修改宁夏项目实体对象

shilin 4 years ago
parent
commit
57f70e39ed

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

@@ -20,7 +20,7 @@ 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.WindPowerstationTestingPoint;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
 import com.gyee.frame.model.auto.Windpowerstation;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.enumeration.Messagetype;
@@ -36,7 +36,7 @@ public class IndexService extends SocketToolService{
     private static int decimal_digit = 0;
 	
 	public void index_target_comprehensive_indicators() throws Exception{
-		 Map<String, Map<String, WindPowerstationTestingPoint>> stationPointmap = InitialRunner.stationPointmap;
+		 Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
 	        List<Windpowerstation> wpls = new ArrayList<>();
 	        for(Windpowerstation wp:InitialRunner.wpls){
 	            wpls.add(wp);
@@ -121,7 +121,7 @@ public class IndexService extends SocketToolService{
 	
 	
 	public void index_target_windSpeed_power() throws Exception{
-		Map<String, Map<String, WindPowerstationTestingPoint>> stationPointmap = InitialRunner.stationPointmap;
+		Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
         List<Windpowerstation> wpls = new ArrayList<>();
         for(Windpowerstation wp:InitialRunner.wpls){
             wpls.add(wp);
@@ -357,7 +357,7 @@ public class IndexService extends SocketToolService{
 	}
 	
 	public void index_windturbine_status() throws Exception{
-		 Map<String, Map<String, WindPowerstationTestingPoint>> stationPointmap = InitialRunner.stationPointmap;
+		 Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
 	        List<Windpowerstation> wpls = new ArrayList<>();
 	        for(Windpowerstation wp:InitialRunner.wpls){
 	            wpls.add(wp);

+ 2 - 2
src/main/java/com/gyee/frame/service/app/windpowerstationdetail/Windspeedpowermodule.java

@@ -2,7 +2,7 @@ package com.gyee.frame.service.app.windpowerstationdetail;
 
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
-import com.gyee.frame.model.auto.WindPowerstationTestingPoint;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
 import com.gyee.frame.model.auto.Windpowerstation;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.enumeration.Messagetype;
@@ -26,7 +26,7 @@ public class Windspeedpowermodule extends SocketToolService {
     private static int decimal_digit = 0;
 
     public void index_windSpeed_power_target_detail() throws Exception{
-        Map<String, Map<String, WindPowerstationTestingPoint>> stationPointmap = InitialRunner.stationPointmap;
+        Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
         List<Windpowerstation> wpls = new ArrayList<>();
         for(Windpowerstation wp:InitialRunner.wpls){
             wpls.add(wp);

+ 2 - 2
src/test/java/test/RelationalDataBaseTest.java

@@ -31,8 +31,8 @@ public class RelationalDataBaseTest {
         c.set(Calendar.MINUTE, 0);
         c.set(Calendar.SECOND, 0);
 
-        Windturbineinfoday wt=windturbineinfodayService.findListByDate("CL01_001",c.getTime());
-        Windpowerinfoday wp=windpowerinfodayService.findListByDate("CL_FDC",c.getTime());
+        Windturbineinfoday wt=windturbineinfodayService.findListByDate("MG01_01",c.getTime());
+        Windpowerinfoday wp=windpowerinfodayService.findListByDate("MHS_FDC",c.getTime());
 
         System.out.println(wt.getRecorddate()+ "___" +wt.getGeneratingcapacity2());
         System.out.println(wp.getRecorddate()+ "___" +wp.getDaylyxs());