From 38a166303b5800713a6abe380169756c56ffe861 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期日, 27 四月 2025 16:24:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingRouteStatController.java | 15 +++++++++------
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java | 12 ++++++------
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java | 11 ++++++-----
3 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingRouteStatController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingRouteStatController.java
index fb6537d..115661a 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingRouteStatController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingRouteStatController.java
@@ -36,7 +36,7 @@
* 鏌ヨ姘斾綋绠¤矾浜ц兘璐熻浇缁熻鍒楄〃
*/
@Operation(summary = "鏌ヨ姘斾綋绠¤矾浜ц兘璐熻浇缁熻鍒楄〃", description = "鍒嗛〉鏌ヨ")
- @RequiresPermissions("apsGasPipingRouteStat:apsGasPipingRouteStat:list")
+ @RequiresPermissions("aps:apsGasPipingRouteStat:list")
@GetMapping("/list")
public TableDataInfo list(@RequestBody ApsGasPipingRouteStat apsGasPipingRouteStat)
{
@@ -49,7 +49,7 @@
* 瀵煎嚭姘斾綋绠¤矾浜ц兘璐熻浇缁熻鍒楄〃
*/
@Operation(summary = "瀵煎嚭姘斾綋绠¤矾浜ц兘璐熻浇缁熻鍒楄〃", description = "瀵煎嚭")
- @RequiresPermissions("apsGasPipingRouteStat:apsGasPipingRouteStat:export")
+ @RequiresPermissions("aps:apsGasPipingRouteStat:export")
@Log(title = "姘斾綋绠¤矾浜ц兘璐熻浇缁熻", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsGasPipingRouteStat apsGasPipingRouteStat)
@@ -63,7 +63,7 @@
* 鑾峰彇姘斾綋绠¤矾浜ц兘璐熻浇缁熻璇︾粏淇℃伅
*/
@Operation(summary = "鑾峰彇姘斾綋绠¤矾浜ц兘璐熻浇缁熻璇︾粏淇℃伅", description = "鏍规嵁id鑾峰彇")
- @RequiresPermissions("apsGasPipingRouteStat:apsGasPipingRouteStat:query")
+ @RequiresPermissions("aps:apsGasPipingRouteStat:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
@@ -74,7 +74,7 @@
* 鏂板姘斾綋绠¤矾浜ц兘璐熻浇缁熻
*/
@Operation(summary = "鏂板姘斾綋绠¤矾浜ц兘璐熻浇缁熻", description = "鍗曚釜鏂板")
- @RequiresPermissions("apsGasPipingRouteStat:apsGasPipingRouteStat:add")
+ @RequiresPermissions("aps:apsGasPipingRouteStat:add")
@Log(title = "姘斾綋绠¤矾浜ц兘璐熻浇缁熻", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApsGasPipingRouteStat apsGasPipingRouteStat)
@@ -86,7 +86,7 @@
* 淇敼姘斾綋绠¤矾浜ц兘璐熻浇缁熻
*/
@Operation(summary = "淇敼姘斾綋绠¤矾浜ц兘璐熻浇缁熻", description = "鍗曚釜淇敼")
- @RequiresPermissions("apsGasPipingRouteStat:apsGasPipingRouteStat:edit")
+ @RequiresPermissions("aps:apsGasPipingRouteStat:edit")
@Log(title = "姘斾綋绠¤矾浜ц兘璐熻浇缁熻", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApsGasPipingRouteStat apsGasPipingRouteStat)
@@ -98,7 +98,7 @@
* 鍒犻櫎姘斾綋绠¤矾浜ц兘璐熻浇缁熻
*/
@Operation(summary = "鍒犻櫎姘斾綋绠¤矾浜ц兘璐熻浇缁熻", description = "鎵归噺鍒犻櫎")
- @RequiresPermissions("apsGasPipingRouteStat:apsGasPipingRouteStat:remove")
+ @RequiresPermissions("aps:apsGasPipingRouteStat:remove")
@Log(title = "姘斾綋绠¤矾浜ц兘璐熻浇缁熻", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
@@ -107,6 +107,7 @@
}
@Operation(summary = "璁＄畻姘斾綋绠¤矾浜ц兘璐熻浇缁熻", description = "璁＄畻")
+ @RequiresPermissions("aps:apsGasPipingRouteStat:computeCapacity")
@PostMapping("/computeCapacity")
public void computeCapacity()
{
@@ -114,6 +115,7 @@
}
@Operation(summary = "鑾峰彇姘斾綋绠¤矾浜ц兘璐熻浇缁熻", description = "璁＄畻")
+ @RequiresPermissions("aps:apsGasPipingRouteStat:getCapacityPlanData")
@PostMapping("/getCapacityPlanData")
public AjaxResult getCapacityPlanData(@RequestBody ApsGasPipingRouteStat apsGasPipingRouteStat)
{
@@ -121,6 +123,7 @@
}
@Operation(summary = "瀵煎嚭姘斾綋绠¤矾浜ц兘璐熻浇缁熻Excel琛�", description = "瀵煎嚭")
+ @RequiresPermissions("aps:apsGasPipingRouteStat:exportExcel")
@PostMapping("/exportExcel")
public void exportExcel(ApsGasPipingRouteStat apsGasPipingRouteStat, HttpServletResponse response)
{
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
index f4ca43d..db7b77d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
@@ -42,7 +42,7 @@
* 鏌ヨ姘斾綋绠¤矾浜ц兘瑙勫垝鍒楄〃
*/
@Operation(summary = "鏌ヨ姘斾綋绠¤矾浜ц兘瑙勫垝鍒楄〃", description = "鍒嗛〉鏌ヨ")
- @RequiresPermissions("gasPipelineCapacityPlan:gasPipelineCapacityPlan:list")
+ @RequiresPermissions("aps:gasPipelineCapacityPlan:list")
@GetMapping("/list")
public TableDataInfo list(ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan)
{
@@ -85,7 +85,7 @@
* 瀵煎嚭姘斾綋绠¤矾浜ц兘瑙勫垝鍒楄〃
*/
@Operation(summary = "瀵煎嚭姘斾綋绠¤矾浜ц兘瑙勫垝鍒楄〃", description = "瀵煎嚭")
- @RequiresPermissions("gasPipelineCapacityPlan:gasPipelineCapacityPlan:export")
+ @RequiresPermissions("aps:gasPipelineCapacityPlan:export")
@Log(title = "姘斾綋绠¤矾浜ц兘瑙勫垝", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan)
@@ -99,7 +99,7 @@
* 鑾峰彇姘斾綋绠¤矾浜ц兘瑙勫垝璇︾粏淇℃伅
*/
@Operation(summary = "鑾峰彇姘斾綋绠¤矾浜ц兘瑙勫垝璇︾粏淇℃伅", description = "鏍规嵁id鑾峰彇")
- @RequiresPermissions("gasPipelineCapacityPlan:gasPipelineCapacityPlan:query")
+ @RequiresPermissions("aps:gasPipelineCapacityPlan:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -110,7 +110,7 @@
* 鏂板姘斾綋绠¤矾浜ц兘瑙勫垝
*/
@Operation(summary = "鏂板姘斾綋绠¤矾浜ц兘瑙勫垝", description = "鍗曚釜鏂板")
-// @RequiresPermissions("gasPipelineCapacityPlan:gasPipelineCapacityPlan:add")
+ @RequiresPermissions("aps:gasPipelineCapacityPlan:add")
@Log(title = "姘斾綋绠¤矾浜ц兘瑙勫垝", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody List<ApsGasPipelineCapacityPlan> apsGasPipelineCapacityPlan)
@@ -129,7 +129,7 @@
* 淇敼姘斾綋绠¤矾浜ц兘瑙勫垝
*/
@Operation(summary = "淇敼姘斾綋绠¤矾浜ц兘瑙勫垝", description = "鍗曚釜淇敼")
- @RequiresPermissions("gasPipelineCapacityPlan:gasPipelineCapacityPlan:edit")
+ @RequiresPermissions("aps:gasPipelineCapacityPlan:edit")
@Log(title = "姘斾綋绠¤矾浜ц兘瑙勫垝", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan)
@@ -141,7 +141,7 @@
* 鍒犻櫎姘斾綋绠¤矾浜ц兘瑙勫垝
*/
@Operation(summary = "鍒犻櫎姘斾綋绠¤矾浜ц兘瑙勫垝", description = "鎵归噺鍒犻櫎")
- @RequiresPermissions("gasPipelineCapacityPlan:gasPipelineCapacityPlan:remove")
+ @RequiresPermissions("aps:gasPipelineCapacityPlan:remove")
@Log(title = "姘斾綋绠¤矾浜ц兘瑙勫垝", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java
index 0e84a40..07371ca 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java
@@ -43,7 +43,7 @@
/**
* 瀵煎嚭鏃ュ巻绠＄悊鍒楄〃
*/
- @RequiresPermissions("core:calendar:export")
+ @RequiresPermissions("aps:calendar:export")
@Log(title = "鏃ュ巻绠＄悊", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsWorkCalendar apsWorkCalendar)
@@ -56,7 +56,7 @@
/**
* 鑾峰彇鏃ュ巻绠＄悊璇︾粏淇℃伅
*/
- @RequiresPermissions("core:calendar:query")
+ @RequiresPermissions("aps:calendar:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -66,7 +66,7 @@
/**
* 鏂板鏃ュ巻绠＄悊
*/
- @RequiresPermissions("core:calendar:add")
+ @RequiresPermissions("aps:calendar:add")
@Log(title = "鏃ュ巻绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApsWorkCalendar apsWorkCalendar)
@@ -86,7 +86,7 @@
/**
* 淇敼鏃ュ巻绠＄悊
*/
- @RequiresPermissions("core:calendar:edit")
+ @RequiresPermissions("aps:calendar:edit")
@Log(title = "鏃ュ巻绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApsWorkCalendar apsWorkCalendar)
@@ -106,7 +106,7 @@
/**
* 鍒犻櫎鏃ュ巻绠＄悊
*/
- @RequiresPermissions("core:calendar:remove")
+ @RequiresPermissions("aps:calendar:remove")
@Log(title = "鏃ュ巻绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
@@ -126,6 +126,7 @@
}
@Log(title = "鏌ヨ鏃ュ巻瑙嗗浘鏁版嵁", businessType = BusinessType.INSERT)
+ @RequiresPermissions("aps:calendar:selectCalendarView")
@PostMapping("/selectCalendarView")
public AjaxResult selectCalendarView(@RequestBody ApsWorkCalendar apsWorkCalendar)
{
--
Gitblit v1.9.3