diff --git a/detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java b/detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java index 27b2046c..10682c18 100644 --- a/detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java +++ b/detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java @@ -193,7 +193,7 @@ public class AdPlanController extends BaseController { } @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD) - @GetMapping("/analyse") + @PostMapping("/analyse") @ApiOperation("检测数据分析") @ApiImplicitParam(name = "planId", value = "检测计划id", required = true) public void analyse(String planId) { diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTreeController.java b/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTreeController.java index 010294a2..73f9cb91 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTreeController.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTreeController.java @@ -43,13 +43,24 @@ public class DictTreeController extends BaseController { private final IDictTreeService dictTreeService; @OperateInfo(info = LogEnum.SYSTEM_COMMON) - @GetMapping("/getTree") - @ApiOperation("按照名称模糊查询字典树") + @GetMapping("/getTreeByCode") + @ApiOperation("按照code查询字典树") @ApiImplicitParam(name = "keyword", value = "查询参数", required = true) - public HttpResult> getDictTreeByKeyword(@RequestParam String keyword) { - String methodDescribe = getMethodDescribe("getDictTreeByKeyword"); - LogUtil.njcnDebug(log, "{},查询数据为:{}", methodDescribe, keyword); - List result = dictTreeService.getDictTreeByKeyword(keyword); + public HttpResult> getTreeByCode(@RequestParam("code") String code) { + String methodDescribe = getMethodDescribe("getTreeByCode"); + LogUtil.njcnDebug(log, "{},查询数据为:{}", methodDescribe, code); + List result = dictTreeService.getTreeByCode(code); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @GetMapping("/getTreeByName") + @ApiOperation("按照name模糊查询字典树") + @ApiImplicitParam(name = "keyword", value = "查询参数", required = true) + public HttpResult> getTreeByName(@RequestParam("name") String name) { + String methodDescribe = getMethodDescribe("getTreeByName"); + LogUtil.njcnDebug(log, "{},查询数据为:{}", methodDescribe, name); + List result = dictTreeService.getTreeByName(name); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/service/IDictTreeService.java b/system/src/main/java/com/njcn/gather/system/dictionary/service/IDictTreeService.java index f09ca809..1518cada 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/service/IDictTreeService.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/service/IDictTreeService.java @@ -21,12 +21,20 @@ public interface IDictTreeService extends IService { //void refreshDictTreeCache(); /** - * 根据关键字查询字典树 + * 根据code查询字典树 * - * @param keyword 关键字 + * @param code 编码 * @return 字典树 */ - List getDictTreeByKeyword(String keyword); + List getTreeByCode(String code); + + /** + * 根据name查询字典树 + * + * @param name 编码 + * @return 字典树 + */ + List getTreeByName(String name); boolean addDictTree(DictTreeParam dictTreeParam); diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTreeServiceImpl.java b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTreeServiceImpl.java index d4bf6c40..095d9913 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTreeServiceImpl.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTreeServiceImpl.java @@ -45,9 +45,24 @@ public class DictTreeServiceImpl extends ServiceImpl i // } @Override - public List getDictTreeByKeyword(String keyword) { + public List getTreeByCode(String code) { List dictTree = this.queryTree(); - this.filterTreeByName(dictTree, keyword); + + if (ObjectUtil.isNotEmpty(dictTree)) { + dictTree = dictTree.stream().filter(item -> item.getCode().equals(code)).collect(Collectors.toList()); + } + + //this.filterTreeByName(dictTree, keyword); + return dictTree; + } + + @Override + public List getTreeByName(String name) { + List dictTree = this.queryTree(); + + if (ObjectUtil.isNotEmpty(dictTree)) { + dictTree = dictTree.stream().filter(item -> item.getName().contains(name)).collect(Collectors.toList()); + } return dictTree; } @@ -160,7 +175,7 @@ public class DictTreeServiceImpl extends ServiceImpl i @Override public List getDictTreeById(List ids) { return this.list(new LambdaQueryWrapper() - .in(CollUtil.isNotEmpty(ids), DictTree::getId,ids) + .in(CollUtil.isNotEmpty(ids), DictTree::getId, ids) ); } @@ -171,18 +186,18 @@ public class DictTreeServiceImpl extends ServiceImpl i // return this.list(lambdaQueryWrapper); // } -// @Override + // @Override // public List queryAllByType(Integer type) { // LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); // lambdaQueryWrapper.eq(DictTree::getState, DictConst.ENABLE).eq(DictTree::getType, type); // return this.list(lambdaQueryWrapper); // } - private void checkRepeat(DictTreeParam dictTreeParam,boolean isExcludeSelf){ + private void checkRepeat(DictTreeParam dictTreeParam, boolean isExcludeSelf) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(DictTree::getCode, dictTreeParam.getCode()) - .eq(DictTree::getState, DictConst.ENABLE); - if(isExcludeSelf){ - if(dictTreeParam instanceof DictTreeParam.UpdateParam){ + .eq(DictTree::getState, DictConst.ENABLE); + if (isExcludeSelf) { + if (dictTreeParam instanceof DictTreeParam.UpdateParam) { wrapper.ne(DictTree::getId, ((DictTreeParam.UpdateParam) dictTreeParam).getId()); } }