liusuyi
2024-04-28 d1ebb26ab19f83f32c5314771a5381db6f1b2a6d
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
@@ -7,12 +7,10 @@
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
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;
@@ -20,13 +18,11 @@
import com.ruoyi.app.patrolplan.service.IArdAppPatroluserService;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jdk.nashorn.internal.ir.annotations.Reference;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -235,10 +231,10 @@
    }
    /**
     * 管理端--单人详情
     * 单人详情
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordSolo')")
    @ApiOperation("管理端--单人详情")
    @ApiOperation("单人详情")
    @PostMapping("recordSolo")
    public Results recordSolo(@RequestBody RecordSoloParam recordSoloParam) throws ParseException {
        return recordService.recordSolo(recordSoloParam);
@@ -292,18 +288,37 @@
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeDetails')")
    @ApiOperation("单兵端--点击日历获取该人员下所有地点打卡记录")
    @PostMapping("executeDetails")
    public Results executeDetails(@RequestBody RecordDetailsParam recordDetailsParam) throws ParseException {
        return recordService.executeDetails(recordDetailsParam);
    public Results executeDetails(@RequestBody RecordDetailsExParam recordDetailsExParam) throws ParseException {
        return recordService.executeDetails(recordDetailsExParam);
    }
    /**
     * 单兵端--单人详情
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeSolo')")
    @ApiOperation("单兵端--单人详情")
//    @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();
    }
}