Преглед изворни кода

新增根据项目id查询设备

易涛 пре 3 година
родитељ
комит
ee57d8e24e

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

@@ -68,6 +68,10 @@ public class GroupManagementServiceImpl implements GroupManagementService {
         BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
         queryBuilder.must(QueryBuilders.matchQuery("class_code",managementDTO.getClassCode()));
         queryBuilder.must(QueryBuilders.matchPhraseQuery("infos",managementDTO.getCondition()));
+        //新增根据项目id查询设备
+        if(StringUtils.isNotEmpty(managementDTO.getProjectId())){
+            queryBuilder.must(QueryBuilders.termsQuery("project_id",managementDTO.getProjectId()));
+        }
         //模糊查询使用
         if(StringUtils.isNotEmpty(managementDTO.getLocalName())) {
             queryBuilder.must(QueryBuilders.matchQuery("local_name", managementDTO.getLocalName())

+ 3 - 0
src/main/java/com/persagy/apm/model/dto/GroupManagementDTO.java

@@ -15,6 +15,9 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class GroupManagementDTO{
 
+    @ApiModelProperty("项目id")
+    private String projectId;
+
     @ApiModelProperty("设备名称")
     private String localName;