k94314517
2025-04-18 aef13c72540c16bc38a70d366fe7005489b6673e
server/src/main/java/com/doumee/api/web/WebCategoryController.java
@@ -38,11 +38,26 @@
    @LoginRequired
    @GetMapping("/categoryTree")
    @ApiOperation("获取分类类别获取分类树")
    public ApiResponse<List<CategoryVO>> categoryVOTree(Integer categoryType, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange){
    public ApiResponse<List<CategoryVO>> categoryVOTree(@RequestParam String categoryType,Integer categoryId, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token){
        try {
            ServerHttpRequest request = serverWebExchange.getRequest();
            jwtTokenUtil.getUserInfoByToken(token);
            return ApiResponse.success(categoryService.getCategoryVOTree(categoryType));
            return ApiResponse.success(categoryService.getCategoryVOTree(categoryType,categoryId));
        }catch (BusinessException e){
            return ApiResponse.failed(e.getCode(),e.getMessage());
        }catch (Exception e){
            return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
        }
    }
    @LoginRequired
    @GetMapping("/getCategoryVOForGCXTree")
    @ApiOperation("获取分类类别获取分类树 - 观察项")
    public ApiResponse<List<CategoryVO>> getCategoryVOForGCXTree(@RequestParam Integer categoryId, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token){
        try {
            jwtTokenUtil.getUserInfoByToken(token);
            return ApiResponse.success(categoryService.getCategoryVOForGCXTree(categoryId));
        }catch (BusinessException e){
            return ApiResponse.failed(e.getCode(),e.getMessage());
        }catch (Exception e){
@@ -54,11 +69,10 @@
    @LoginRequired
    @GetMapping("/categoryList")
    @ApiOperation("获取分类类别获取分类列表")
    public ApiResponse<List<CategoryVO>> categoryList(Integer categoryType, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange){
    public ApiResponse<List<CategoryVO>> categoryList(Integer categoryType,Integer isRoot ,@RequestHeader(JwtTokenUtil.HEADER_KEY) String token){
        try {
            ServerHttpRequest request = serverWebExchange.getRequest();
            jwtTokenUtil.getUserInfoByToken(token);
            return ApiResponse.success(categoryService.getCategoryVOList(categoryType));
            return ApiResponse.success(categoryService.getCategoryVOList(categoryType,isRoot));
        }catch (BusinessException e){
            return ApiResponse.failed(e.getCode(),e.getMessage());
        }catch (Exception e){