Explorar o código

修改实际功率图表

xusl %!s(int64=3) %!d(string=hai) anos
pai
achega
722ebe461b

+ 2 - 2
ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/service/E63UploadFileService.java

@@ -1187,7 +1187,7 @@ public class E63UploadFileService extends BaseUploadFileService {
           //是否组串
           map.put("IsString", inverterInfo.getGroupSeries() ? "1" : "0");
           log.info("inverterInfo.getId()==="+inverterInfo.getId());
-          List<InverterStatusData> redisFilterList = redisList.stream().filter(s -> s.getId().equals(inverterInfo.getId())).collect(Collectors.toList());
+          List<InverterStatusData> redisFilterList = redisList.stream().filter(s -> s.getEquipmentId().equals(inverterInfo.getId())).collect(Collectors.toList());
           InverterStatusData redisValue = redisFilterList.get(0);
           // 状态
           String status = String.valueOf(redisValue.getStatus());
@@ -1261,7 +1261,7 @@ public class E63UploadFileService extends BaseUploadFileService {
           //是否组串
           map.put("IsString", inverterInfo.getGroupSeries() ? "1" : "0");
 
-          List<InverterStatusData> filterList = inverterStatusDataList.stream().filter(s -> s.getId().equals(inverterInfo.getId())).collect(Collectors.toList());
+          List<InverterStatusData> filterList = inverterStatusDataList.stream().filter(s -> s.getEquipmentId().equals(inverterInfo.getId())).collect(Collectors.toList());
           if (filterList.size() > 0) {
             // 用数据库
             filterList.sort(Comparator.comparing(InverterStatusData::getTime).reversed());