Merge remote-tracking branch 'origin/master'

Administrator

2023-08-05 0ee44e75029923734744628a8b059fa41ff3ef55

 ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java

@@ -1,6 +1,7 @@
package com.ruoyi.app.patrolplan.controller;

import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;

@@ -109,9 +110,11 @@
    @Log(title = "app巡检计划", businessType = BusinessType.DELETE)
    @DeleteMapping("/{id}")
    @ApiOperation("删除app巡检计划")
    public Results remove(@PathVariable String id)
    //public Results remove(@PathVariable String id)
    public AjaxResult remove(@PathVariable String id)
    {
        return ardAppPatrolplanService.deleteArdApp(id);
        //return ardAppPatrolplanService.deleteArdApp(id);
        return toAjax(ardAppPatrolplanService.deleteArdApp(id));
    }


@@ -137,4 +140,15 @@
        return toAjax(ardAppPatrolplanService.updateArdAppPatrolplan(ardAppPatrolplan));
    }

    /**
     * 新增app巡检计划及人员点位
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:insertArdAppPatrolplan')")
    @Log(title = "app巡检计划", businessType = BusinessType.INSERT)
    @PostMapping("/insertArdAppPatrolplan")
    @ApiOperation("新增app巡检计划及人员点位")
    public AjaxResult addArdAppPatrolplan(@RequestBody Map<String,Object> para)
    {
        return toAjax(ardAppPatrolplanService.insertArdAppPatrolplan(para));
    }
}