From 1a5e2826905b731b3c4822c2b270e61ab077a256 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Thu, 29 Jan 2026 10:14:24 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E9=BA=BB=E7=B2=BE=E8=8D=AF?=
 =?UTF-8?q?=EF=BC=8C=E7=BB=99=E8=8D=AF=E5=88=B6=E5=89=82]=E5=80=9F?=
 =?UTF-8?q?=E9=98=85=E5=88=B0=E6=9C=9F=E8=87=AA=E5=8A=A8=E5=BD=92=E8=BF=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hxhq/system/api/RemoteUserService.java     | 24 ++++++++++++++++++++++
 .../api/factory/RemoteUserFallbackFactory.java     | 12 +++++++++++
 .../hxhq/business/controller/GyzjController.java   |  9 ++++++++
 .../business/controller/GyzjFfjlController.java    |  8 ++++++++
 .../hxhq/business/controller/MjyController.java    | 10 +++++++++
 .../business/controller/MjyFfjlController.java     |  9 ++++++++
 .../system/controller/SysDictDataController.java   |  2 +-
 7 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/RemoteUserService.java b/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/RemoteUserService.java
index 82bfd2b..2cf6ad0 100644
--- a/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/RemoteUserService.java
+++ b/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/RemoteUserService.java
@@ -63,4 +63,28 @@ public interface RemoteUserService
      */
     @PostMapping("/business/study/autoGh")
     public void autoGhStudy();
+
+    /**
+     * 自动归还麻精药
+     */
+    @PostMapping("/business/mjy/autoGh")
+    public void autoGhMjy();
+
+    /**
+     * 自动归还麻精药发放记录
+     */
+    @PostMapping("/business/mjyFfjl/autoGh")
+    public void autoGhMjyFfjl();
+
+    /**
+     * 自动归还给药制剂
+     */
+    @PostMapping("/business/gyzj/autoGh")
+    public void autoGhGyzj();
+
+    /**
+     * 自动归还给药制剂发放记录
+     */
+    @PostMapping("/business/gyzjFfjl/autoGh")
+    public void autoGhGyzjFfjl();
 }
diff --git a/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/factory/RemoteUserFallbackFactory.java b/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/factory/RemoteUserFallbackFactory.java
index 2ed6494..772ea49 100644
--- a/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/factory/RemoteUserFallbackFactory.java
+++ b/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/factory/RemoteUserFallbackFactory.java
@@ -50,6 +50,18 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
             @Override
             public void autoGhStudy() {
             }
+            @Override
+            public void autoGhMjy() {
+            }
+            @Override
+            public void autoGhMjyFfjl() {
+            }
+            @Override
+            public void autoGhGyzj() {
+            }
+            @Override
+            public void autoGhGyzjFfjl() {
+            }
         };
     }
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java
index a1bc118..ee429da 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java
@@ -407,4 +407,13 @@ public class GyzjController extends BaseController
         gyzjService.qc(form);
         return AjaxResult.success("操作成功");
     }
+
+    /**
+     * 自动归还
+     */
+    @PostMapping("/autoGh")
+    public void autoGh()
+    {
+        gyzjService.autoJyExpireReturn();
+    }
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjFfjlController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjFfjlController.java
index 7123160..d3dc6af 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjFfjlController.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjFfjlController.java
@@ -163,4 +163,12 @@ public class GyzjFfjlController extends BaseController
         return AjaxResult.success("操作成功");
     }
 
+    /**
+     * 自动归还
+     */
+    @PostMapping("/autoGh")
+    public void autoGh()
+    {
+        gyzjFfjlService.autoJyExpireReturn();
+    }
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java
index 3ff509b..1e1b3df 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java
@@ -370,4 +370,14 @@ public class MjyController extends BaseController {
         mjyService.qc(form);
         return AjaxResult.success("操作成功");
     }
+
+    /**
+     * 自动归还
+     */
+    @PostMapping("/autoGh")
+    public void autoGh()
+    {
+        mjyService.autoJyExpireReturn();
+    }
+
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyFfjlController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyFfjlController.java
index b821ea4..edde151 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyFfjlController.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyFfjlController.java
@@ -163,4 +163,13 @@ public class MjyFfjlController extends BaseController
         return AjaxResult.success("操作成功");
     }
 
+    /**
+     * 自动归还
+     */
+    @PostMapping("/autoGh")
+    public void autoGh()
+    {
+        mjyFfjlService.autoJyExpireReturn();
+    }
+
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysDictDataController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysDictDataController.java
index 148816b..021d8f9 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysDictDataController.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysDictDataController.java
@@ -42,7 +42,7 @@ public class SysDictDataController extends BaseController
     @Autowired
     private ISysDictTypeService dictTypeService;
 
-    @RequiresPermissions("system:dict:list")
+//    @RequiresPermissions("system:dict:list")
     @GetMapping("/list")
     public TableDataInfo list(SysDictData dictData)
     {