From 6da289fff756eaecc600422d77c4afff1ddebab0 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 23 五月 2025 15:23:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsStandardProcessRouteHeaderController.java |   41 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsStandardProcessRouteHeaderController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsStandardProcessRouteHeaderController.java
index ca24dd4..0bde872 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsStandardProcessRouteHeaderController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsStandardProcessRouteHeaderController.java
@@ -1,5 +1,7 @@
 package com.aps.core.controller.mainPlan;
 
+import com.aps.common.core.constant.SecurityConstants;
+import com.aps.common.core.domain.R;
 import com.aps.common.core.utils.poi.ExcelUtil;
 import com.aps.common.core.web.controller.BaseController;
 import com.aps.common.core.web.domain.AjaxResult;
@@ -9,6 +11,7 @@
 import com.aps.common.security.annotation.RequiresPermissions;
 import com.aps.core.domain.ApsStandardProcessRouteHeader;
 import com.aps.core.service.IApsStandardProcessRouteHeaderService;
+import com.aps.system.api.RemoteJobService;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -30,15 +33,18 @@
     @Autowired
     private IApsStandardProcessRouteHeaderService apsStandardProcessRouteHeaderService;
 
+    @Autowired
+    private RemoteJobService remoteJobService;
+
     /**
      * 鏌ヨ鏍囧噯宸ヨ壓璺嚎Header鍒楄〃
      */
 
-    @RequiresPermissions("ApsStandardProcessRouteHeader:ApsStandardProcessRouteHeader:list")
+    @RequiresPermissions("Aps:ApsStandardProcessRouteHeader:list")
     @GetMapping("/list")
     public TableDataInfo list(ApsStandardProcessRouteHeader apsStandardProcessRouteHeader)
     {
-        startPage();
+//        startPage();
         List<ApsStandardProcessRouteHeader> list = apsStandardProcessRouteHeaderService.selectApsStandardProcessRouteHeaderList(apsStandardProcessRouteHeader);
         return getDataTable(list);
     }
@@ -47,7 +53,7 @@
      * 瀵煎嚭鏍囧噯宸ヨ壓璺嚎Header鍒楄〃
      */
 
-    @RequiresPermissions("ApsStandardProcessRouteHeader:ApsStandardProcessRouteHeader:export")
+    @RequiresPermissions("Aps:ApsStandardProcessRouteHeader:export")
     @Log(title = "鏍囧噯宸ヨ壓璺嚎Header", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ApsStandardProcessRouteHeader apsStandardProcessRouteHeader)
@@ -60,7 +66,7 @@
     /**
      * 鑾峰彇鏍囧噯宸ヨ壓璺嚎Header璇︾粏淇℃伅
      */
-    @RequiresPermissions("ApsStandardProcessRouteHeader:ApsStandardProcessRouteHeader:query")
+    @RequiresPermissions("Aps:ApsStandardProcessRouteHeader:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -70,7 +76,7 @@
     /**
      * 鏂板鏍囧噯宸ヨ壓璺嚎Header
      */
-    @RequiresPermissions("ApsStandardProcessRouteHeader:ApsStandardProcessRouteHeader:add")
+    @RequiresPermissions("Aps:ApsStandardProcessRouteHeader:add")
     @Log(title = "鏍囧噯宸ヨ壓璺嚎Header", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ApsStandardProcessRouteHeader apsStandardProcessRouteHeader)
@@ -81,7 +87,7 @@
     /**
      * 淇敼鏍囧噯宸ヨ壓璺嚎Header
      */
-    @RequiresPermissions("ApsStandardProcessRouteHeader:ApsStandardProcessRouteHeader:edit")
+    @RequiresPermissions("Aps:ApsStandardProcessRouteHeader:edit")
     @Log(title = "鏍囧噯宸ヨ壓璺嚎Header", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ApsStandardProcessRouteHeader apsStandardProcessRouteHeader)
@@ -92,11 +98,32 @@
     /**
      * 鍒犻櫎鏍囧噯宸ヨ壓璺嚎Header
      */
-    @RequiresPermissions("ApsStandardProcessRouteHeader:ApsStandardProcessRouteHeader:remove")
+    @RequiresPermissions("Aps:ApsStandardProcessRouteHeader:remove")
     @Log(title = "鏍囧噯宸ヨ壓璺嚎Header", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(apsStandardProcessRouteHeaderService.deleteApsStandardProcessRouteHeaderByIds(ids));
     }
+
+    /**
+     * 鍒锋柊鍏ㄩ噺宸ヨ壓璺嚎鏁版嵁
+     */
+    @RequiresPermissions("Aps:ApsStandardProcessRouteHeader:refreshProcessRouteData")
+    @PostMapping("/refreshProcessRouteData")
+    public AjaxResult refreshProcessRouteData()
+    {
+        R<Boolean> res = remoteJobService.refreshProcessRouteData(SecurityConstants.INNER);
+        if (R.isSuccess(res))
+        {
+            apsStandardProcessRouteHeaderService.setProcessRouteDataToRedis("");
+        }
+        return error();
+    }
+
+    @PostMapping("/setProcessRouteDataToRedis")
+    public boolean setProcessRouteDataToRedis()
+    {
+        return apsStandardProcessRouteHeaderService.setProcessRouteDataToRedis("FORTUNA");
+    }
 }

--
Gitblit v1.9.3