From cc47fb86361d85198d58da7fb4098915d4538345 Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Thu, 13 Feb 2025 14:40:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=87=E9=9D=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=95=B4=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ShopProdUnitController.java    | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/cash-api/product-server/src/main/java/com/czg/controller/ShopProdUnitController.java b/cash-api/product-server/src/main/java/com/czg/controller/ShopProdUnitController.java
index e43e72f8..c8c340be 100644
--- a/cash-api/product-server/src/main/java/com/czg/controller/ShopProdUnitController.java
+++ b/cash-api/product-server/src/main/java/com/czg/controller/ShopProdUnitController.java
@@ -28,29 +28,27 @@ import java.util.List;
 @RequestMapping("/admin/prod/unit")
 public class ShopProdUnitController {
 
-    public static final String LOG_PREFIX = "商品单位管理-";
-
     private final ShopProdUnitService shopProdUnitService;
 
     @GetMapping("page")
-    @OperationLog(LOG_PREFIX+"分页")
-    //@SaAdminCheckPermission("prod:unit:all")
+    @OperationLog("商品单位-分页")
+    @SaAdminCheckPermission("prod:unit:page")
     public CzgResult<Page<ShopProdUnitDTO>> page(ShopProdUnitDTO param) {
         Page<ShopProdUnitDTO> data = shopProdUnitService.page(param);
         return CzgResult.success(data);
     }
 
     @GetMapping("list")
-    @OperationLog("列表")
-    @SaAdminCheckPermission("prod:unit:all")
+    @OperationLog("商品单位-列表")
+    @SaAdminCheckPermission("prod:unit:list")
     public CzgResult<List<ShopProdUnitDTO>> list(ShopProdUnitDTO param) {
         List<ShopProdUnitDTO> data = shopProdUnitService.list(param);
         return CzgResult.success(data);
     }
 
     @GetMapping("{id}")
-    @OperationLog("信息")
-    @SaAdminCheckPermission("prod:unit:all")
+    @OperationLog("商品单位-信息")
+    @SaAdminCheckPermission("prod:unit:info")
     public CzgResult<ShopProdUnitDTO> get(@PathVariable("id") Long id) {
         AssertUtil.isNull(id, "{}不能为空", "id");
         ShopProdUnitDTO data = shopProdUnitService.get(id);
@@ -58,8 +56,8 @@ public class ShopProdUnitController {
     }
 
     @PostMapping
-    @OperationLog("保存")
-    @SaAdminCheckPermission("prod:unit:all")
+    @OperationLog("商品单位-保存")
+    @SaAdminCheckPermission("prod:unit:save")
     public CzgResult<Void> save(@RequestBody ShopProdUnitDTO dto) {
         //效验数据
         ValidatorUtil.validateEntity(dto, InsertGroup.class, DefaultGroup.class);
@@ -70,8 +68,8 @@ public class ShopProdUnitController {
     }
 
     @PutMapping
-    @OperationLog("修改")
-    @SaAdminCheckPermission("prod:unit:all")
+    @OperationLog("商品单位-修改")
+    @SaAdminCheckPermission("prod:unit:update")
     public CzgResult<Void> update(@RequestBody ShopProdUnitDTO dto) {
         //效验数据
         ValidatorUtil.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -81,9 +79,19 @@ public class ShopProdUnitController {
         return CzgResult.success();
     }
 
+    @DeleteMapping("{id}")
+    @OperationLog("商品单位-启用")
+    @SaAdminCheckPermission("prod:unit:delete")
+    public CzgResult<Void> delete(@PathVariable("id") Long id) {
+        //效验数据
+        AssertUtil.isNull(id, "{}不能为空", "id");
+        shopProdUnitService.removeById(id);
+        return CzgResult.success();
+    }
+
     @PostMapping("disable/{id}")
-    @OperationLog("禁用")
-    @SaAdminCheckPermission("prod:unit:all")
+    @OperationLog("商品单位-禁用")
+    @SaAdminCheckPermission("prod:unit:able")
     public CzgResult<Void> disable(@PathVariable("id") Long id) {
         //效验数据
         AssertUtil.isNull(id, "{}不能为空", "id");
@@ -92,12 +100,14 @@ public class ShopProdUnitController {
     }
 
     @PostMapping("enable/{id}")
-    @OperationLog("启用")
-    @SaAdminCheckPermission("prod:unit:all")
+    @OperationLog("商品单位-启用")
+    @SaAdminCheckPermission("prod:unit:able")
     public CzgResult<Void> enable(@PathVariable("id") Long id) {
         //效验数据
         AssertUtil.isNull(id, "{}不能为空", "id");
         shopProdUnitService.enable(id);
         return CzgResult.success();
     }
+
+
 }
\ No newline at end of file