|
|
|
@ -356,7 +356,7 @@ public class PatrolTaskController extends BaseController { |
|
|
|
return resultAnalysis.getFilterDesc().equals(element.getFilterDesc()); |
|
|
|
}).collect(Collectors.toList()); |
|
|
|
} |
|
|
|
Map<String, PatrolData> keyPatrolData = new HashMap<>(); |
|
|
|
Map<String, PatrolData> keyPatrolData = new LinkedHashMap<>(); |
|
|
|
for (PatrolData patrolData : newList) { |
|
|
|
keyPatrolData.putIfAbsent(patrolData.getObjectId() + "_" + patrolData.getAlgType(), patrolData); |
|
|
|
} |
|
|
|
@ -2541,7 +2541,7 @@ public class PatrolTaskController extends BaseController { |
|
|
|
} |
|
|
|
newList.addAll(filterList); |
|
|
|
newList.addAll(brightNewList); |
|
|
|
Map<String, PatrolData> keyPatrolData = new HashMap<>(); |
|
|
|
Map<String, PatrolData> keyPatrolData = new LinkedHashMap<>(); |
|
|
|
for (PatrolData patrolData : newList) { |
|
|
|
keyPatrolData.putIfAbsent(patrolData.getObjectId() + "_" + patrolData.getAlgType(), patrolData); |
|
|
|
} |
|
|
|
@ -2955,7 +2955,7 @@ public class PatrolTaskController extends BaseController { |
|
|
|
if (!filterDatas.isEmpty()) { |
|
|
|
item.setImg(filterDatas.get(0).getImgAnalyse()); |
|
|
|
item.setFilterDesc(filterDatas.get(0).getDesc()); |
|
|
|
filterList.remove(filterDatas.get(0)); |
|
|
|
filterList.removeAll(filterDatas); |
|
|
|
} |
|
|
|
// else { |
|
|
|
// item.setImg(""); |
|
|
|
|