From c357f8844e03627d0c3bea4bf2058e7c69ff3518 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期三, 14 五月 2025 14:18:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev_lhj
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingRouteStatController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 115661a..b75f897 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
@@ -107,16 +107,22 @@
}
@Operation(summary = "璁＄畻姘斾綋绠¤矾浜ц兘璐熻浇缁熻", description = "璁＄畻")
- @RequiresPermissions("aps:apsGasPipingRouteStat:computeCapacity")
@PostMapping("/computeCapacity")
- public void computeCapacity()
+ @RequiresPermissions("aps:apsGasPipingRouteStat:computeCapacity")
+ public AjaxResult computeCapacity()
{
- apsGasPipingRouteStatService.computeCapacity();
+ try {
+ apsGasPipingRouteStatService.saveGasPipingRoutStateList();
+ return AjaxResult.success();
+ } catch (Exception e) {
+ logger.error(e.getMessage());
+ return AjaxResult.error("鏇存柊澶辫触锛�");
+ }
}
@Operation(summary = "鑾峰彇姘斾綋绠¤矾浜ц兘璐熻浇缁熻", description = "璁＄畻")
- @RequiresPermissions("aps:apsGasPipingRouteStat:getCapacityPlanData")
@PostMapping("/getCapacityPlanData")
+ // @RequiresPermissions("aps:apsGasPipingRouteStat:getCapacityPlanData")
public AjaxResult getCapacityPlanData(@RequestBody ApsGasPipingRouteStat apsGasPipingRouteStat)
{
return AjaxResult.success(apsGasPipingRouteStatService.getCapacityPlanData(apsGasPipingRouteStat));
@@ -130,4 +136,10 @@
apsGasPipingRouteStatService.exportExcel(response, apsGasPipingRouteStat);
}
+ @PostMapping("/saveGasPipingRoutStateList")
+ public void saveGasPipingRoutStateList()
+ {
+ apsGasPipingRouteStatService.saveGasPipingRoutStateList();
+ }
+
}
--
Gitblit v1.9.3