From 30e858fa504b268b9b436afca0a1259cf6e8c488 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 19 八月 2025 11:01:40 +0800
Subject: [PATCH] 优化

---
 server/src/main/java/com/doumee/api/web/WebCategoryController.java |   42 ++++++++++++++++++++++++++++++++++++------
 1 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/server/src/main/java/com/doumee/api/web/WebCategoryController.java b/server/src/main/java/com/doumee/api/web/WebCategoryController.java
index cd9a67e..3880c8b 100644
--- a/server/src/main/java/com/doumee/api/web/WebCategoryController.java
+++ b/server/src/main/java/com/doumee/api/web/WebCategoryController.java
@@ -1,6 +1,8 @@
 package com.doumee.api.web;
 
 import com.doumee.config.Jwt.JwtTokenUtil;
+import com.doumee.config.annotation.EncryptionReq;
+import com.doumee.config.annotation.EncryptionResp;
 import com.doumee.config.annotation.LoginRequired;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
@@ -38,11 +40,30 @@
     @LoginRequired
     @GetMapping("/categoryTree")
     @ApiOperation("鑾峰彇鍒嗙被绫诲埆鑾峰彇鍒嗙被鏍�")
-    public ApiResponse<List<CategoryVO>> categoryVOTree(Integer categoryType, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange){
+    @EncryptionReq
+    @EncryptionResp
+    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("鑾峰彇鍒嗙被绫诲埆鑾峰彇鍒嗙被鏍� - 瑙傚療椤�")
+    @EncryptionReq
+    @EncryptionResp
+    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,15 +75,24 @@
     @LoginRequired
     @GetMapping("/categoryList")
     @ApiOperation("鑾峰彇鍒嗙被绫诲埆鑾峰彇鍒嗙被鍒楄〃")
-    public ApiResponse<List<CategoryVO>> categoryList(Integer categoryType, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange){
+    @EncryptionReq
+    @EncryptionResp
+    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){
             return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
         }
     }
+
+
+//    @GetMapping("/dealjson")
+//    @ApiOperation("dealjson")
+//    public ApiResponse dealjson(){
+//        categoryService.dealjson();
+//        return ApiResponse.success(null);
+//    }
 }

--
Gitblit v1.9.3