From 60cba101ed062ea720954de384cd773e14f34d44 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Thu, 21 Nov 2024 23:21:15 +0800
Subject: [PATCH] =?UTF-8?q?feat(system):=20=E6=B7=BB=E5=8A=A0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B9=E8=BD=AF=E5=88=A0=E9=99=A4=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在创建配置项时添加软删除标识，避免直接物理删除
- 合并通知公告发布和撤回接口的映射方式，简化接口设计
---
 .../com/youlai/boot/system/controller/NoticeController.java | 6 ++----
 .../youlai/boot/system/service/impl/ConfigServiceImpl.java  | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/youlai/boot/system/controller/NoticeController.java b/src/main/java/com/youlai/boot/system/controller/NoticeController.java
index 31e57b1b..932db6aa 100644
--- a/src/main/java/com/youlai/boot/system/controller/NoticeController.java
+++ b/src/main/java/com/youlai/boot/system/controller/NoticeController.java
@@ -83,8 +83,7 @@ public class NoticeController {
     }
 
     @Operation(summary = "发布通知公告")
-    @PatchMapping(value = "/{id}/publish")
-    @PutMapping(value = "/{id}/publish")
+    @RequestMapping(value="/{id}/publish",method = {RequestMethod.PUT,RequestMethod.PATCH})
     @PreAuthorize("@ss.hasPerm('sys:notice:publish')")
     public Result<Void> publishNotice(
             @Parameter(description = "通知公告ID") @PathVariable Long id
@@ -94,8 +93,7 @@ public class NoticeController {
     }
 
     @Operation(summary = "撤回通知公告")
-    @PutMapping(value = "/{id}/revoke")
-    @PatchMapping(value = "/{id}/revoke")
+    @RequestMapping(value="/{id}/revoke",method = {RequestMethod.PUT,RequestMethod.PATCH})
     @PreAuthorize("@ss.hasPerm('sys:notice:revoke')")
     public Result<Void> revokeNotice(
             @Parameter(description = "通知公告ID") @PathVariable Long id
diff --git a/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java
index 76f149dd..90904347 100644
--- a/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java
@@ -83,6 +83,7 @@ public class ConfigServiceImpl extends ServiceImpl<ConfigMapper, Config> impleme
                 "配置键已存在");
         Config config = configConverter.toEntity(configForm);
         config.setCreateBy(SecurityUtils.getUserId());
+        config.setIsDeleted(0);
         return this.save(config);
     }