From 47d15d9b6fe1788488f631f2c6672a2be4ddaf88 Mon Sep 17 00:00:00 2001 From: gong <1157756119@qq.com> Date: Mon, 15 Dec 2025 15:06:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=20=20@AllArgsConstructor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/ConsGroupController.java | 6 +++--- .../controller/admin/ConsInfoController.java | 7 ++++--- .../admin/ConsStockFlowController.java | 16 ++++++++-------- .../controller/admin/ProdGroupController.java | 11 +++++++---- .../controller/admin/ProductController.java | 18 ++++++++++++------ .../admin/ShopProdCategoryController.java | 6 ++++-- .../admin/ShopProdSpecController.java | 6 ++++-- .../admin/ShopProdUnitController.java | 5 +++-- .../controller/admin/ShopVendorController.java | 7 ++++--- 9 files changed, 49 insertions(+), 33 deletions(-) diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsGroupController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsGroupController.java index 99893966f..7f8b22fb4 100644 --- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsGroupController.java +++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsGroupController.java @@ -13,7 +13,6 @@ import com.czg.validator.group.InsertGroup; import com.czg.validator.group.UpdateGroup; import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; -import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -26,11 +25,12 @@ import java.util.List; * @author Tankaikai tankaikai@aliyun.com * @since 1.0 2025-02-20 */ -@AllArgsConstructor @RestController @RequestMapping("/admin/product/consGroup") public class ConsGroupController { - private final ConsGroupService consGroupService; + + @Resource + private ConsGroupService consGroupService; @Resource private ShopSyncService shopSyncService; diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsInfoController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsInfoController.java index b4d56b90c..8ef7b3ab3 100644 --- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsInfoController.java +++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsInfoController.java @@ -18,7 +18,6 @@ import com.czg.validator.group.InsertGroup; import com.czg.validator.group.UpdateGroup; import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; -import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -31,11 +30,13 @@ import java.util.List; * @author Tankaikai tankaikai@aliyun.com * @since 1.0 2025-02-20 */ -@AllArgsConstructor @RestController @RequestMapping("/admin/product/cons") public class ConsInfoController { - private final ConsInfoService consInfoService; + + @Resource + private ConsInfoService consInfoService; + @Resource private ShopSyncService shopSyncService; diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java index bc4290871..f6799b85b 100644 --- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java +++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java @@ -16,11 +16,11 @@ import com.czg.utils.AssertUtil; import com.czg.validator.ValidatorUtil; import com.czg.validator.group.DefaultGroup; import com.mybatisflex.core.paginate.Page; -import lombok.AllArgsConstructor; +import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; -import java.io.IOException; import java.io.InputStream; +import java.net.URI; import java.net.URL; import java.util.List; @@ -31,20 +31,20 @@ import java.util.List; * @author Tankaikai tankaikai@aliyun.com * @since 1.0 2025-02-21 */ -@AllArgsConstructor @RestController @RequestMapping("/admin/product/stock") public class ConsStockFlowController { - private final ConsStockFlowService consStockFlowService; + + @Resource + private ConsStockFlowService consStockFlowService; /** * 入库单识别 - * @return - * @throws IOException */ @PostMapping("/ocr") - public CzgResult ocr(@RequestBody OcrDTO ocrDTO) throws IOException { - URL url = new URL(ocrDTO.getUrl()); + public CzgResult ocr(@RequestBody OcrDTO ocrDTO) throws Exception { + URI uri = new URI("https://example.com/path"); + URL url = uri.toURL(); InputStream stream = URLUtil.getStream(url); return CzgResult.success(consStockFlowService.ocr(FileUtil.getName(ocrDTO.getUrl()), stream)); } diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ProdGroupController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProdGroupController.java index bdd88e825..99d82299f 100644 --- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ProdGroupController.java +++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProdGroupController.java @@ -15,7 +15,6 @@ import com.czg.validator.group.InsertGroup; import com.czg.validator.group.UpdateGroup; import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; -import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -28,12 +27,16 @@ import java.util.List; * @author Tankaikai tankaikai@aliyun.com * @since 1.0 2025-02-17 */ -@AllArgsConstructor @RestController @RequestMapping("/admin/prod/group") public class ProdGroupController { - private final ProdGroupService prodGroupService; - private final RabbitPublisher rabbitPublisher; + + @Resource + private ProdGroupService prodGroupService; + + @Resource + private RabbitPublisher rabbitPublisher; + @Resource private ShopSyncService shopSyncService; diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java index 7614b2077..6d45a9452 100644 --- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java +++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java @@ -4,7 +4,6 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.thread.ThreadUtil; import com.czg.account.entity.ShopInfo; import com.czg.account.service.ShopInfoService; -import com.czg.annotation.SaStaffCheckPermission; import com.czg.config.RabbitPublisher; import com.czg.exception.CzgException; import com.czg.log.annotation.OperationLog; @@ -27,7 +26,6 @@ import com.czg.validator.group.InsertGroup; import com.czg.validator.group.UpdateGroup; import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; -import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -40,17 +38,25 @@ import java.util.List; * @author Tankaikai tankaikai@aliyun.com * @since 1.0 2025-02-16 */ -@AllArgsConstructor @RestController @RequestMapping("/admin/product") public class ProductController { - private final ProductService productService; - private final ProdConsRelationService prodConsRelationService; - private final RabbitPublisher rabbitPublisher; + + @Resource + private ProductService productService; + + @Resource + private ProdConsRelationService prodConsRelationService; + + @Resource + private RabbitPublisher rabbitPublisher; + @Resource private ShopSyncService shopSyncService; + @Resource private UProductService uProductService; + @Resource private ShopInfoService shopInfoService; diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdCategoryController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdCategoryController.java index d4019b030..44a281260 100644 --- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdCategoryController.java +++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdCategoryController.java @@ -26,11 +26,13 @@ import java.util.List; * @author Tankaikai tankaikai@aliyun.com * @since 1.0 2025-02-10 */ -@AllArgsConstructor @RestController @RequestMapping("/admin/prod/category") public class ShopProdCategoryController { - private final ShopProdCategoryService shopProdCategoryService; + + @Resource + private ShopProdCategoryService shopProdCategoryService; + @Resource private ShopSyncService shopSyncService; diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdSpecController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdSpecController.java index 7f8791ef0..e6c2b0432 100644 --- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdSpecController.java +++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdSpecController.java @@ -26,11 +26,13 @@ import java.util.List; * @author Tankaikai tankaikai@aliyun.com * @since 1.0 2025-02-13 */ -@AllArgsConstructor @RestController @RequestMapping("/admin/prod/spec") public class ShopProdSpecController { - private final ShopProdSpecService shopProdSpecService; + + @Resource + private ShopProdSpecService shopProdSpecService; + @Resource private ShopSyncService shopSyncService; diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdUnitController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdUnitController.java index acd74e9e4..1b2fc86b2 100644 --- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdUnitController.java +++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdUnitController.java @@ -26,12 +26,13 @@ import java.util.List; * @author Tankaikai tankaikai@aliyun.com * @since 1.0 2025-02-10 */ -@AllArgsConstructor @RestController @RequestMapping("/admin/prod/unit") public class ShopProdUnitController { - private final ShopProdUnitService shopProdUnitService; + @Resource + private ShopProdUnitService shopProdUnitService; + @Resource private ShopSyncService shopSyncService; diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopVendorController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopVendorController.java index ca4d44b8c..d8a3c85b3 100644 --- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopVendorController.java +++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopVendorController.java @@ -18,7 +18,6 @@ import com.czg.validator.group.InsertGroup; import com.czg.validator.group.UpdateGroup; import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; -import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -31,11 +30,13 @@ import java.util.List; * @author Tankaikai tankaikai@aliyun.com * @since 1.0 2025-02-20 */ -@AllArgsConstructor @RestController @RequestMapping("/admin/product/vendor") public class ShopVendorController { - private final ShopVendorService shopVendorService; + + @Resource + private ShopVendorService shopVendorService; + @Resource private ShopSyncService shopSyncService;