zhanghl
2025-04-27 38a166303b5800713a6abe380169756c56ffe861
Merge remote-tracking branch 'origin/dev' into dev
已修改3个文件
38 ■■■■■ 文件已修改
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingRouteStatController.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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)
    {
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)
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)
    {