From 088a46dc697ef5b719f1ab62c9988f96a21e5e0c Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 12 五月 2025 11:17:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsBomHeaderController.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsBomHeaderController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsBomHeaderController.java
index 4ada129..a7f2f25 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsBomHeaderController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsBomHeaderController.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.ApsBomHeader;
import com.aps.core.service.IApsBomHeaderService;
+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,11 +33,14 @@
@Autowired
private IApsBomHeaderService apsBomHeaderService;
+ @Autowired
+ private RemoteJobService remoteJobService;
+
/**
* 鏌ヨBOM Header 鏁版嵁绠＄悊鍒楄〃
*/
- @RequiresPermissions("ApsBomHeader:ApsBomHeader:list")
+ @RequiresPermissions("Aps:ApsBomHeader:list")
@GetMapping("/list")
public TableDataInfo list(ApsBomHeader apsBomHeader)
{
@@ -47,7 +53,7 @@
* 瀵煎嚭BOM Header 鏁版嵁绠＄悊鍒楄〃
*/
- @RequiresPermissions("ApsBomHeader:ApsBomHeader:export")
+ @RequiresPermissions("Aps:ApsBomHeader:export")
@Log(title = "BOM Header 鏁版嵁绠＄悊", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsBomHeader apsBomHeader)
@@ -61,7 +67,7 @@
* 鑾峰彇BOM Header 鏁版嵁绠＄悊璇︾粏淇℃伅
*/
- @RequiresPermissions("ApsBomHeader:ApsBomHeader:query")
+ @RequiresPermissions("Aps:ApsBomHeader:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +78,7 @@
* 鏂板BOM Header 鏁版嵁绠＄悊
*/
- @RequiresPermissions("ApsBomHeader:ApsBomHeader:add")
+ @RequiresPermissions("Aps:ApsBomHeader:add")
@Log(title = "BOM Header 鏁版嵁绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApsBomHeader apsBomHeader)
@@ -84,7 +90,7 @@
* 淇敼BOM Header 鏁版嵁绠＄悊
*/
- @RequiresPermissions("ApsBomHeader:ApsBomHeader:edit")
+ @RequiresPermissions("Aps:ApsBomHeader:edit")
@Log(title = "BOM Header 鏁版嵁绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApsBomHeader apsBomHeader)
@@ -96,11 +102,39 @@
* 鍒犻櫎BOM Header 鏁版嵁绠＄悊
*/
- @RequiresPermissions("ApsBomHeader:ApsBomHeader:remove")
+ @RequiresPermissions("Aps:ApsBomHeader:remove")
@Log(title = "BOM Header 鏁版嵁绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(apsBomHeaderService.deleteApsBomHeaderByIds(ids));
}
+
+ /**
+ * 鍒锋柊鍏ㄩ噺BOM鏁版嵁
+ */
+ @RequiresPermissions("Aps:ApsBomHeader:refreshBomData")
+ @PostMapping("/refreshBomData")
+ public AjaxResult refreshBomData()
+ {
+ R<Boolean> res = remoteJobService.refreshBomData(SecurityConstants.INNER);
+ if (R.isSuccess(res))
+ {
+ apsBomHeaderService.setBomDataToRedis("");
+ return success();
+ }
+ return error();
+ }
+
+ @PostMapping("/setBomDataToRedis")
+ public void setBomDataToRedis()
+ {
+ apsBomHeaderService.setBomDataToRedis("");
+ }
+
+ @PostMapping("/test")
+ public void test()
+ {
+ apsBomHeaderService.setBomDataToRedis("FORTUNA");
+ }
}
--
Gitblit v1.9.3