|
@@ -21,6 +21,7 @@ import org.springframework.web.client.RestTemplate;
|
|
|
import java.util.*;
|
|
|
|
|
|
|
|
|
+
|
|
|
public class EdosUtil implements IRealTimeDataBaseUtil {
|
|
|
|
|
|
|
|
@@ -93,6 +94,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
|
|
|
|
|
|
@Override
|
|
|
public List<PointData> getHistoryDatasSnap(Windpowerstationpointnew point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
|
|
|
+
|
|
|
if(StringUtils.notEmp(point) && StringUtils.notEmp(point.getCode()) && !point.getCode().startsWith(JKFC) && !point.getCode().startsWith(JKFJ))
|
|
|
{
|
|
|
baseURL = V2Config.getBaseurl();
|
|
@@ -806,7 +808,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
|
|
|
public List<PointData> getRealData(List<String> pointids) throws Exception {
|
|
|
|
|
|
|
|
|
- if(StringUtils.notEmp(pointids) )
|
|
|
+ if(StringUtils.notEmp(pointids) && !pointids.isEmpty() )
|
|
|
{
|
|
|
|
|
|
if(!pointids.get(0).startsWith(JKFC) && !pointids.get(0).startsWith(JKFJ))
|