Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-24 457e566525d57ce0904e00aab9298ab0693ad5a1

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

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

import java.text.ParseException;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
@@ -12,6 +13,9 @@
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
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.*;
import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointRecordService;
import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointService;
import com.ruoyi.app.patrolplan.service.IArdAppPatroluserService;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -71,14 +75,19 @@
    @Resource
    IArdAlarmpointsWellService wellService;

    @Resource
    IArdAppPatrolpointRecordService recordService;

    /**
     * 查询app巡检计划列表
     * 管理端--查询app巡检计划列表
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:list')")
    @GetMapping("/list")
    @ApiOperation("查询全部巡检列表及搜索筛选")
    @ApiOperation("管理端--查询全部巡检列表及搜索筛选")
    public Results list(ArdAppPatrolplan ardAppPatrolplan)
    {
        String userId = SecurityUtils.getUserId();
        ardAppPatrolplan.setUserId(userId);
        if(ardAppPatrolplan.getPageNum()==null || ardAppPatrolplan.getPageNum() == 0){
            ardAppPatrolplan.setPageNum(1);
        }
@@ -91,12 +100,12 @@
    }

    /**
     * 导出app巡检计划列表
     * 管理端--导出app巡检计划列表
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:export')")
    @Log(title = "app巡检计划", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    @ApiOperation("导出全部巡检列表")
    @ApiOperation("管理端--导出全部巡检列表")
    public void export(HttpServletResponse response, ArdAppPatrolplan ardAppPatrolplan)
    {
        List<ArdAppPatrolplan> list = ardAppPatrolplanService.selectArdAppPatrolplanList(ardAppPatrolplan);
@@ -127,12 +136,12 @@
    }

    /**
     * 删除app巡检计划
     * 管理端--删除app巡检计划
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:remove')")
    @Log(title = "app巡检计划", businessType = BusinessType.DELETE)
    @DeleteMapping("/{id}")
    @ApiOperation("删除app巡检计划")
    @ApiOperation("管理端--删除app巡检计划")
    //public Results remove(@PathVariable String id)
    public AjaxResult remove(@PathVariable String id)
    {
@@ -161,38 +170,159 @@
    }

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

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

    /**
     * 修改app巡检计划
     * 管理端--修改app巡检计划
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:edit')")
    @Log(title = "app巡检计划", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ArdAppPatrolplan ardAppPatrolplan)
    @ApiOperation("管理端--修改单条数据")
    @PutMapping("upd")
    public Results edit(@RequestBody Map<String,Object> para)
    {
        return toAjax(ardAppPatrolplanService.updateArdAppPatrolplan(ardAppPatrolplan));
        return ardAppPatrolplanService.updateArdAppPatrolplan(para);
    }

    /**
     * 巡检打卡
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:record')")
    @ApiOperation("巡检打卡")
    @PostMapping("record")
    public Results edit(@RequestBody ArdAppPatrolpointRecord ardAppPatrolpointRecord) {
        return recordService.record(ardAppPatrolpointRecord);
    }

    /**
     * 管理端--巡检日历
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordMonth')")
    @ApiOperation("管理端--巡检日历")
    @PostMapping("recordMonth")
    public Results recordMonth(@RequestBody RecordMonthParam recordMonthParam) throws ParseException {
        return recordService.recordMonth(recordMonthParam);
    }

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

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

    /**
     * 单兵端--查询app巡检计划列表
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeList')")
    @GetMapping("/executeList")
    @ApiOperation("单兵端--查询该用户下所有执行计划及搜索筛选")
    public Results executeList(ArdAppPatrolplan ardAppPatrolplan)
    {
        String userId = SecurityUtils.getUserId();
        ardAppPatrolplan.setUserId(userId);
        if(ardAppPatrolplan.getPageNum()==null || ardAppPatrolplan.getPageNum() == 0){
            ardAppPatrolplan.setPageNum(1);
        }
        if(ardAppPatrolplan.getPageSize()==null || ardAppPatrolplan.getPageSize() == 0){
            ardAppPatrolplan.setPageSize(10);
        }
        PageHelper.startPage(ardAppPatrolplan.getPageNum(),ardAppPatrolplan.getPageSize());
        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();
    }
}