Просмотр исходного кода

fix(backend): 代码规范修复 — @Autowired→@Resource + Result<T>泛型补全

Wave 3 fixes:
- AdminGuideController: 3处@Autowired替换为@Resource,移除Autowired import
- VendorService: 3个方法补全Result<T>泛型参数
- VendorController: 同步补全Result<T>泛型参数
Xiaogang Liao 2 месяцев назад
Родитель
Сommit
1e2051735a

+ 4 - 4
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminGuideController.java

@@ -7,22 +7,22 @@ import com.etotem.cfc.entity.GuidePackage;
 import com.etotem.cfc.service.GuideApplicationService;
 import com.etotem.cfc.service.GuideApplicationService;
 import com.etotem.cfc.service.GuidePackageService;
 import com.etotem.cfc.service.GuidePackageService;
 import com.etotem.cfc.service.GuideService;
 import com.etotem.cfc.service.GuideService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.List;
 
 
 @RestController
 @RestController
 @RequestMapping("/api/admin/guide")
 @RequestMapping("/api/admin/guide")
 public class AdminGuideController {
 public class AdminGuideController {
 
 
-    @Autowired
+    @Resource
     private GuideApplicationService guideApplicationService;
     private GuideApplicationService guideApplicationService;
 
 
-    @Autowired
+    @Resource
     private GuideService guideService;
     private GuideService guideService;
 
 
-    @Autowired
+    @Resource
     private GuidePackageService guidePackageService;
     private GuidePackageService guidePackageService;
 
 
     @PostMapping("/applications/pending")
     @PostMapping("/applications/pending")

+ 3 - 3
cfc-backend/src/main/java/com/etotem/cfc/controller/vendor/VendorController.java

@@ -19,7 +19,7 @@ public class VendorController {
     private VendorService vendorService;
     private VendorService vendorService;
 
 
     @PostMapping("/apply")
     @PostMapping("/apply")
-    public Result apply(@RequestBody Map<String, Object> params,
+    public Result<String> apply(@RequestBody Map<String, Object> params,
                         @RequestAttribute("userId") Long userId) {
                         @RequestAttribute("userId") Long userId) {
         String vendorType = (String) params.get("vendorType");
         String vendorType = (String) params.get("vendorType");
         String vendorInfo = (String) params.getOrDefault("vendorInfo", "");
         String vendorInfo = (String) params.getOrDefault("vendorInfo", "");
@@ -27,12 +27,12 @@ public class VendorController {
     }
     }
 
 
     @PostMapping("/status")
     @PostMapping("/status")
-    public Result getStatus(@RequestAttribute("userId") Long userId) {
+    public Result<Map<String, Object>> getStatus(@RequestAttribute("userId") Long userId) {
         return vendorService.getStatus(userId);
         return vendorService.getStatus(userId);
     }
     }
 
 
     @PostMapping("/info")
     @PostMapping("/info")
-    public Result getVendorInfo(@RequestAttribute("userId") Long userId) {
+    public Result<Map<String, Object>> getVendorInfo(@RequestAttribute("userId") Long userId) {
         return vendorService.getVendorInfo(userId);
         return vendorService.getVendorInfo(userId);
     }
     }
 }
 }

+ 3 - 3
cfc-backend/src/main/java/com/etotem/cfc/service/VendorService.java

@@ -16,7 +16,7 @@ public class VendorService {
     @Resource
     @Resource
     private UserMapper userMapper;
     private UserMapper userMapper;
 
 
-    public Result apply(Long userId, String vendorType, String vendorInfo) {
+    public Result<String> apply(Long userId, String vendorType, String vendorInfo) {
         User user = userMapper.selectById(userId);
         User user = userMapper.selectById(userId);
         if (user == null) {
         if (user == null) {
             return Result.error("用户不存在");
             return Result.error("用户不存在");
@@ -43,7 +43,7 @@ public class VendorService {
         return Result.success("入驻申请已提交,请等待审核");
         return Result.success("入驻申请已提交,请等待审核");
     }
     }
 
 
-    public Result getStatus(Long userId) {
+    public Result<Map<String, Object>> getStatus(Long userId) {
         User user = userMapper.selectById(userId);
         User user = userMapper.selectById(userId);
         if (user == null) {
         if (user == null) {
             return Result.error("用户不存在");
             return Result.error("用户不存在");
@@ -55,7 +55,7 @@ public class VendorService {
         return Result.success(data);
         return Result.success(data);
     }
     }
 
 
-    public Result getVendorInfo(Long userId) {
+    public Result<Map<String, Object>> getVendorInfo(Long userId) {
         User user = userMapper.selectById(userId);
         User user = userMapper.selectById(userId);
         if (user == null) {
         if (user == null) {
             return Result.error("用户不存在");
             return Result.error("用户不存在");