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

Merge remote-tracking branch 'origin/v1.0.0' into v1.0.0

xujiaheng пре 3 година
родитељ
комит
48358a4611

+ 1 - 2
src/main/java/com/persagy/apm/alarmservice/group/management/controller/GroupManagementController.java

@@ -54,8 +54,7 @@ public class GroupManagementController {
     public CommonResult<GroupTreeDetailVO> queryTreeById(@Valid @RequestBody EquipIdDTO equipIdDTO){
         List<GroupTreeVO> groupTreeVOList = getGroupTree();
         GroupTreeDetailVO groupTreeDetailVO = new GroupTreeDetailVO();
-        queryById(groupTreeVOList,groupTreeDetailVO,equipIdDTO.getId());
-        return ResultHelper.single(groupTreeDetailVO);
+        return ResultHelper.single(queryById(groupTreeVOList, groupTreeDetailVO, equipIdDTO.getId()));
     }
     
     /**

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

@@ -8,14 +8,13 @@ import com.persagy.apm.alarmservice.group.management.model.GroupManagement;
 import com.persagy.apm.alarmservice.group.management.model.vo.GroupTreeInfoVO;
 import com.persagy.apm.alarmservice.group.management.model.vo.GroupTreeVO;
 import com.persagy.apm.alarmservice.group.management.service.GroupManagementService;
-import com.persagy.apm.alarmservice.group.management.service.GroupManagementService;
 import com.persagy.apm.common.response.PageList;
 import com.persagy.apm.model.dto.GroupManagementDTO;
 import com.persagy.apm.model.vo.GroupManagementVo;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.A;
 import org.elasticsearch.action.get.GetRequest;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.search.SearchRequest;
@@ -56,6 +55,7 @@ import static org.apache.commons.lang3.math.NumberUtils.INTEGER_ZERO;
  * @version 1.0
  * @date 2021/9/8 14:18
  */
+@Slf4j
 @Service
 public class GroupManagementServiceImpl implements GroupManagementService {
 
@@ -232,11 +232,11 @@ public class GroupManagementServiceImpl implements GroupManagementService {
         DeleteByQueryRequest request = new DeleteByQueryRequest(INDEX_NAME);
         //逻辑删除的数据直接从index中删除掉
         request.setQuery(new TermQueryBuilder("valid", INTEGER_ZERO));
-        //每次最多删除一万条数据
-        request.setSize(10000);
+        //每次最多删除一万条数据,如果不加这个则处理所有的文档
+        request.setMaxDocs(10000);
         try {
             BulkByScrollResponse resp = client.deleteByQuery(request, RequestOptions.DEFAULT);
-            System.out.println(resp);
+            log.info("删除返回的数据为---{}",resp.toString());
         }catch (IOException e){
             throw new RuntimeException("删除elasticSearch失败",e);
         }