Browse Source

修改查询设备所在分组的bug;修改报警记录查询的bug

lixing 3 years ago
parent
commit
2fab337eea
16 changed files with 213 additions and 211 deletions
  1. 16 15
      src/main/java/com/persagy/apm/alarmservice/group/alarmrecord/controller/AlarmRecordController.java
  2. 1 1
      src/main/java/com/persagy/apm/alarmservice/group/alarmrecord/model/ConvertAlarmRecordTool.java
  3. 9 8
      src/main/java/com/persagy/apm/alarmservice/group/alarmrecord/service/AlarmRecordWrapper.java
  4. 26 28
      src/main/java/com/persagy/apm/alarmservice/group/management/controller/GroupManagementController.java
  5. 5 11
      src/main/java/com/persagy/apm/alarmservice/group/management/model/equip/dto/GroupManagementDTO.java
  6. 4 4
      src/main/java/com/persagy/apm/alarmservice/group/management/model/equip/GroupManagement.java
  7. 2 2
      src/main/java/com/persagy/apm/alarmservice/group/management/model/equip/vo/GroupManagementVo.java
  8. 2 2
      src/main/java/com/persagy/apm/alarmservice/group/management/model/group/ConvertGroupTool.java
  9. 2 2
      src/main/java/com/persagy/apm/alarmservice/group/management/model/group/vo/GroupTreeInfoVO.java
  10. 2 2
      src/main/java/com/persagy/apm/alarmservice/group/management/model/group/vo/GroupTreeDetailVO.java
  11. 4 14
      src/main/java/com/persagy/apm/alarmservice/group/management/model/group/vo/GroupTreeVO.java
  12. 33 28
      src/main/java/com/persagy/apm/alarmservice/group/management/service/GroupManagementService.java
  13. 83 79
      src/main/java/com/persagy/apm/alarmservice/group/management/service/impl/GroupManagementServiceImpl.java
  14. 3 2
      src/main/java/com/persagy/apm/alarmservice/project/alarmrule/service/impl/ProjectAlarmRuleServiceImpl.java
  15. 14 13
      src/main/java/com/persagy/apm/alarmservice/project/monitorindicatorconfig/service/impl/ProjectMonitorIndicatorConfigServiceImpl.java
  16. 7 0
      src/main/resources/bootstrap.yml

+ 16 - 15
src/main/java/com/persagy/apm/alarmservice/group/alarmrecord/controller/AlarmRecordController.java

@@ -10,7 +10,8 @@ import com.persagy.apm.alarmservice.group.alarmrecord.model.vo.AlarmRecordIdsIte
 import com.persagy.apm.alarmservice.group.alarmrecord.model.vo.AlarmRecordItemVO;
 import com.persagy.apm.alarmservice.group.alarmrecord.model.vo.AlarmRecordListItem;
 import com.persagy.apm.alarmservice.group.alarmrecord.service.AlarmRecordWrapper;
-import com.persagy.apm.alarmservice.group.management.model.group.vo.GroupTreeDetailVO;
+import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipItem;
+import com.persagy.apm.alarmservice.group.management.model.group.vo.GroupInfoVO;
 import com.persagy.apm.alarmservice.group.management.service.GroupManagementService;
 import com.persagy.apm.common.context.poems.PoemsContext;
 import com.persagy.apm.common.model.dto.Sort;
@@ -25,8 +26,8 @@ import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.QueryDTO;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmRecordItem;
 import com.persagy.apm.energyalarmstarter.alarmdata.service.AlarmItemServiceImpl;
 import com.persagy.apm.energyalarmstarter.alarmdata.service.AlarmRecordServiceImpl;
-import com.persagy.apm.alarmservice.group.management.model.equip.dto.GroupManagementDTO;
-import com.persagy.apm.alarmservice.group.management.model.equip.vo.GroupManagementVo;
+import com.persagy.apm.alarmservice.group.management.model.equip.dto.QueryEquipDTO;
+import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipListItem;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.assertj.core.util.Lists;
@@ -139,31 +140,31 @@ public class AlarmRecordController {
         }
 
         if (CollectionUtils.isEmpty(groupIdList)) {
-            List<GroupTreeDetailVO> groupTreeDetailList = groupManagementService.queryAllLeafGroups();
-            groupIdList = groupTreeDetailList.stream().map(GroupTreeDetailVO::getId).collect(Collectors.toList());
+            List<GroupInfoVO> groupTreeDetailList = groupManagementService.queryAllLeafGroups();
+            groupIdList = groupTreeDetailList.stream().map(GroupInfoVO::getId).collect(Collectors.toList());
         }
 
-        List<GroupManagementVo> equipList = new ArrayList<>();
+        List<EquipItem> equipList = new ArrayList<>();
 
         for (String groupId : groupIdList) {
-            GroupTreeDetailVO group = groupManagementService.getGroup(groupId);
+            GroupInfoVO group = groupManagementService.getGroup(groupId);
             // 查询分组下的设备
-            GroupManagementDTO groupManagementDTO = new GroupManagementDTO();
-            groupManagementDTO.setLocalName(objName);
-            groupManagementDTO.setClassCode(group.getClassCode());
-            groupManagementDTO.setCondition(group.getCondition());
+            QueryEquipDTO queryEquipDTO = new QueryEquipDTO();
+            queryEquipDTO.setLocalName(objName);
+            queryEquipDTO.setClassCode(group.getClassCode());
+            queryEquipDTO.setCondition(group.getCondition());
             // 如果项目id列表为空,查询分组下的所有设备
             if (CollectionUtils.isEmpty(projectIdList)) {
-                equipList.addAll(groupManagementService.getEquipList(groupManagementDTO));
+                equipList.addAll(groupManagementService.getEquipList(queryEquipDTO));
             } else {
                 for (String projectId : projectIdList) {
-                    groupManagementDTO.setProjectId(projectId);
-                    equipList.addAll(groupManagementService.getEquipList(groupManagementDTO));
+                    queryEquipDTO.setProjectId(projectId);
+                    equipList.addAll(groupManagementService.getEquipList(queryEquipDTO));
                 }
             }
         }
 
-        return equipList.stream().map(GroupManagementVo::getId).collect(Collectors.toList());
+        return equipList.stream().map(EquipItem::getId).collect(Collectors.toList());
     }
 
     @ApiOperation(value = "历史报警列表")

