|
@@ -1,30 +1,16 @@
|
|
|
package com.persagy.apm.alarmservice.group.alarmrecord.controller;
|
|
|
|
|
|
-import com.persagy.apm.alarmservice.dependency.saasweb.service.SaasWebClientWrapper;
|
|
|
-import com.persagy.apm.alarmservice.group.alarmrecord.model.ConvertAlarmCommentTool;
|
|
|
-import com.persagy.apm.alarmservice.group.alarmrecord.model.dto.CreateAlarmCommentDTO;
|
|
|
-import com.persagy.apm.alarmservice.group.alarmrecord.model.dto.PageQueryAlarmCommentDTO;
|
|
|
-import com.persagy.apm.alarmservice.group.alarmrecord.model.vo.AlarmCommentListItem;
|
|
|
-import com.persagy.apm.alarmservice.group.alarmrule.service.IGroupAlarmRuleService;
|
|
|
import com.persagy.apm.common.model.vo.SimpleObjVO;
|
|
|
-import com.persagy.apm.common.response.ApmResponseUpsertVO;
|
|
|
import com.persagy.apm.common.response.CommonResult;
|
|
|
import com.persagy.apm.common.response.PageList;
|
|
|
import com.persagy.apm.common.utils.ResultHelper;
|
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.feign.DmpResult;
|
|
|
-import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmcomment.QueryAlarmCommentDTO;
|
|
|
-import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig.AddAlarmCommentDTO;
|
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmitem.QueryAlarmItemDTO;
|
|
|
-import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.QueryDTO;
|
|
|
-import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmCommentItem;
|
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmItem;
|
|
|
-import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.DmpUpsertVO;
|
|
|
-import com.persagy.apm.energyalarmstarter.alarmdata.service.AlarmCommentServiceImpl;
|
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.service.AlarmItemServiceImpl;
|
|
|
import com.persagy.common.exception.BusinessException;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
-import org.assertj.core.util.Lists;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
@@ -33,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.validation.Valid;
|
|
|
+import java.text.Collator;
|
|
|
+import java.util.Comparator;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -50,9 +38,6 @@ public class AlarmItemController {
|
|
|
@Autowired
|
|
|
AlarmItemServiceImpl alarmItemService;
|
|
|
|
|
|
- @Autowired
|
|
|
- private IGroupAlarmRuleService groupAlarmRuleService;
|
|
|
-
|
|
|
@ApiOperation(value = "报警类型列表")
|
|
|
@PostMapping("/query")
|
|
|
public CommonResult<PageList<SimpleObjVO>> queryAlarmItem(
|
|
@@ -63,6 +48,8 @@ public class AlarmItemController {
|
|
|
}
|
|
|
List<SimpleObjVO> resultList = dmpResult.getData().stream().map(
|
|
|
alarmItem -> new SimpleObjVO(alarmItem.getCode(), alarmItem.getName())
|
|
|
+ ).sorted(
|
|
|
+ Comparator.comparing(SimpleObjVO::getName, Collator.getInstance(java.util.Locale.CHINA))
|
|
|
).collect(Collectors.toList());
|
|
|
return ResultHelper.multi(resultList);
|
|
|
}
|