From e4efff6637f4d598a7efdfca8b62fbb4c3286b02 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期四, 22 五月 2025 15:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingRouteStatController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 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..cc56550 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
@@ -16,6 +16,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Map;
/**
* 姘斾綋绠¤矾浜ц兘璐熻浇缁熻Controller
@@ -62,7 +63,7 @@
/**
* 鑾峰彇姘斾綋绠¤矾浜ц兘璐熻浇缁熻璇︾粏淇℃伅
*/
- @Operation(summary = "鑾峰彇姘斾綋绠¤矾浜ц兘璐熻浇缁熻璇︾粏淇℃伅", description = "鏍规嵁id鑾峰彇")
+ @Operation(summary = "鑾峰彇姘斾綋绠¤矾浜ц兘璐熻浇缁熻璇︾粏淇℃伅", description = "鏍规嵁ID鏌ヨ")
@RequiresPermissions("aps:apsGasPipingRouteStat:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
@@ -73,7 +74,7 @@
/**
* 鏂板姘斾綋绠¤矾浜ц兘璐熻浇缁熻
*/
- @Operation(summary = "鏂板姘斾綋绠¤矾浜ц兘璐熻浇缁熻", description = "鍗曚釜鏂板")
+ @Operation(summary = "鏂板姘斾綋绠¤矾浜ц兘璐熻浇缁熻", description = "鏂板")
@RequiresPermissions("aps:apsGasPipingRouteStat:add")
@Log(title = "姘斾綋绠¤矾浜ц兘璐熻浇缁熻", businessType = BusinessType.INSERT)
@PostMapping
@@ -85,7 +86,7 @@
/**
* 淇敼姘斾綋绠¤矾浜ц兘璐熻浇缁熻
*/
- @Operation(summary = "淇敼姘斾綋绠¤矾浜ц兘璐熻浇缁熻", description = "鍗曚釜淇敼")
+ @Operation(summary = "淇敼姘斾綋绠¤矾浜ц兘璐熻浇缁熻", description = "淇敼")
@RequiresPermissions("aps:apsGasPipingRouteStat:edit")
@Log(title = "姘斾綋绠¤矾浜ц兘璐熻浇缁熻", businessType = BusinessType.UPDATE)
@PutMapping
@@ -97,7 +98,7 @@
/**
* 鍒犻櫎姘斾綋绠¤矾浜ц兘璐熻浇缁熻
*/
- @Operation(summary = "鍒犻櫎姘斾綋绠¤矾浜ц兘璐熻浇缁熻", description = "鎵归噺鍒犻櫎")
+ @Operation(summary = "鍒犻櫎姘斾綋绠¤矾浜ц兘璐熻浇缁熻", description = "鍒犻櫎")
@RequiresPermissions("aps:apsGasPipingRouteStat:remove")
@Log(title = "姘斾綋绠¤矾浜ц兘璐熻浇缁熻", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
@@ -105,18 +106,47 @@
{
return toAjax(apsGasPipingRouteStatService.deleteApsGasPipingRouteStatByIds(ids));
}
+
+ /**
+ * 鐢熸垚姘斾綋绠¤矾浜ц兘璐熻浇缁熻鏁版嵁
+ */
+ @Operation(summary = "鐢熸垚姘斾綋绠¤矾浜ц兘璐熻浇缁熻鏁版嵁", description = "鏍规嵁棰勬祴鏁版嵁鍜屽伐鍗曟暟鎹敓鎴愮粺璁℃暟鎹�")
+ @RequiresPermissions("aps:apsGasPipingRouteStat:generate")
+ @Log(title = "姘斾綋绠¤矾浜ц兘璐熻浇缁熻", businessType = BusinessType.INSERT)
+ @PostMapping("/generate")
+ public AjaxResult generateGasPipingRouteStatData()
+ {
+ return toAjax(apsGasPipingRouteStatService.generateGasPipingRouteStatData());
+ }
+
+ /**
+ * 鑱氬悎姘斾綋绠¤矾浜ц兘璐熻浇缁熻鏁版嵁
+ */
+ @Operation(summary = "鑱氬悎姘斾綋绠¤矾浜ц兘璐熻浇缁熻鏁版嵁", description = "鑱氬悎缁熻鏁版嵁")
+ @RequiresPermissions("aps:apsGasPipingRouteStat:aggregate")
+ @PostMapping("/aggregate")
+ public AjaxResult aggregateGasPipingRouteStat(@RequestBody Map<String, Object> params)
+ {
+ return success(apsGasPipingRouteStatService.aggregateGasPipingRouteStat(params));
+ }
@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 +160,10 @@
apsGasPipingRouteStatService.exportExcel(response, apsGasPipingRouteStat);
}
+ @PostMapping("/saveGasPipingRoutStateList")
+ public void saveGasPipingRoutStateList()
+ {
+ apsGasPipingRouteStatService.saveGasPipingRoutStateList();
+ }
+
}
--
Gitblit v1.9.3