Merge remote-tracking branch 'origin/dev' into dev

huangjiayang

2025-04-29 b330328c07eae2bc612130f32f4b7674a02adcee

 aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingRouteStatController.java

@@ -107,15 +107,21 @@
    }

    @Operation(summary = "计算气体管路产能负载统计", description = "计算")
    @RequiresPermissions("aps:apsGasPipingRouteStat:computeCapacity")

    @PostMapping("/computeCapacity")
    public void 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")
    public AjaxResult getCapacityPlanData(@RequestBody ApsGasPipingRouteStat apsGasPipingRouteStat)
    {
@@ -130,4 +136,10 @@
        apsGasPipingRouteStatService.exportExcel(response, apsGasPipingRouteStat);
    }

    @PostMapping("/saveGasPipingRoutStateList")
    public void saveGasPipingRoutStateList()
    {
        apsGasPipingRouteStatService.saveGasPipingRoutStateList();
    }

}