wangchangsheng %!s(int64=2) %!d(string=hai) anos
pai
achega
c906e542c1

+ 4 - 2
web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/peranalysis/PointPerSisService.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.TypeReference;
 import com.gyee.frame.common.cache.IGlobalCache;
 import com.gyee.frame.model.auto.Freedom;
 import com.gyee.frame.model.auto.Windpowerstationpointnew;
+import com.gyee.frame.model.auto.Windturbinetestingpointnew;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.custom.PointPerSisVo;
 import com.gyee.frame.util.*;
@@ -36,15 +37,16 @@ public class PointPerSisService {
 
                 String wpString = (String) (globalCache.get(w));
 
-                Map<String, Windpowerstationpointnew> windturbinetestingpointaiMap = JSONObject.parseObject(wpString, new TypeReference<Map<String, Windpowerstationpointnew>>() {
+                Map<String, Windturbinetestingpointnew> windturbinetestingpointnewMap = JSONObject.parseObject(wpString, new TypeReference<Map<String, Windturbinetestingpointnew>>() {
                 });
 
+
                 PointPerSisVo vo = new PointPerSisVo();
                 vo.setWtid(w);
 
                 Map<String, List<PointData>> pointDataMap = new HashMap<>();
                 for (int i = 0; i < codes.length; i++) {
-                    Windpowerstationpointnew windturbinetestingpointai = windturbinetestingpointaiMap.get(StringUtils.upperCase(codes[i]));
+                    Windturbinetestingpointnew windturbinetestingpointai = windturbinetestingpointnewMap.get(StringUtils.upperCase(codes[i]));
                     if (StringUtils.isNotNull(windturbinetestingpointai)) {
                         try {
                             List<PointData> historyDatas = realApiUtil.getHistoryDatasSnap(windturbinetestingpointai, beginDate / 1000, endDate / 1000, null, interval * 60l);