Merge remote-tracking branch 'origin/developer_bw' into developer_bw

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/util/Constants.java

@@ -86,7 +86,7 @@ public class Constants {
     public static final String get_quota_complate_info="method=scene_screen.large_screen.get_quota_complate_info";
     public static final String resovleRule_data = "data";
     public static final String areaChinese="区域";
-    public static final String get_big_screen_point_url="http://iiet-jepcc.powerchina.cn:8088/core/datastorage/gateway/point/list?groupId=1827987484823289857&dataType=analog";
+//    public static final String get_big_screen_point_url="http://iiet-jepcc.powerchina.cn:8088/core/datastorage/gateway/point/list?groupId=1827987484823289857&dataType=analog";
 }
 
 

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/LargeScreenImpl.java

@@ -35,6 +35,7 @@ import org.springframework.http.*;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 
@@ -98,7 +99,8 @@ public class LargeScreenImpl {
 
 	@Value("${budun.baseurl:http://iiet-jepcc.powerchina.cn:8088/screen_api}")
 	private String budunBaseURL;
-	
+	@Value("${bigScreenPoint.url:http://iiet-jepcc.powerchina.cn:8088/core/datastorage/gateway/point/list?groupId=1827987484823289857&dataType=analog}")
+	private String bigScreenPointUrl;
 	/**
 	 * 全国
 	 */
@@ -267,7 +269,7 @@ public class LargeScreenImpl {
 	 */
 	private Map<String,Double> getPointValue() {
 		Map<String,Double> resultMap=new HashMap();
-		JSONObject jsonObject = sendCoreGetRequest(Constants.get_big_screen_point_url);
+		JSONObject jsonObject = sendCoreGetRequest(bigScreenPointUrl);
 		if (!Objects.isNull(jsonObject)) {
 			if (jsonObject.getInteger("status") == HttpStatus.OK.value()) {
 				JSONArray resultJsonArray = jsonObject.getJSONArray("result");
@@ -1042,11 +1044,14 @@ public class LargeScreenImpl {
 //        String startTime = sdf.format(currentDayStartTime);
 //        String endTime= sdf.format(currentDayEndTime);
 
-		activePowerListFD = indicatorDataMapper
-				.selectDataByequipmentIndexNameAndtimeqgNew(CommonConstans.xiazaoActivePowerPoint, fdGatewayIds);
-
-		activePowerListGF = indicatorDataMapper
-				.selectDataByequipmentIndexNameAndtimeqgNew(CommonConstans.taiheActivePowerPoint, gfGatewayIds);
+		if (!StringUtils.isEmpty(fdGatewayIds)){
+			activePowerListFD = indicatorDataMapper
+					.selectDataByequipmentIndexNameAndtimeqgNew(CommonConstans.xiazaoActivePowerPoint, fdGatewayIds);
+		}
+		if (!StringUtils.isEmpty(gfGatewayIds)){
+			activePowerListGF = indicatorDataMapper
+					.selectDataByequipmentIndexNameAndtimeqgNew(CommonConstans.taiheActivePowerPoint, gfGatewayIds);
+		}
 		System.out.println(JSON.toJSONString(activePowerListFD));
 		for (int i = 0; i < activePowerListFD.size(); i++) {
 			IndicatorData indicatorData = activePowerListFD.get(i);
@@ -1146,12 +1151,14 @@ public class LargeScreenImpl {
 
 //        String startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
 //        String endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
-
-		activePowerListFD = indicatorDataMapper
-				.selectDataByequipmentIndexNameAndtimeqgNew(CommonConstans.xiazaoActivePowerPoint, fdGatewayIds);
-
-		activePowerListGF = indicatorDataMapper
-				.selectDataByequipmentIndexNameAndtimeqgNew(CommonConstans.taiheActivePowerPoint, gfGatewayIds);
+		if(!StringUtils.isEmpty(fdGatewayIds)){
+			activePowerListFD = indicatorDataMapper
+					.selectDataByequipmentIndexNameAndtimeqgNew(CommonConstans.xiazaoActivePowerPoint, fdGatewayIds);
+		}
+		if(!StringUtils.isEmpty(gfGatewayIds)){
+			activePowerListGF = indicatorDataMapper
+					.selectDataByequipmentIndexNameAndtimeqgNew(CommonConstans.taiheActivePowerPoint, gfGatewayIds);
+		}
 		System.out.println(JSON.toJSONString(activePowerListFD));
 		for (int i = 0; i < activePowerListFD.size(); i++) {
 			IndicatorData indicatorData = activePowerListFD.get(i);

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/application.properties

@@ -84,4 +84,6 @@ year.power.generation.cron=0 0/1 * * * ?
 large.cron=0 0/5 * * * ?
 forecast.url=http://10.20.1.29:8095/offline/time-series/decomposition
 
-budun.baseurl=http://iiet-jepcc.powerchina.cn:8088/screen_api
+budun.baseurl=http://iiet-jepcc.powerchina.cn:8088/screen_api
\ No newline at end of file
+bigScreenPoint.url=http://iiet-jepcc.powerchina.cn:8088/core/datastorage/gateway/point/list?groupId=1827987484823289857&dataType=anal\
+  og
\ No newline at end of file