单兵端巡检计划

Administrator

2023-08-14 7965c2ae65b8ae7a283dc6b2a065959eafb6ba7e

单兵端巡检计划

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

@@ -79,11 +79,11 @@
    IArdAppPatrolpointRecordService recordService;

    /**
     * æŸ¥è¯¢app巡检计划列表
     * ç®¡ç†ç«¯--查询app巡检计划列表
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:list')")
    @GetMapping("/list")
    @ApiOperation("查询全部巡检列表及搜索筛选")
    @ApiOperation("管理端--查询全部巡检列表及搜索筛选")
    public Results list(ArdAppPatrolplan ardAppPatrolplan)
    {
        String userId = SecurityUtils.getUserId();
@@ -100,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);
@@ -136,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)
    {
@@ -170,34 +170,34 @@
    }

    /**
     * æ–°å¢ž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)
    @ApiOperation("修改单条数据")
    @ApiOperation("管理端--修改单条数据")
    @PutMapping("upd")
    public Results edit(@RequestBody Map<String,Object> para)
    {
@@ -243,4 +243,25 @@
    public Results recordSolo(@RequestBody ArdAppPatrolpointRecordParam ardAppPatrolpointRecordParam) throws ParseException {
        return recordService.recordSolo(ardAppPatrolpointRecordParam);
    }

    /**
     * å•å…µç«¯--查询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));
    }
}

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

 ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolplanMapper.java

@@ -53,4 +53,6 @@

    List<ArdAppPatrolplan> shouldRecord(String id);

    List<ArdAppPatrolplan>   executeList(ArdAppPatrolplan ardAppPatrolplan);

}

 ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolplanService.java

@@ -61,4 +61,6 @@

    Results oneById(String id);

    List<ArdAppPatrolplan> executeList(ArdAppPatrolplan ardAppPatrolplan);

}

 ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java

@@ -302,4 +302,9 @@
        }
    }

    @Override
    public List<ArdAppPatrolplan> executeList(ArdAppPatrolplan ardAppPatrolplan) {
        return ardAppPatrolplanMapper.executeList(ardAppPatrolplan);
    }

}

 ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml

@@ -123,4 +123,25 @@
                left join sys_user on users.app_user_id = sys_user.user_id
        where  ard_app_patrolplan.id = #{id} and del_name is null and del_time is null
    </select>

    <select id="executeList" parameterType="ArdAppPatrolplan" resultMap="ArdAppPatrolplanResult">
        <include refid="selectArdAppPatrolplanVo"/>
        left join ard_app_patrolpoint as well on ard_app_patrolplan.id = well.patrolplan_id
        left join ard_app_patroluser as users on ard_app_patrolplan.id = users.patrolplan_id
        left join sys_user on ard_app_patrolplan.user_id = sys_user.user_id
        <where>
            users.app_user_id = #{userId} and del_name is null and del_time is null
            <if test="cycle != null  and cycle != ''"> and cycle = #{cycle}</if>
            <if test="planName != null  and planName != ''"> and plan_name like '%'||#{planName}||'%'</if>
            <if test="patroBeginTime != null  and patroBeginTime != ''"> and patro_begin_time &gt;= #{patroBeginTime}</if>
            <if test="patroEndTime != null  and patroEndTime != ''"> and patro_end_time &lt;= #{patroEndTime}</if>
            <if test="wellId != null  and wellId != ''">
                and well.alarmpoints_id = #{wellId}
            </if>
            <if test="pUser != null  and pUser != ''">
                and users.app_user_id = #{pUser}
            </if>
        </where>
        group by ard_app_patrolplan.id
    </select>
</mapper>