From fbb90c31d56348ec3fcc49af49c66b19992f58df Mon Sep 17 00:00:00 2001 From: zhanghl <253316343@qq.com> Date: 星期五, 16 五月 2025 17:15:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- 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 744dd6b..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 = "璁$畻") - @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 = "璁$畻") - @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