From 2a79411cf5790db9b1d042af7f82a8b36793b7a1 Mon Sep 17 00:00:00 2001
From: bluejay <253316343@qq.com>
Date: 星期一, 14 四月 2025 11:39:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java | 15 +++++++++------
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPartPlanController.java | 3 +++
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java | 2 ++
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java | 2 ++
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupTempController.java | 3 ++-
5 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java
index 88aa68c..989f858 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java
@@ -105,6 +105,7 @@
/**
* 宸ヨ壓璺嚎瀵煎叆
*/
+ @RequiresPermissions("processRoute:processRoute:importData")
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file) throws Exception {
ExcelUtil<ApsProcessRouteTemp> util = new ExcelUtil<ApsProcessRouteTemp>(ApsProcessRouteTemp.class);
@@ -132,6 +133,7 @@
* @Author: wwj
* @Date: 2025/4/9
*/
+ @RequiresPermissions("processRoute:processRoute:confirmProcessRoute")
@PostMapping("/confirmProcessRoute")
public AjaxResult confirmProcessRoute(@RequestBody ApsProcessRouteTemp apsProcessRouteTemp) {
return toAjax(apsProcessRouteService.confirmProcessRoute(apsProcessRouteTemp));
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java
index 3ac41ea..dbcc902 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java
@@ -6,6 +6,7 @@
import com.aps.common.core.web.page.TableDataInfo;
import com.aps.common.log.annotation.Log;
import com.aps.common.log.enums.BusinessType;
+import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsResourceGroup;
import com.aps.core.domain.ApsResourceGroupTemp;
import com.aps.core.service.IApsResourceGroupService;
@@ -37,7 +38,7 @@
/**
* 鏌ヨ璧勬簮缁勫垪琛�
*/
- /*@RequiresPermissions("ApsResourceGroup:list")*/
+ @RequiresPermissions("ApsResourceGroup:list")
@GetMapping("/list")
public TableDataInfo list(ApsResourceGroup apsResourceGroup)
{
@@ -49,7 +50,7 @@
/**
* 瀵煎嚭璧勬簮缁勫垪琛�
*/
- /*@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:export")*/
+ @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:export")
@Log(title = "璧勬簮缁�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsResourceGroup apsResourceGroup)
@@ -62,7 +63,7 @@
/**
* 鑾峰彇璧勬簮缁勮缁嗕俊鎭�
*/
- /* @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:query")*/
+ @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
@@ -72,7 +73,7 @@
/**
* 鏂板璧勬簮缁�
*/
- /* @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:add")*/
+ @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:add")
@Log(title = "璧勬簮缁�", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApsResourceGroup apsResourceGroup)
@@ -83,7 +84,7 @@
/**
* 淇敼璧勬簮缁�
*/
- /*@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:edit")*/
+ @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:edit")
@Log(title = "璧勬簮缁�", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApsResourceGroup apsResourceGroup)
@@ -94,7 +95,7 @@
/**
* 鍒犻櫎璧勬簮缁�
*/
- /*@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:remove")*/
+ @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:remove")
@Log(title = "璧勬簮缁�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
@@ -112,6 +113,7 @@
/**
* 瀵煎叆璧勬簮缁�
*/
+ @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:importData")
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file) throws Exception {
ExcelUtil<ApsResourceGroupTemp> util = new ExcelUtil<>(ApsResourceGroupTemp.class);
@@ -127,6 +129,7 @@
/**
* 纭鏁版嵁
*/
+ @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:confirmData")
@PostMapping("/confirmData")
public AjaxResult confirmData(@RequestBody ApsResourceGroupTemp temp) {
// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupTempController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupTempController.java
index 58f2b2d..c1cbbfb 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupTempController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupTempController.java
@@ -6,6 +6,7 @@
import com.aps.common.core.web.page.TableDataInfo;
import com.aps.common.log.annotation.Log;
import com.aps.common.log.enums.BusinessType;
+import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsResourceGroupTemp;
import com.aps.core.service.IApsResourceGroupTempService;
import jakarta.servlet.http.HttpServletResponse;
@@ -30,7 +31,7 @@
/**
* 鏌ヨ璧勬簮缁勪复鏃朵笂浼犲垪琛�
*/
-// @RequiresPermissions("ApsResourceGroupTemp:ApsResourceGroupTemp:list")
+ @RequiresPermissions("ApsResourceGroupTemp:ApsResourceGroupTemp:list")
@GetMapping("/list")
public TableDataInfo list(ApsResourceGroupTemp apsResourceGroupTemp)
{
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPartPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPartPlanController.java
index 9598204..9f67693 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPartPlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPartPlanController.java
@@ -142,6 +142,8 @@
/**
* 闆朵欢璁″垝瀵煎叆
*/
+
+ @RequiresPermissions("partPlan:import")
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file) throws Exception {
ExcelUtil<ApsPartPlanTemp> util = new ExcelUtil<ApsPartPlanTemp>(ApsPartPlanTemp.class);
@@ -195,6 +197,7 @@
* @Author: wwj
* @Date: 2025/4/9
*/
+ @RequiresPermissions("partPlan:confirmPart")
@PostMapping("/confirmPart")
public AjaxResult confirmPart(@RequestBody ApsPartPlanTemp apsPartPlanTemp) {
return toAjax(apsPartPlanService.confirmPart(apsPartPlanTemp));
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java
index e38cfd9..cef6175 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java
@@ -118,6 +118,7 @@
/**
* 鐒婄紳瀵煎叆
*/
+ @RequiresPermissions("weldSeam:weldSeam:importData")
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file) throws Exception {
ExcelUtil<ApsWeldSeamTemp> util = new ExcelUtil<ApsWeldSeamTemp>(ApsWeldSeamTemp.class);
@@ -162,6 +163,7 @@
* @Author: wwj
* @Date: 2025/4/9
*/
+ @RequiresPermissions("weldSeam:weldSeam:confirmWeldSeam")
@GetMapping("/confirmWeldSeam")
public AjaxResult confirmWeldSeam(ApsWeldSeamTemp apsWeldSeamTemp) {
return toAjax(apsWeldSeamService.confirmWeldSeam(apsWeldSeamTemp));
--
Gitblit v1.9.3