diff --git a/src/main/java/com/inspect/simulator/mapper/PatrolResultMapper.java b/src/main/java/com/inspect/simulator/mapper/PatrolResultMapper.java index 2d5391d..5c9ff27 100644 --- a/src/main/java/com/inspect/simulator/mapper/PatrolResultMapper.java +++ b/src/main/java/com/inspect/simulator/mapper/PatrolResultMapper.java @@ -97,4 +97,6 @@ public interface PatrolResultMapper { List selectPatrolResults(PatrolResultParam patrolResultParam); String selectPatrolResultByTaskPatrolledId(@Param("taskPatrolledId") String taskPatrolledId,@Param("objectId") String objectId); + + List> selectAlgSubTypeByCode(); } diff --git a/src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java b/src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java index 7faaa19..99e7d80 100644 --- a/src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java +++ b/src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java @@ -395,6 +395,12 @@ public class PatrolResultServiceImpl implements PatrolResultService { List finalPatrolResults = patrolResults; patrolResults = patrolResults.parallelStream().filter(item -> finalPatrolResults.get(0).getTaskPatrolledId().equals(item.getTaskPatrolledId())).collect(Collectors.toList()); } + List> maps = patrolResultMapper.selectAlgSubTypeByCode(); + + Map algMap = maps.parallelStream().collect(Collectors.toMap(map -> map.get("alg_subtype_code"), map -> map.get("alg_subtype_name"), (oldValue, newValue) -> newValue)); + patrolResults.parallelStream().forEach(item -> { + item.setAlgorithmsName(algMap.getOrDefault(item.getAlgorithmsType(),"")); + }); MessageBody messageBody = prepareMessageBodyToGetPatrolResults(patrolResults, patrolResultParam.getIsBase64()); return messageBody; } diff --git a/src/main/resources/mapper/PatrolResultMapper.xml b/src/main/resources/mapper/PatrolResultMapper.xml index 84a115f..6091dfa 100644 --- a/src/main/resources/mapper/PatrolResultMapper.xml +++ b/src/main/resources/mapper/PatrolResultMapper.xml @@ -792,6 +792,11 @@ and f.check_time is null and a.patrol_point_id is not null + +