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 42089e8..b4c3359 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; /** @@ -71,7 +72,7 @@ continue; } String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum); - List> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum); + List> levels = alarmLevelService.getLevelList(tenantId, deviceTypeNum); levels.forEach( levelMap -> { levelMap.put("deviceType", deviceType); @@ -80,7 +81,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); } /** @@ -134,8 +139,8 @@ @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add( AlarmLevelParam alarmLevelParam) { - if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){ + public Object add(AlarmLevelParam alarmLevelParam) { + if (ObjectUtils.isEmpty(alarmLevelParam.getTenantId())) { AuthUser currUser = permissionService.getAuthService().getLoginUser(); alarmLevelParam.setTenantId(currUser.getId()); }