diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index d7fa72a..1527960 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -23,6 +23,7 @@ import javax.annotation.Resource; import java.util.*; +import java.util.stream.Collectors; /** @@ -74,7 +75,11 @@ } ); } - return ResponseData.success(levelList); + + ArrayList> distinctList= levelList.stream().collect(Collectors.collectingAndThen( + Collectors.toCollection(() -> new TreeSet<>( + Comparator.comparing(e->String.valueOf(e.get("deviceType"))))), ArrayList::new)); + return ResponseData.success(distinctList); } /**