From 32d1bd8a3f94c67198e397aff76bc7b33a30a6b6 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 15:15:45 +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 | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 0aeb3f6..d26a61c 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("aps:ApsBomHeader:list")
+ @RequiresPermissions("Aps:ApsBomHeader:list")
@GetMapping("/list")
public TableDataInfo list(ApsBomHeader apsBomHeader)
{
@@ -104,6 +110,26 @@
return toAjax(apsBomHeaderService.deleteApsBomHeaderByIds(ids));
}
+ /**
+ * 鍒锋柊鍏ㄩ噺BOM鏁版嵁
+ */
+ @RequiresPermissions("Aps:ApsBomHeader:refreshBomData")
+ @PostMapping("/refreshBomData")
+ public void refreshBomData()
+ {
+ R<Boolean> res = remoteJobService.refreshBomData(SecurityConstants.INNER);
+ if (R.isSuccess(res))
+ {
+ apsBomHeaderService.setBomDataToRedis("");
+ }
+ }
+
+ @PostMapping("/setBomDataToRedis")
+ public void setBomDataToRedis()
+ {
+ apsBomHeaderService.setBomDataToRedis("");
+ }
+
@PostMapping("/test")
public void test()
{
--
Gitblit v1.9.3