From 1eb48a15573f4514910d311eed3a917f6b5fbd81 Mon Sep 17 00:00:00 2001
From: hsdllcw <hsdllcw@qq.com>
Date: Mon, 14 Apr 2025 10:31:00 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=85=AC=E5=91=8A=E7=9A=84=E5=AF=B9=E5=A4=96=E5=BC=80=E6=94=BE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/api/factory/RemoteSysNoticeFallbackFactory.kt | 2 +-
 .../system/api/inner/InnerRemoteSysNoticeService.kt      | 9 ++++-----
 .../system/controller/inner/InnerSysNoticeController.kt  | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/factory/RemoteSysNoticeFallbackFactory.kt b/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/factory/RemoteSysNoticeFallbackFactory.kt
index 357d4620f..d3604c1a2 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/factory/RemoteSysNoticeFallbackFactory.kt
+++ b/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/factory/RemoteSysNoticeFallbackFactory.kt
@@ -16,7 +16,7 @@ open class RemoteSysNoticeFallbackFactory : FallbackFactory<RemoteSysNoticeServi
     override fun create(throwable: Throwable): RemoteSysNoticeService {
         log.error("公告服务调用失败:{}", throwable.message)
         return object : RemoteSysNoticeService {
-            override fun getById_Inner(noticeId: Long?, source: String?): R<Any> {
+            override fun getById_Inner(noticeId: Long, source: String): R<Any> {
                 return R.fail("获取公告失败")
             }
         }
diff --git a/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/inner/InnerRemoteSysNoticeService.kt b/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/inner/InnerRemoteSysNoticeService.kt
index f2f970211..c1949fa6c 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/inner/InnerRemoteSysNoticeService.kt
+++ b/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/inner/InnerRemoteSysNoticeService.kt
@@ -12,10 +12,9 @@ interface InnerRemoteSysNoticeService {
      * @param noticeId 公告ID
      * @return 公告信息
      */
-    @GetMapping("/inner/notice/detail/{noticeId}")
+    @GetMapping("/inner/notice/detail/{noticeId:\\d+}")
     fun getById_Inner(
-        @PathVariable("noticeId") noticeId: Long?, @RequestHeader(
-            SecurityConstants.FROM_SOURCE
-        ) source: String?
-    ): R<Any>?
+        @PathVariable("noticeId") noticeId: Long,
+        @RequestHeader(SecurityConstants.FROM_SOURCE) source: String
+    ): R<Any>
 }
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysNoticeController.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysNoticeController.kt
index 5f6026f47..e4a4e16ef 100644
--- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysNoticeController.kt
+++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysNoticeController.kt
@@ -24,8 +24,8 @@ open class InnerSysNoticeController : BaseController() {
      * 根据ID获取公告信息
      */
     @InnerAuth
-    @GetMapping("/detail/{noticeId}")
-    fun infoById(@PathVariable("noticeId") noticeId: Long): R<SysNotice> {
+    @GetMapping("/detail/{noticeId:\\d+}")
+    fun infoById(@PathVariable("noticeId") noticeId: Long): R<Any> {
         return R.ok(noticeService.selectNoticeById(noticeId))
     }
 }
\ No newline at end of file