Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-24 457e566525d57ce0904e00aab9298ab0693ad5a1

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

@@ -14,7 +14,7 @@
import com.ruoyi.alarmpoints.well.service.IArdAlarmpointsWellService;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpoint;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpointRecord;
import com.ruoyi.app.patrolplan.domain.param.ArdAppPatrolpointRecordParam;
import com.ruoyi.app.patrolplan.domain.param.*;
import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointRecordService;
import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointService;
import com.ruoyi.app.patrolplan.service.IArdAppPatroluserService;
@@ -182,7 +182,7 @@
    }

    /**
     * 管理端--查询单条数据
     *  管理端--查询单条数据
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:oneById')")
    @PostMapping("/oneById/{id}")
@@ -220,8 +220,8 @@
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordMonth')")
    @ApiOperation("管理端--巡检日历")
    @PostMapping("recordMonth")
    public Results recordMonth(@RequestBody ArdAppPatrolpointRecordParam ardAppPatrolpointRecordParam) throws ParseException {
        return recordService.recordMonth(ardAppPatrolpointRecordParam);
    public Results recordMonth(@RequestBody RecordMonthParam recordMonthParam) throws ParseException {
        return recordService.recordMonth(recordMonthParam);
    }

    /**
@@ -230,18 +230,18 @@
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordDetails')")
    @ApiOperation("管理端--点击日历获取该记录下人员打卡记录")
    @PostMapping("recordDetails")
    public Results recordDetails(@RequestBody ArdAppPatrolpointRecordParam ardAppPatrolpointRecordParam) throws ParseException {
        return recordService.recordDetails(ardAppPatrolpointRecordParam);
    public Results recordDetails(@RequestBody RecordDetailsParam recordDetailsParam) throws ParseException {
        return recordService.recordDetails(recordDetailsParam);
    }

    /**
     * 管理端--单人详情
     * 单人详情
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordSolo')")
    @ApiOperation("管理端--单人详情")
    @ApiOperation("单人详情")
    @PostMapping("recordSolo")
    public Results recordSolo(@RequestBody ArdAppPatrolpointRecordParam ardAppPatrolpointRecordParam) throws ParseException {
        return recordService.recordSolo(ardAppPatrolpointRecordParam);
    public Results recordSolo(@RequestBody RecordSoloParam recordSoloParam) throws ParseException {
        return recordService.recordSolo(recordSoloParam);
    }

    /**
@@ -264,4 +264,65 @@
        List<ArdAppPatrolplan> list = ardAppPatrolplanService.executeList(ardAppPatrolplan);
        return Results.succeed(new PageInfo<>(list));
    }

    /**
     *  单兵端--查询单条数据
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeOneById')")
    @PostMapping("/executeOneById/{id}")
    @ApiOperation("单兵端--查询单条数据")
    public Results executeOneById(@PathVariable String id)
    {
        return ardAppPatrolplanService.executeOneById(id);
    }

    /**
     * 单兵端--巡检日历
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeMonth')")
    @ApiOperation("单兵端--巡检日历")
    @PostMapping("executeMonth")
    public Results executeMonth(@RequestBody RecordMonthExParam recordMonthExParam) throws ParseException {
        return recordService.executeMonth(recordMonthExParam);
    }

    /**
     * 单兵端--点击日历获取该记录下人员打卡记录
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeDetails')")
    @ApiOperation("单兵端--点击日历获取该人员下所有地点打卡记录")
    @PostMapping("executeDetails")
    public Results executeDetails(@RequestBody RecordDetailsExParam recordDetailsExParam) throws ParseException {
        return recordService.executeDetails(recordDetailsExParam);
    }

    /**
     * 单兵端--单人详情
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeSolo')")
//    @ApiOperation("单兵端--单人详情")
    @PostMapping("executeSolo")
    public Results executeSolo(@RequestBody RecordSoloExParam recordSoloExParam) throws ParseException {
        return recordService.executeSolo(recordSoloExParam);
    }

    /**
     * 单兵端--打卡前
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordBefore')")
    @ApiOperation("单兵端--打卡前")
    @PostMapping("recordBefore")
    public Results recordBefore(@RequestBody RecordBeforeParam recordBeforeParam) throws ParseException {
        return recordService.recordBefore(recordBeforeParam);
    }

    /**
     * 单兵端--循环
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:son')")
    @ApiOperation("单兵端--循环")
    @GetMapping("son")
    public Results son(){
        return recordService.son();
    }
}