From d31e847dfd0d3f0aceb404b08baec1a6b143f693 Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Fri, 14 Aug 2026 15:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enforcement/AppEnfCpNoticeController.java | 10 ++++++
 .../enforcement/AppEnfCpPlanController.java   | 22 +++++++++++++
 .../AppEnfCpReserveController.java            | 10 ++++++
 .../src/views/efcode/interface/index.vue      | 32 +++++++++++++++++++
 4 files changed, 74 insertions(+)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpNoticeController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpNoticeController.java
index 7090e79c..b759c043 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpNoticeController.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpNoticeController.java
@@ -145,4 +145,14 @@ public class AppEnfCpNoticeController {
         return R.ok();
     }
 
+
+
+    /**
+     * 预告到期自动更新以执行（手动触发，强制匹配并落库）
+     */
+    @GetMapping("/noticeReserve")
+    public R<Void> noticeReserve() {
+        efcodeCpNoticeService.markExpiredNoticesAsExecuted();
+        return R.ok();
+    }
 }
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpPlanController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpPlanController.java
index 0b8412cc..562058dd 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpPlanController.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpPlanController.java
@@ -102,4 +102,26 @@ public class AppEnfCpPlanController extends EfcodeCpPlanController {
         cpPlanService.autoMatchReserveV3(true, true, true);
         return R.ok();
     }
+
+    /**
+     * 计划到期自动生成任务（手动触发，强制匹配并落库）
+     * @return
+     */
+    @GetMapping("/autoMatchReserve")
+    public R<Void> autoTaskReserve() {
+        int count = cpPlanService.processPlanDeadlineAutoGenTask();
+        return R.ok();
+    }
+
+
+
+    /**
+     * 取消超出自动匹配时间的联合执法计划（手动触发，强制匹配并落库）
+     * @return
+     */
+    @GetMapping("/updateIsUnion")
+    public R<Void> updateIsUnion() {
+        int count = cpPlanService.updateIsUnion();
+        return R.ok();
+    }
 }
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpReserveController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpReserveController.java
index c8cbaac5..d32ad852 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpReserveController.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpReserveController.java
@@ -124,4 +124,14 @@ public class AppEnfCpReserveController extends EfcodeCpReserveController {
         return R.ok("修改预约状态为已读成功！");
         }
 
+
+    /**
+     * 预约超期自动取消
+     */
+    @GetMapping("/autoOverdueManualReserves")
+    public R<Void> autoOverdueManualReserves() {
+        int manualCount = cpReserveService.cancelOverdueManualReserves(false);
+        int systemCount = cpReserveService.cancelOverdueSystemReserves(false);
+        return R.ok();
+    }
 }
diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/interface/index.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/interface/index.vue
index ce97e171..d1e5dcd1 100644
--- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/interface/index.vue
+++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/interface/index.vue
@@ -19,6 +19,38 @@ const interfaceConfigs = ref<InterfaceItem[]>([
     method: 'get',
     description: '手动触发,强制匹配并落库',
     confirm: true
+  },
+  {
+    name: '计划到期自动生成任务',
+    group: 'AppEnfCpPlanController',
+    url: '/app-enf/cpPlan/autoTaskReserve',
+    method: 'get',
+    description: '手动触发,强制匹配并落库',
+    confirm: true
+  },
+  {
+    name: '取消超出自动匹配时间的联合执法计划',
+    group: 'AppEnfCpPlanController',
+    url: '/app-enf/cpPlan/updateIsUnion',
+    method: 'get',
+    description: '手动触发,强制匹配并落库',
+    confirm: true
+  },
+   {
+    name: '预约超期自动取消',
+    group: 'AppEnfCpReserveController',
+    url: '/app-enf/cpReserve/autoOverdueManualReserves',
+    method: 'get',
+    description: '手动触发,强制匹配并落库',
+    confirm: true
+  },
+  {
+    name: '预告到期自动修改状态',
+    group: 'AppEnfCpNoticeController',
+    url: '/app-enf/cpNotice/noticeReserve',
+    method: 'get',
+    description: '手动触发,强制匹配并落库',
+    confirm: true
   }
 ]);