|
@@ -12,20 +12,25 @@ import com.persagy.apm.alarmservice.group.alarmrule.model.vo.GroupAlarmRuleItemV
|
|
|
import com.persagy.apm.alarmservice.group.alarmrule.model.vo.GroupAlarmRuleListItemVO;
|
|
|
import com.persagy.apm.alarmservice.group.alarmrule.service.IGroupAlarmRuleService;
|
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.service.IProjectAlarmRuleObjRelService;
|
|
|
+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.alarmconfig.QueryAlarmConfigDTO;
|
|
|
+import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmitem.QueryAlarmItemDTO;
|
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmConfigItem;
|
|
|
+import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmItem;
|
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.service.AlarmConfigServiceImpl;
|
|
|
+import com.persagy.apm.energyalarmstarter.alarmdata.service.AlarmItemServiceImpl;
|
|
|
import com.persagy.common.enums.ResponseCode;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.apache.poi.ss.usermodel.Sheet;
|
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
|
+import org.slf4j.Logger;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
@@ -38,8 +43,10 @@ import javax.validation.Valid;
|
|
|
import java.io.File;
|
|
|
import java.io.InputStream;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Iterator;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 集团报警规则控制层
|
|
@@ -61,6 +68,9 @@ public class GroupAlarmRuleController {
|
|
|
@Autowired
|
|
|
private IProjectAlarmRuleObjRelService projectAlarmRuleObjRelService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ AlarmItemServiceImpl alarmItemService;
|
|
|
+
|
|
|
@ApiOperation(value = "创建集团报警规则")
|
|
|
@PostMapping("/create")
|
|
|
public CommonResult<ApmResponseUpsertVO> createGroupAlarmRule(
|
|
@@ -94,7 +104,7 @@ public class GroupAlarmRuleController {
|
|
|
groupAlarmRuleService.updateGroupAlarmRule(updateGroupAlarmRuleDTO);
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- return ResultHelper.failure(ResponseCode.B0001.getCode(), e.getMessage());
|
|
|
+ //return ResultHelper.failure(ResponseCode.B0001.getCode(), e.getMessage());
|
|
|
}
|
|
|
return ResultHelper.single(new ApmResponseUpsertVO(updateGroupAlarmRuleDTO.getId()));
|
|
|
}
|
|
@@ -161,5 +171,25 @@ public class GroupAlarmRuleController {
|
|
|
|
|
|
}
|
|
|
|
|
|
+ @ApiOperation(value = "集团页面查询报警类型")
|
|
|
+ @PostMapping("/getAlarmItem")
|
|
|
+ public CommonResult<PageList<SimpleObjVO>> getAlarmItem(CheckAlarmItemDTO checkAlarmItemDTO) throws Exception {
|
|
|
+ QueryAlarmItemDTO queryAlarmItemDTO = new QueryAlarmItemDTO();
|
|
|
+ DmpResult<List<AlarmItem>> dmpResult = alarmItemService.query(queryAlarmItemDTO);
|
|
|
+ List<GroupAlarmRule> existAlarmItem = groupAlarmRuleService.getExistAlarmItem(checkAlarmItemDTO.getGroupId());
|
|
|
+ List<String> alarmItemCodes = existAlarmItem.stream().map(GroupAlarmRule::getAlarmItemCode).collect(Collectors.toList());
|
|
|
+ Iterator<AlarmItem> iterator = dmpResult.getData().iterator();
|
|
|
+ while (iterator.hasNext()) {
|
|
|
+ AlarmItem next = iterator.next();
|
|
|
+ if (alarmItemCodes.contains(next.getCode())) {
|
|
|
+ iterator.remove();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ List<SimpleObjVO> resultList = dmpResult.getData().stream().map(
|
|
|
+ alarmItem -> new SimpleObjVO(alarmItem.getCode(), alarmItem.getName())
|
|
|
+ ).collect(Collectors.toList());
|
|
|
+ return ResultHelper.multi(resultList);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|