+ 1 - 1
src/main/java/com/persagy/apm/alarmservice/group/alarmrecord/model/ConvertAlarmRecordTool.java

@@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers;
  * @author lixing
  * @version V1.0 2021-09-08 22:30:38
  */
-@Mapper(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_DEFAULT,
+@Mapper(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL,
         nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 public interface ConvertAlarmRecordTool {
     ConvertAlarmRecordTool INSTANCE = Mappers.getMapper(ConvertAlarmRecordTool.class);

+ 9 - 8
src/main/java/com/persagy/apm/alarmservice/group/alarmrecord/service/AlarmRecordWrapper.java

@@ -9,7 +9,7 @@ import com.persagy.apm.alarmservice.group.alarmrecord.enums.EnumAlarmTreatMode;
 import com.persagy.apm.alarmservice.group.alarmrecord.enums.EnumAlarmTreatState;
 import com.persagy.apm.alarmservice.group.alarmrecord.model.vo.AlarmRecordItemVO;
 import com.persagy.apm.alarmservice.group.alarmrecord.model.vo.AlarmRecordListItem;
-import com.persagy.apm.alarmservice.group.management.model.equip.GroupManagement;
+import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipItem;
 import com.persagy.apm.alarmservice.group.management.service.GroupManagementService;
 import com.persagy.apm.common.model.vo.SimpleObjVO;
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.DmpResult;
@@ -108,11 +108,12 @@ public class AlarmRecordWrapper {
      */
     public List<AlarmRecordListItem> getAlarmRecordListItems(DmpResult<List<AlarmRecordItem>> dmpResult) throws Exception {
         // 获取查询结果中的设备
-        List<String> objIds = dmpResult.getData().stream().map(AlarmRecordItem::getObjId).collect(Collectors.toList());
+        Set<String> objIds = dmpResult.getData().stream().map(AlarmRecordItem::getObjId).collect(Collectors.toSet());
+        List<String> objIdList = Lists.newArrayList(objIds);
         // 获取这些设备所在的分组信息
-        Map<String, SimpleObjVO> objGroupMap = groupManagementService.queryObjGroup(objIds);
+        Map<String, SimpleObjVO> objGroupMap = groupManagementService.queryObjGroup(objIdList);
         // 获取这些设备的名称
-        Map<String, GroupManagement> objMap = groupManagementService.queryEquipsByIds(objIds);
+        Map<String, EquipItem> objMap = groupManagementService.queryEquipsByIds(objIdList);
         if (CollectionUtils.isEmpty(dmpResult.getData())) {
             return new ArrayList<>();
         }
@@ -139,13 +140,13 @@ public class AlarmRecordWrapper {
      */
     private AlarmRecordListItem getAlarmRecordListItem(
             Map<String, SimpleObjVO> objGroupMap,
-            Map<String, GroupManagement> objMap,
+            Map<String, EquipItem> objMap,
             Map<String, SimpleObjVO> alarmItemMap,
             AlarmRecordItem alarmRecordItem) {
         AlarmRecordListItem alarmRecordListItem = new AlarmRecordListItem();
         alarmRecordListItem.setId(alarmRecordItem.getId());
         alarmRecordListItem.setGroup(objGroupMap.get(alarmRecordItem.getObjId()));
-        GroupManagement objInfo = objMap.get(alarmRecordItem.getObjId());
+        EquipItem objInfo = objMap.get(alarmRecordItem.getObjId());
         alarmRecordListItem.setObj(new SimpleObjVO(alarmRecordItem.getObjId(),
                 objInfo == null ? null : objInfo.getLocalName()));
         alarmRecordListItem.setAlarmItem(alarmItemMap.get(alarmRecordItem.getItemCode()));
@@ -270,10 +271,10 @@ public class AlarmRecordWrapper {
                 Lists.newArrayList(alarmRecordItem.getObjId()));
         alarmRecordItemVO.setGroup(objGroupMap.get(alarmRecordItem.getObjId()));
         // 获取这些设备的名称
-        Map<String, GroupManagement> objMap = groupManagementService.queryEquipsByIds(
+        Map<String, EquipItem> objMap = groupManagementService.queryEquipsByIds(
                 Lists.newArrayList(alarmRecordItem.getObjId())
         );
-        GroupManagement objInfo = objMap.get(alarmRecordItem.getObjId());
+        EquipItem objInfo = objMap.get(alarmRecordItem.getObjId());
         alarmRecordItemVO.setObj(new SimpleObjVO(alarmRecordItem.getObjId(),
                 objInfo == null ? null : objInfo.getLocalName()));
         // 报警类型

+ 26 - 28
src/main/java/com/persagy/apm/alarmservice/group/management/controller/GroupManagementController.java

@@ -1,16 +1,14 @@
 package com.persagy.apm.alarmservice.group.management.controller;
 
-import com.persagy.apm.alarmservice.group.management.model.group.vo.GroupTreeDetailVO;
-import com.persagy.apm.alarmservice.group.management.model.group.vo.GroupTreeInfoVO;
+import com.persagy.apm.alarmservice.group.management.model.group.vo.GroupInfoVO;
 import com.persagy.apm.alarmservice.group.management.model.group.vo.GroupTreeVO;
 import com.persagy.apm.alarmservice.group.management.service.GroupManagementService;
 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.alarmservice.group.management.model.equip.dto.EquipIdDTO;
-import com.persagy.apm.alarmservice.group.management.model.equip.dto.EquipIdListDTO;
-import com.persagy.apm.alarmservice.group.management.model.equip.dto.GroupManagementDTO;
-import com.persagy.apm.alarmservice.group.management.model.equip.vo.GroupManagementVo;
+import com.persagy.apm.alarmservice.group.management.model.equip.dto.QueryEquipDTO;
+import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipListItem;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,30 +42,30 @@ public class GroupManagementController {
         return ResultHelper.single(getGroupTree());
     }
 
-    @ApiOperation(value = "获取分组信息")
-    @PostMapping("/eq_groups/get")
-    public CommonResult<GroupTreeDetailVO> queryTreeById(@Valid @RequestBody EquipIdDTO equipIdDTO){
-        return ResultHelper.single(managementService.getGroup(equipIdDTO.getId()));
-    }
-    
-    @ApiOperation(value = "分组条件(设备类+查询条件)+项目 获取设备  加上分页和根据设备名称查询")
-    @PostMapping("/equips/query")
-    public CommonResult<PageList<GroupManagementVo>> equipsQuery(@Valid @RequestBody GroupManagementDTO managementDTO){
-        PageList<GroupManagementVo> pageList = managementService.equipsQuery(managementDTO);
-        return ResultHelper.multi(pageList.getRecords(),pageList.getTotal());
-    }
+//    @ApiOperation(value = "获取分组信息")
+//    @PostMapping("/eq_groups/get")
+//    public CommonResult<GroupInfoVO> queryTreeById(@Valid @RequestBody EquipIdDTO equipIdDTO){
+//        return ResultHelper.single(managementService.getGroup(equipIdDTO.getId()));
+//    }
+//
+//    @ApiOperation(value = "分组条件(设备类+查询条件)+项目 获取设备  加上分页和根据设备名称查询")
+//    @PostMapping("/equips/query")
+//    public CommonResult<PageList<EquipListItem>> equipsQuery(@Valid @RequestBody QueryEquipDTO managementDTO){
+//        PageList<EquipListItem> pageList = managementService.equipsQuery(managementDTO);
+//        return ResultHelper.multi(pageList.getRecords(),pageList.getTotal());
+//    }
+//
+//    @ApiOperation(value = "获取设备名称")
+//    @PostMapping("/equips/get")
+//    public CommonResult<EquipListItem> equipsQuery(@Valid @RequestBody EquipIdDTO equipIdDTO) {
+//        return ResultHelper.single(managementService.equipsGet(equipIdDTO.getId()));
+//    }
 
-    @ApiOperation(value = "获取设备名称")
-    @PostMapping("/equips/get")
-    public CommonResult<GroupManagementVo> equipsQuery(@Valid @RequestBody EquipIdDTO equipIdDTO) {
-        return ResultHelper.single(managementService.equipsGet(equipIdDTO.getId()));
-    }
-
-    @ApiOperation(value = "获取分组名称")
-    @PostMapping("/equipsGroup/query")
-    public CommonResult<List<GroupTreeInfoVO>> equipsGroupQuery(@Valid @RequestBody EquipIdListDTO equipIdListDTO){
-        return ResultHelper.single(managementService.equipsGroupQuery(equipIdListDTO.getEquipIdList())) ;
-    }
+//    @ApiOperation(value = "获取分组名称")
+//    @PostMapping("/equipsGroup/query")
+//    public CommonResult<List<GroupTreeInfoVO>> equipsGroupQuery(@Valid @RequestBody EquipIdListDTO equipIdListDTO){
+//        return ResultHelper.single(managementService.equipsGroupQuery(equipIdListDTO.getEquipIdList())) ;
+//    }
 
     @Scheduled(cron = "0 0 * * * ?")
     public void batchDelete(){

+ 5 - 11
src/main/java/com/persagy/apm/alarmservice/group/management/model/equip/dto/GroupManagementDTO.java

@@ -1,8 +1,10 @@
 package com.persagy.apm.alarmservice.group.management.model.equip.dto;
 
+import com.persagy.apm.common.model.dto.PageDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
@@ -13,10 +15,10 @@ import javax.validation.constraints.NotNull;
  * @version 1.0
  * @date 2021/9/8 16:46
  */
-@ApiModel("设备信息")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("查询设备信息")
 @Data
-public class GroupManagementDTO{
-
+public class QueryEquipDTO extends PageDTO {
     @ApiModelProperty("项目id")
     private String projectId;
 
@@ -30,12 +32,4 @@ public class GroupManagementDTO{
     @ApiModelProperty(value = "查询条件",required = true)
     @NotBlank(message = "查询条件必传")
     private String condition;
-
-    @ApiModelProperty(value = "当前页",required = true)
-    @NotNull(message = "当前页必传")
-    private Integer current;
-
-    @ApiModelProperty(value = "每页条数",required = true)
-    @NotNull(message = "每页条数必传")
-    private Integer size;
 }

+ 4 - 4
src/main/java/com/persagy/apm/alarmservice/group/management/model/equip/GroupManagement.java

@@ -1,5 +1,6 @@
-package com.persagy.apm.alarmservice.group.management.model.equip;
+package com.persagy.apm.alarmservice.group.management.model.equip.vo;
 
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 /*import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.Document;
@@ -10,14 +11,13 @@ import org.springframework.data.elasticsearch.annotations.Setting;*/
 import java.time.LocalDateTime;
 
 /**
- * 设备信息
- *
  * @author 易涛
  * @version 1.0
  * @date 2021/9/7 18:11
  */
+@ApiModel("设备详细信息")
 @Data
-public class GroupManagement {
+public class EquipItem {
 
     private String id;
 

+ 2 - 2
src/main/java/com/persagy/apm/alarmservice/group/management/model/equip/vo/GroupManagementVo.java

@@ -9,9 +9,9 @@ import lombok.Data;
  * @version 1.0
  * @date 2021/9/7 18:11
  */
-@ApiModel("设备信息")
+@ApiModel("设备信息,列表显示用")
 @Data
-public class GroupManagementVo {
+public class EquipListItem {
 
     @ApiModelProperty("设备id")
     private String id;

+ 2 - 2
src/main/java/com/persagy/apm/alarmservice/group/management/model/group/ConvertGroupTool.java

@@ -1,6 +1,6 @@
 package com.persagy.apm.alarmservice.group.management.model.group;
 
-import com.persagy.apm.alarmservice.group.management.model.group.vo.GroupTreeDetailVO;
+import com.persagy.apm.alarmservice.group.management.model.group.vo.GroupInfoVO;
 import com.persagy.apm.alarmservice.group.management.model.group.vo.GroupTreeVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.NullValueCheckStrategy;
@@ -26,5 +26,5 @@ public interface ConvertGroupTool {
      * @author lixing
      * @version V1.0 2021/9/19 1:25 下午
      */
-    GroupTreeDetailVO convert2DetailDTO(GroupTreeVO groupTreeVO);
+    GroupInfoVO convert2DetailDTO(GroupTreeVO groupTreeVO);
 }

+ 2 - 2
src/main/java/com/persagy/apm/alarmservice/group/management/model/group/vo/GroupTreeInfoVO.java

@@ -10,10 +10,10 @@ import lombok.EqualsAndHashCode;
  * @version 1.0
  * @date 2021/9/8 11:32
  */
-@ApiModel(value = "分组树详情")
+@ApiModel(value = "设备和所在分组信息")
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class GroupTreeInfoVO extends GroupTreeDetailVO{
+public class EquipGroupInfoVO extends GroupInfoVO {
 
     @ApiModelProperty("设备id")
     private String equipId;

+ 2 - 2
src/main/java/com/persagy/apm/alarmservice/group/management/model/group/vo/GroupTreeDetailVO.java

@@ -11,9 +11,9 @@ import java.util.List;
  * @version 1.0
  * @date 2021/9/8 11:32
  */
-@ApiModel(value = "分组树详情")
+@ApiModel(value = "分组信息")
 @Data
-public class GroupTreeDetailVO {
+public class GroupInfoVO {
 
     @ApiModelProperty("分组id")
     private String id;

+ 4 - 14
src/main/java/com/persagy/apm/alarmservice/group/management/model/group/vo/GroupTreeVO.java

@@ -3,6 +3,7 @@ package com.persagy.apm.alarmservice.group.management.model.group.vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
@@ -11,21 +12,10 @@ import java.util.List;
  * @version 1.0
  * @date 2021/9/8 11:32
  */
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "分组树")
 @Data
-public class GroupTreeVO {
-
-    @ApiModelProperty("分组id")
-    private String id;
-
-    @ApiModelProperty("分组名称")
-    private String name;
-
-    @ApiModelProperty("对象类编码")
-    private String classCode;
-
-    @ApiModelProperty("条件")
-    private String condition;
-
+public class GroupTreeVO extends GroupInfoVO {
+    @ApiModelProperty("子节点信息")
     private List<GroupTreeVO> children;
 }

+ 33 - 28
src/main/java/com/persagy/apm/alarmservice/group/management/service/GroupManagementService.java

@@ -1,12 +1,12 @@
 package com.persagy.apm.alarmservice.group.management.service;
 
-import com.persagy.apm.alarmservice.group.management.model.equip.GroupManagement;
-import com.persagy.apm.alarmservice.group.management.model.group.vo.GroupTreeDetailVO;
-import com.persagy.apm.alarmservice.group.management.model.group.vo.GroupTreeInfoVO;
+import com.persagy.apm.alarmservice.group.management.model.equip.dto.QueryEquipDTO;
+import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipItem;
+import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipListItem;
+import com.persagy.apm.alarmservice.group.management.model.group.vo.EquipGroupInfoVO;
+import com.persagy.apm.alarmservice.group.management.model.group.vo.GroupInfoVO;
 import com.persagy.apm.common.model.vo.SimpleObjVO;
 import com.persagy.apm.common.response.PageList;
-import com.persagy.apm.alarmservice.group.management.model.equip.dto.GroupManagementDTO;
-import com.persagy.apm.alarmservice.group.management.model.equip.vo.GroupManagementVo;
 
 import java.util.List;
 import java.util.Map;
@@ -16,49 +16,52 @@ import java.util.Map;
  * @version 1.0
  * @date 2021/9/8 14:17
  */
-public interface GroupManagementService{
+public interface GroupManagementService {
     /**
      * 分组条件(设备类+查询条件)+项目 获取设备
-     * @param managementDTO 查询条件
+     *
+     * @param queryDTO 查询条件
+     * @return 设备列表(带分页)
      * @author 易涛
      * @date 2021/9/8 16:54
-     * @return java.util.List<com.persagy.apm.model.vo.GroupManagementVo>
      */
-    PageList<GroupManagementVo> equipsQuery(GroupManagementDTO managementDTO);
-    
+    PageList<EquipItem> equipsQuery(QueryEquipDTO queryDTO);
+
     /**
+     * 获取设备详情
      *
      * @param id 设备id
+     * @return 设备详细信息
      * @author 易涛
-     * @date 2021/9/9 16:04 
-     * @return com.persagy.apm.model.vo.GroupManagementVo
+     * @date 2021/9/9 16:04
      */
-    GroupManagementVo equipsGet(String id);
+    EquipItem equipGet(String id);
 
     /**
-     * 查询设备
+     * 根据一组id查询设备
      *
-     * @param ids 设备id列表
+     * @param equipIds 设备id列表
      * @return 设备id -> 设备信息 map
      * @author lixing
      * @version V1.0 2021/9/20 1:15 下午
      */
-    Map<String, GroupManagement> queryEquipsByIds(List<String> ids);
+    Map<String, EquipItem> queryEquipsByIds(List<String> equipIds);
 
     /**
-     * 根据设备id查询分组名称
-     * @param ids 设备id数组
+     * 根据一组设备id查询设备和所在分组信息
+     *
+     * @param equipIds 设备id数组
+     * @return 设备和所在分组信息列表
      * @author 易涛
      * @date 2021/9/10 10:02
-     * @return com.persagy.apm.alarmservice.group.management.model.vo.GroupTreeDetailVO
      */
-    List<GroupTreeInfoVO> equipsGroupQuery(List<String> ids);
+    List<EquipGroupInfoVO> equipGroupQuery(List<String> equipIds);
 
     /**
-     * 根据设备id查询分组名称
+     * 根据一组设备id查询对应的分组信息
      *
      * @param objIds 设备id列表
-     * @return 设备id->分组名称映射
+     * @return 设备id->分组信息映射
      * @author lixing
      * @version V1.0 2021/9/20 1:14 下午
      */
@@ -66,27 +69,29 @@ public interface GroupManagementService{
 
     /**
      * 定时任务删除valid为0的数据
+     *
+     * @return void
      * @author 易涛
      * @date 2021/9/14 15:55
-     * @return void
      */
     void batchDelete();
 
     /**
      * 查询分组下的设备
+     *
      * @param condition 分组查询条件
      * @param classCode 设备类
      * @return 分组下的设备
      */
-    List<GroupManagementVo> getEquipList(String condition, String classCode);
+    List<EquipItem> getEquipList(String condition, String classCode);
 
     /**
      * 使用默认分页条件查询分组下的设备
      *
-     * @param groupManagementDTO 查询条件
+     * @param queryEquipDTO 查询条件
      * @return 分组下的设备
      */
-    List<GroupManagementVo> getEquipList(GroupManagementDTO groupManagementDTO);
+    List<EquipItem> getEquipList(QueryEquipDTO queryEquipDTO);
 
     /**
      * 获取分组信息
@@ -96,7 +101,7 @@ public interface GroupManagementService{
      * @author lixing
      * @version V1.0 2021/9/18 7:03 下午
      */
-    GroupTreeDetailVO getGroup(String id);
+    GroupInfoVO getGroup(String id);
 
     /**
      * 查询所有叶子节点分组
@@ -105,5 +110,5 @@ public interface GroupManagementService{
      * @author lixing
      * @version V1.0 2021/9/19 1:02 下午
      */
-    List<GroupTreeDetailVO> queryAllLeafGroups();
+    List<GroupInfoVO> queryAllLeafGroups();
 }

+ 83 - 79
src/main/java/com/persagy/apm/alarmservice/group/management/service/impl/GroupManagementServiceImpl.java

@@ -4,12 +4,11 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
-import com.persagy.apm.alarmservice.group.management.model.equip.GroupManagement;
-import com.persagy.apm.alarmservice.group.management.model.equip.dto.GroupManagementDTO;
-import com.persagy.apm.alarmservice.group.management.model.equip.vo.GroupManagementVo;
+import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipItem;
+import com.persagy.apm.alarmservice.group.management.model.equip.dto.QueryEquipDTO;
 import com.persagy.apm.alarmservice.group.management.model.group.ConvertGroupTool;
-import com.persagy.apm.alarmservice.group.management.model.group.vo.GroupTreeDetailVO;
-import com.persagy.apm.alarmservice.group.management.model.group.vo.GroupTreeInfoVO;
+import com.persagy.apm.alarmservice.group.management.model.group.vo.GroupInfoVO;
+import com.persagy.apm.alarmservice.group.management.model.group.vo.EquipGroupInfoVO;
 import com.persagy.apm.alarmservice.group.management.model.group.vo.GroupTreeVO;
 import com.persagy.apm.alarmservice.group.management.service.GroupManagementService;
 import com.persagy.apm.common.context.poems.PoemsContext;
@@ -69,8 +68,8 @@ public class GroupManagementServiceImpl implements GroupManagementService {
     private int maxSearchCount;
 
     @Override
-    public PageList<GroupManagementVo> equipsQuery(GroupManagementDTO managementDTO) {
-        List<GroupManagementVo> groupManagementVoList = new ArrayList<>();
+    public PageList<EquipItem> equipsQuery(QueryEquipDTO managementDTO) {
+        List<EquipItem> equipListItemList = new ArrayList<>();
         BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
         queryBuilder.must(QueryBuilders.matchQuery("group_code", PoemsContext.getContext().getGroupCode()));
         queryBuilder.must(QueryBuilders.matchQuery("class_code", managementDTO.getClassCode()));
@@ -89,7 +88,7 @@ public class GroupManagementServiceImpl implements GroupManagementService {
         queryBuilder.must(QueryBuilders.termQuery("valid", INTEGER_ONE));
         SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();
         sourceBuilder.query(queryBuilder);
-        sourceBuilder.from((Math.max(managementDTO.getCurrent(), INTEGER_ONE) - INTEGER_ONE)
+        sourceBuilder.from((Math.max(managementDTO.getPage(), INTEGER_ONE) - INTEGER_ONE)
                 * managementDTO.getSize());
         sourceBuilder.size(managementDTO.getSize());
         sourceBuilder.sort("create_time", SortOrder.DESC);
@@ -102,23 +101,23 @@ public class GroupManagementServiceImpl implements GroupManagementService {
                 SearchHits hits = searchResponse.getHits();
                 for (SearchHit hit : hits) {
                     // 将 JSON 转换成对象
-                    GroupManagementVo managementVo = JSON.parseObject(hit.getSourceAsString(), GroupManagementVo.class);
-                    groupManagementVoList.add(managementVo);
+                    EquipItem managementVo = JSON.parseObject(hit.getSourceAsString(), EquipItem.class);
+                    equipListItemList.add(managementVo);
                 }
             }
-            return new PageList<>(groupManagementVoList, searchResponse.getHits().getTotalHits().value);
+            return new PageList<>(equipListItemList, searchResponse.getHits().getTotalHits().value);
         } catch (IOException e) {
             throw new RuntimeException("es查询出错", e);
         }
     }
 
     @Override
-    public GroupManagementVo equipsGet(String id) {
+    public EquipItem equipGet(String id) {
         String equipStr = findEquipById(id);
         if (StringUtils.isEmpty(equipStr)) {
             throw new RuntimeException("id为" + id + "的设备不存在");
         }
-        return JSONObject.parseObject(equipStr, GroupManagementVo.class);
+        return JSONObject.parseObject(equipStr, EquipItem.class);
     }
 
     /**
@@ -148,11 +147,11 @@ public class GroupManagementServiceImpl implements GroupManagementService {
      * @author lixing
      * @version V1.0 2021/9/20 1:15 下午
      */
-    private List<GroupManagement> findEquipsByIds(List<String> ids) {
+    private List<EquipItem> findEquipsByIds(List<String> ids) {
         if (CollectionUtils.isEmpty(ids) || ids.size() > 100) {
             throw new RuntimeException("批量查询的数据过短或过长");
         }
-        List<GroupManagement> managementList = new ArrayList<>();
+        List<EquipItem> managementList = new ArrayList<>();
         BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
         queryBuilder.must(QueryBuilders.termsQuery("id.keyword", ids));
         SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();
@@ -169,7 +168,7 @@ public class GroupManagementServiceImpl implements GroupManagementService {
                 SearchHits hits = searchResponse.getHits();
                 for (SearchHit hit : hits) {
                     // 将 JSON 转换成对象
-                    GroupManagement management = JSON.parseObject(hit.getSourceAsString(), GroupManagement.class);
+                    EquipItem management = JSON.parseObject(hit.getSourceAsString(), EquipItem.class);
                     managementList.add(management);
                 }
             }
@@ -180,19 +179,19 @@ public class GroupManagementServiceImpl implements GroupManagementService {
     }
 
     @Override
-    public Map<String, GroupManagement> queryEquipsByIds(List<String> ids) {
+    public Map<String, EquipItem> queryEquipsByIds(List<String> ids) {
         if (CollectionUtils.isEmpty(ids)) {
             return new HashMap<>();
         }
-        Map<String, GroupManagement> resultMap = new HashMap<>(ids.size());
+        Map<String, EquipItem> resultMap = new HashMap<>(ids.size());
         List<List<String>> partitions = Lists.partition(ids, 100);
         for (List<String> partition : partitions) {
-            List<GroupManagement> equipsByIds = findEquipsByIds(ids);
+            List<EquipItem> equipsByIds = findEquipsByIds(ids);
             if (CollectionUtils.isEmpty(equipsByIds)) {
                 continue;
             }
-            Map<String, GroupManagement> partitionMap = equipsByIds.stream().collect(Collectors.toMap(
-                    GroupManagement::getId, equip -> equip, (k1, k2) -> k1
+            Map<String, EquipItem> partitionMap = equipsByIds.stream().collect(Collectors.toMap(
+                    EquipItem::getId, equip -> equip, (k1, k2) -> k1
             ));
             resultMap.putAll(partitionMap);
         }
@@ -200,32 +199,32 @@ public class GroupManagementServiceImpl implements GroupManagementService {
     }
 
     @Override
-    public List<GroupTreeInfoVO> equipsGroupQuery(List<String> ids) {
-        List<GroupTreeInfoVO> groupTreeInfoVOList = Lists.newArrayList();
-        List<GroupManagement> groupManagementList = findEquipsByIds(ids);
-        for(GroupManagement management:groupManagementList) {
-            if(StringUtils.isEmpty(management.getInfos())){
-                return groupTreeInfoVOList;
+    public List<EquipGroupInfoVO> equipGroupQuery(List<String> ids) {
+        List<EquipGroupInfoVO> equipGroupInfoVOList = Lists.newArrayList();
+        List<EquipItem> equipItemList = findEquipsByIds(ids);
+        for(EquipItem equipItem: equipItemList) {
+            if(StringUtils.isEmpty(equipItem.getInfos())){
+                return equipGroupInfoVOList;
             }
-            String infos = management.getInfos().replace(DELIM_START, "")
-                    .replace(DELIM_END, "").replace("\"", "")
-                    .replace(BACKSLASH, "").replace(" ", "")
-                    .trim();
-            if (StringUtils.isEmpty(infos)) {
-                return groupTreeInfoVOList;
+            JSONObject jsonObject = JSONObject.parseObject(equipItem.getInfos());
+            Map<String, String> equipFuncMap = new HashMap<>();
+            if (jsonObject != null) {
+                for (String key : jsonObject.keySet()) {
+                    String funcInfo = key + ":" + jsonObject.get(key).toString();
+                    equipFuncMap.put(funcInfo, funcInfo);
+                }
             }
-            //将infos字段整个给转为map,后续匹配的时候时间复杂度为1。
-            Map<String, String> infoMap = Arrays.stream(infos.split(COMMA))
-                    .collect(Collectors.toMap(key-> key, value->value, (e1, e2) -> e1));
             //获取分组树
             List<GroupTreeVO> groupTreeVOList = getGroupTree();
-            GroupTreeInfoVO infoVO = new GroupTreeInfoVO();
+            EquipGroupInfoVO equipGroupInfoVO = new EquipGroupInfoVO();
+            equipGroupInfoVO.setEquipId(equipItem.getId());
+            equipGroupInfoVO.setClassCode(equipItem.getClassCode());
             if(CollectionUtils.isEmpty(groupTreeVOList)){
-                return groupTreeInfoVOList;
+                return equipGroupInfoVOList;
             }
-            groupTreeInfoVOList.add(queryGroupName(groupTreeVOList,infoVO,infoMap,management.getId()));
+            equipGroupInfoVOList.add(cascadeSearchGroupInfo(groupTreeVOList,equipGroupInfoVO,equipFuncMap));
         }
-        return groupTreeInfoVOList;
+        return equipGroupInfoVOList;
     }
 
     @Override
@@ -238,13 +237,13 @@ public class GroupManagementServiceImpl implements GroupManagementService {
         // 每次查询100条
         List<List<String>> partitions = Lists.partition(objIds, 100);
         for (List<String> partition : partitions) {
-            List<GroupTreeInfoVO> groupTreeInfoList = equipsGroupQuery(partition);
+            List<EquipGroupInfoVO> groupTreeInfoList = equipGroupQuery(partition);
             if (CollectionUtils.isEmpty(groupTreeInfoList)) {
                 continue;
             }
             Map<String, SimpleObjVO> partitionMap = groupTreeInfoList.stream().collect(Collectors.toMap(
-                    GroupTreeInfoVO::getEquipId,
-                    groupTreeInfoVO -> new SimpleObjVO(groupTreeInfoVO.getId(), groupTreeInfoVO.getName()),
+                    EquipGroupInfoVO::getEquipId,
+                    equipGroupInfoVO -> new SimpleObjVO(equipGroupInfoVO.getId(), equipGroupInfoVO.getName()),
                     (k1, k2) -> k1
             ));
             resultMap.putAll(partitionMap);
@@ -254,34 +253,39 @@ public class GroupManagementServiceImpl implements GroupManagementService {
     }
 
     /**
-     * 递归匹配condition
+     * 递归查询设备的分组信息
+     * 遍历分组树,如果设备的信息点中包含分组的分组条件,同时设备的设备类编码与分组设备类编码匹配时,代表设备属于这个分组
      *
-     * @param groupTreeVOList
-     * @param infoVO
-     * @param infoMap
-     * @param equipId
-     * @return com.persagy.apm.alarmservice.group.management.model.vo.GroupTreeInfoVO
+     * @param groupTreeVOList 分组树节点列表
+     * @param equipGroupInfoVO 设备和所在分组信息(初始化时包含设备id和设备类编码)
+     * @param equipFuncMap "设备信息点:信息点取值" -> "设备信息点:信息点取值",
+     * @return 设备和所在分组信息(补充完成分组信息)
      * @author 易涛
      * @date 2021/9/10 11:24
      */
-    private GroupTreeInfoVO queryGroupName(
-            List<GroupTreeVO> groupTreeVOList, GroupTreeInfoVO infoVO,
-            Map<String, String> infoMap, String equipId) {
+    private EquipGroupInfoVO cascadeSearchGroupInfo(
+            List<GroupTreeVO> groupTreeVOList, EquipGroupInfoVO equipGroupInfoVO,
+            Map<String, String> equipFuncMap) {
+        if (StringUtils.isBlank(equipGroupInfoVO.getClassCode())) {
+            throw new IllegalArgumentException("要查询的设备没有设备类信息");
+        }
         for (GroupTreeVO groupTreeVO : groupTreeVOList) {
-            if (StringUtils.isNotEmpty(infoVO.getId())) {
-                return infoVO;
+            if (!equipGroupInfoVO.getClassCode().equals(groupTreeVO.getClassCode())) {
+                continue;
             }
-            //排除掉配置的时候存在不小心放入空格的情况
-            if (infoMap.containsKey(groupTreeVO.getCondition().replace(" ", ""))) {
-                BeanUtils.copyProperties(groupTreeVO, infoVO);
-                infoVO.setEquipId(equipId);
-                return infoVO;
+            // 分组条件 排除掉配置的时候存在不小心放入空格的情况
+            String groupCondition = groupTreeVO.getCondition().replace(" ", "");
+            // 分组条件为空或设备信息点中包含分组条件
+            if (StringUtils.isBlank(groupCondition) || equipFuncMap.containsKey(groupCondition)) {
+                BeanUtils.copyProperties(groupTreeVO, equipGroupInfoVO);
+                return equipGroupInfoVO;
             }
+
             if (CollectionUtils.isNotEmpty(groupTreeVO.getChildren())) {
-                queryGroupName(groupTreeVO.getChildren(), infoVO, infoMap, equipId);
+                cascadeSearchGroupInfo(groupTreeVO.getChildren(), equipGroupInfoVO, equipFuncMap);
             }
         }
-        return infoVO;
+        return equipGroupInfoVO;
     }
 
     /**
@@ -321,24 +325,24 @@ public class GroupManagementServiceImpl implements GroupManagementService {
     }
 
     @Override
-    public List<GroupManagementVo> getEquipList(String condition, String classCode) {
-        GroupManagementDTO managementDTO = new GroupManagementDTO();
+    public List<EquipItem> getEquipList(String condition, String classCode) {
+        QueryEquipDTO managementDTO = new QueryEquipDTO();
         managementDTO.setClassCode(classCode);
         managementDTO.setCondition(condition);
         return getEquipList(managementDTO);
     }
 
     @Override
-    public List<GroupManagementVo> getEquipList(GroupManagementDTO groupManagementDTO) {
-        groupManagementDTO.setCurrent(INTEGER_ONE);
-        groupManagementDTO.setSize(maxSearchCount);
-        PageList<GroupManagementVo> groupManagementVoPageList = this.equipsQuery(groupManagementDTO);
+    public List<EquipItem> getEquipList(QueryEquipDTO queryEquipDTO) {
+        queryEquipDTO.setPage(INTEGER_ONE);
+        queryEquipDTO.setSize(maxSearchCount);
+        PageList<EquipItem> groupManagementVoPageList = this.equipsQuery(queryEquipDTO);
         return groupManagementVoPageList.getRecords();
     }
 
     @Override
-    public GroupTreeDetailVO getGroup(String id) {
-        return queryById(getGroupTree(), new GroupTreeDetailVO(), id);
+    public GroupInfoVO getGroup(String id) {
+        return queryById(getGroupTree(), new GroupInfoVO(), id);
     }
 
     /**
@@ -350,31 +354,31 @@ public class GroupManagementServiceImpl implements GroupManagementService {
      * @author 易涛
      * @date 2021/9/8 14:50
      */
-    private GroupTreeDetailVO queryById(List<GroupTreeVO> groupTreeVOList, GroupTreeDetailVO groupTreeDetailVO, String id) {
+    private GroupInfoVO queryById(List<GroupTreeVO> groupTreeVOList, GroupInfoVO groupInfoVO, String id) {
         if (CollectionUtils.isEmpty(groupTreeVOList)) {
             return null;
         }
         for (GroupTreeVO groupTreeVO : groupTreeVOList) {
-            if (StringUtils.isNotEmpty(groupTreeDetailVO.getId())) {
-                return groupTreeDetailVO;
+            if (StringUtils.isNotEmpty(groupInfoVO.getId())) {
+                return groupInfoVO;
             }
             if (Objects.equals(groupTreeVO.getId(), id)) {
-                BeanUtils.copyProperties(groupTreeVO, groupTreeDetailVO);
-                return groupTreeDetailVO;
+                BeanUtils.copyProperties(groupTreeVO, groupInfoVO);
+                return groupInfoVO;
             }
             if (CollectionUtils.isNotEmpty(groupTreeVO.getChildren())) {
-                queryById(groupTreeVO.getChildren(), groupTreeDetailVO, id);
+                queryById(groupTreeVO.getChildren(), groupInfoVO, id);
             }
         }
-        return groupTreeDetailVO;
+        return groupInfoVO;
     }
 
     @Override
-    public List<GroupTreeDetailVO> queryAllLeafGroups() {
+    public List<GroupInfoVO> queryAllLeafGroups() {
         // 遍历分组树,获取最末级节点
         List<GroupTreeVO> groupTree = getGroupTree();
 
-        List<GroupTreeDetailVO> result = new ArrayList<>();
+        List<GroupInfoVO> result = new ArrayList<>();
         cascadeGetLeafGroup(groupTree, result);
         return result;
     }
@@ -387,7 +391,7 @@ public class GroupManagementServiceImpl implements GroupManagementService {
      * @author lixing
      * @version V1.0 2021/9/19 1:37 下午
      */
-    private void cascadeGetLeafGroup(List<GroupTreeVO> groupTree, List<GroupTreeDetailVO> result) {
+    private void cascadeGetLeafGroup(List<GroupTreeVO> groupTree, List<GroupInfoVO> result) {
         if (CollectionUtils.isEmpty(groupTree)) {
             return;
         }

+ 3 - 2
src/main/java/com/persagy/apm/alarmservice/project/alarmrule/service/impl/ProjectAlarmRuleServiceImpl.java

@@ -9,7 +9,8 @@ import com.persagy.apm.alarmservice.group.alarmrule.model.GroupAlarmRule;
 import com.persagy.apm.alarmservice.group.alarmrule.model.dto.AddGroupAlarmRuleDTO;
 import com.persagy.apm.alarmservice.group.alarmrule.model.dto.QueryGroupAlarmRuleDTO;
 import com.persagy.apm.alarmservice.group.alarmrule.service.IGroupAlarmRuleService;
-import com.persagy.apm.alarmservice.group.management.model.equip.vo.GroupManagementVo;
+import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipItem;
+import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipListItem;
 import com.persagy.apm.alarmservice.group.management.service.impl.GroupManagementServiceImpl;
 import com.persagy.apm.alarmservice.project.alarmcondition.service.IAlarmConditionService;
 import com.persagy.apm.alarmservice.project.alarmrule.dao.ProjectAlarmRuleMapper;
@@ -316,7 +317,7 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
     public List<AddProjectAlarmRuleObjRelDTO> addProjectAlarmRules(AddGroupAlarmRuleDTO addGroupAlarmRuleDTO) {
         String condition = addGroupAlarmRuleDTO.getCondition();
         String classCode = addGroupAlarmRuleDTO.getClassCode();
-        List<GroupManagementVo> records = groupManagementService.getEquipList(condition,classCode);
+        List<EquipItem> records = groupManagementService.getEquipList(condition,classCode);
         //查询所有项目
         List<ProjectVO> projects = this.getProject();
         //遍历项目,组好对象进行插入

+ 14 - 13
src/main/java/com/persagy/apm/alarmservice/project/monitorindicatorconfig/service/impl/ProjectMonitorIndicatorConfigServiceImpl.java

@@ -7,8 +7,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.persagy.apm.alarmservice.group.calculatemethod.model.CalculateMethod;
 import com.persagy.apm.alarmservice.group.calculatemethod.model.dto.QueryCalculateMethodDTO;
 import com.persagy.apm.alarmservice.group.calculatemethod.service.ICalculateMethodService;
-import com.persagy.apm.alarmservice.group.management.model.equip.dto.GroupManagementDTO;
-import com.persagy.apm.alarmservice.group.management.model.equip.vo.GroupManagementVo;
+import com.persagy.apm.alarmservice.group.management.model.equip.dto.QueryEquipDTO;
+import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipItem;
+import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipListItem;
 import com.persagy.apm.alarmservice.group.management.service.GroupManagementService;
 import com.persagy.apm.alarmservice.group.monitorindicator.model.MonitorIndicator;
 import com.persagy.apm.alarmservice.group.monitorindicator.model.dto.QueryMonitorIndicatorDTO;
@@ -235,13 +236,13 @@ public class ProjectMonitorIndicatorConfigServiceImpl extends ServiceImpl<Projec
                 Collator.getInstance(java.util.Locale.CHINA))).collect(Collectors.toList());
 
         // 查询分组下的监测对象, 查询条件:设备类+分组条件+项目id+设备名称(模糊)
-        List<GroupManagementVo> objList = queryEquipList(pageQueryProjectMonitorIndicatorConfigDTO);
+        List<EquipItem> objList = queryEquipList(pageQueryProjectMonitorIndicatorConfigDTO);
         if (CollectionUtils.isEmpty(objList)) {
             return result;
         }
 
         // 监测对象按名称排序
-        objList = objList.stream().sorted(Comparator.comparing(GroupManagementVo::getLocalName,
+        objList = objList.stream().sorted(Comparator.comparing(EquipItem::getLocalName,
                 Collator.getInstance(java.util.Locale.CHINA))).collect(Collectors.toList());
 
         // 监测对象+设备组合成返回结果。因为数据量太大,结果中不含计算方式,在分页后再添加计算方式
@@ -309,10 +310,10 @@ public class ProjectMonitorIndicatorConfigServiceImpl extends ServiceImpl<Projec
      * @version V1.0 2021/9/17 9:27 下午
      */
     private List<ProjectMonitorIndicatorConfigListItemVO> combineResult(
-            List<MonitorIndicator> monitorIndicators, List<GroupManagementVo> objList) {
+            List<MonitorIndicator> monitorIndicators, List<EquipItem> objList) {
         List<ProjectMonitorIndicatorConfigListItemVO> recordList = new ArrayList<>();
         for (MonitorIndicator monitorIndicator : monitorIndicators) {
-            for (GroupManagementVo obj : objList) {
+            for (EquipItem obj : objList) {
                 ProjectMonitorIndicatorConfigListItemVO projectMonitorIndicatorConfigListItemVO =
                         new ProjectMonitorIndicatorConfigListItemVO();
                 projectMonitorIndicatorConfigListItemVO.setObj(new SimpleObjVO(obj.getId(), obj.getLocalName()));
@@ -332,14 +333,14 @@ public class ProjectMonitorIndicatorConfigServiceImpl extends ServiceImpl<Projec
      * @author lixing
      * @version V1.0 2021/9/17 9:03 下午
      */
-    private List<GroupManagementVo> queryEquipList(PageQueryProjectMonitorIndicatorConfigDTO pageQueryProjectMonitorIndicatorConfigDTO) {
+    private List<EquipItem> queryEquipList(PageQueryProjectMonitorIndicatorConfigDTO pageQueryProjectMonitorIndicatorConfigDTO) {
         String projectId = PoemsContext.getContext().getProjectId();
-        GroupManagementDTO groupManagementDTO = new GroupManagementDTO();
-        groupManagementDTO.setClassCode(pageQueryProjectMonitorIndicatorConfigDTO.getClassCode());
-        groupManagementDTO.setCondition(pageQueryProjectMonitorIndicatorConfigDTO.getCondition());
-        groupManagementDTO.setProjectId(projectId);
-        groupManagementDTO.setLocalName(pageQueryProjectMonitorIndicatorConfigDTO.getObjName());
-        return groupManagementService.getEquipList(groupManagementDTO);
+        QueryEquipDTO queryEquipDTO = new QueryEquipDTO();
+        queryEquipDTO.setClassCode(pageQueryProjectMonitorIndicatorConfigDTO.getClassCode());
+        queryEquipDTO.setCondition(pageQueryProjectMonitorIndicatorConfigDTO.getCondition());
+        queryEquipDTO.setProjectId(projectId);
+        queryEquipDTO.setLocalName(pageQueryProjectMonitorIndicatorConfigDTO.getObjName());
+        return groupManagementService.getEquipList(queryEquipDTO);
     }
 
     /**

+ 7 - 0
src/main/resources/bootstrap.yml

@@ -46,3 +46,10 @@ integrated:
       name: lixing
     # 只展示com.persagy包下的接口
     basePackage: "com.persagy"
+
+feign:
+  compression:
+    request:
+      enabled: false
+    response:
+      enabled: false