|
@@ -1163,7 +1163,6 @@ public class E63UploadFileService extends BaseUploadFileService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- log.info(String.valueOf(Arrays.toString(redisList.toArray())));
|
|
|
List<Map<String, String>> dtaInverterList = new ArrayList<>();
|
|
|
if (redisList.size() == filterInverterInfoList.size() && redisList.size() > 0) {
|
|
|
// redis里有全部的数据
|
|
@@ -1185,8 +1184,7 @@ public class E63UploadFileService extends BaseUploadFileService {
|
|
|
map.put("sample", inverterInfo.getSample() ? "1" : "0");
|
|
|
//是否组串
|
|
|
map.put("IsString", inverterInfo.getGroupSeries() ? "1" : "0");
|
|
|
- log.info("inverterInfo.getId()==="+inverterInfo.getId());
|
|
|
- List<InverterStatusData> redisFilterList = redisList.stream().filter(s -> s.getEquipmentId().equals(inverterInfo.getId())).collect(Collectors.toList());
|
|
|
+ List<InverterStatusData> redisFilterList = redisList.stream().filter(s -> s.getEquipmentId().equals(inverterInfo.getId().toString())).collect(Collectors.toList());
|
|
|
InverterStatusData redisValue = redisFilterList.get(0);
|
|
|
// 状态
|
|
|
String status = String.valueOf(redisValue.getStatus());
|
|
@@ -1260,7 +1258,7 @@ public class E63UploadFileService extends BaseUploadFileService {
|
|
|
//是否组串
|
|
|
map.put("IsString", inverterInfo.getGroupSeries() ? "1" : "0");
|
|
|
|
|
|
- List<InverterStatusData> filterList = inverterStatusDataList.stream().filter(s -> s.getEquipmentId().equals(inverterInfo.getId())).collect(Collectors.toList());
|
|
|
+ List<InverterStatusData> filterList = inverterStatusDataList.stream().filter(s -> s.getEquipmentId().equals(inverterInfo.getId().toString())).collect(Collectors.toList());
|
|
|
if (filterList.size() > 0) {
|
|
|
// 用数据库
|
|
|
filterList.sort(Comparator.comparing(InverterStatusData::getTime).reversed());
|