单兵端--巡检日历

Administrator

2023-08-17 a10bd6f63ab8347f7e3cb259765e159004ba19f1

单兵端--巡检日历

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

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

    /**

 ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/param/RecordMonthExParam.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
package com.ruoyi.app.patrolplan.domain.param;

import lombok.Data;

@Data
public class RecordMonthExParam {

    private String begin;
    private String end;
    private String userId;
}

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

@@ -4,6 +4,8 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolplan;
import com.ruoyi.app.patrolplan.domain.param.RecordMonthExParam;
import com.ruoyi.app.patrolplan.domain.param.RecordMonthParam;

/**
 * app巡检计划Mapper接口
@@ -55,4 +57,8 @@

    List<ArdAppPatrolplan>   executeList(ArdAppPatrolplan ardAppPatrolplan);

    List<ArdAppPatrolplan> oncePlan(RecordMonthExParam recordMonthExParam);

    List<ArdAppPatrolplan> dayPlan(RecordMonthExParam recordMonthExParam);

}

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

@@ -16,53 +16,6 @@
 */
public interface IArdAppPatrolpointRecordService 
{
    /**
     * æŸ¥è¯¢app巡检计划记录
     * 
     * @param id app巡检计划记录主键
     * @return app巡检计划记录
     */
    public ArdAppPatrolpointRecord selectArdAppPatrolpointRecordById(String id);

    /**
     * æŸ¥è¯¢app巡检计划记录列表
     * 
     * @param ardAppPatrolpointRecord app巡检计划记录
     * @return app巡检计划记录集合
     */
    public List<ArdAppPatrolpointRecord> selectArdAppPatrolpointRecordList(ArdAppPatrolpointRecord ardAppPatrolpointRecord);

    /**
     * æ–°å¢žapp巡检计划记录
     * 
     * @param ardAppPatrolpointRecord app巡检计划记录
     * @return ç»“æžœ
     */
    public int insertArdAppPatrolpointRecord(ArdAppPatrolpointRecord ardAppPatrolpointRecord);

    /**
     * ä¿®æ”¹app巡检计划记录
     * 
     * @param ardAppPatrolpointRecord app巡检计划记录
     * @return ç»“æžœ
     */
    public int updateArdAppPatrolpointRecord(ArdAppPatrolpointRecord ardAppPatrolpointRecord);

    /**
     * æ‰¹é‡åˆ é™¤app巡检计划记录
     * 
     * @param ids éœ€è¦åˆ é™¤çš„app巡检计划记录主键集合
     * @return ç»“æžœ
     */
    public int deleteArdAppPatrolpointRecordByIds(String[] ids);

    /**
     * åˆ é™¤app巡检计划记录信息
     * 
     * @param id app巡检计划记录主键
     * @return ç»“æžœ
     */
    public int deleteArdAppPatrolpointRecordById(String id);

    Results record(ArdAppPatrolpointRecord ardAppPatrolpointRecord);

@@ -72,7 +25,8 @@

    Results recordSolo(RecordSoloParam recordSoloParam);

    Results executeMonth(RecordMonthParam recordMonthParam) throws ParseException;
    Results executeMonthOld(RecordMonthParam recordMonthParam) throws ParseException;
    Results executeMonth(RecordMonthExParam recordMonthExParam) throws ParseException;

    Results executeDetails(RecordDetailsParam recordDetailsParam) throws ParseException;


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

@@ -59,73 +59,6 @@
    @Resource
    private ArdAlarmpointsWellMapper wellMapper;

    /**
     * æŸ¥è¯¢app巡检计划记录
     *
     * @param id app巡检计划记录主键
     * @return app巡检计划记录
     */
    @Override
    public ArdAppPatrolpointRecord selectArdAppPatrolpointRecordById(String id) {
        return ardAppPatrolpointRecordMapper.selectArdAppPatrolpointRecordById(id);
    }

    /**
     * æŸ¥è¯¢app巡检计划记录列表
     *
     * @param ardAppPatrolpointRecord app巡检计划记录
     * @return app巡检计划记录
     */
    @Override
    public List<ArdAppPatrolpointRecord> selectArdAppPatrolpointRecordList(ArdAppPatrolpointRecord ardAppPatrolpointRecord) {
        return ardAppPatrolpointRecordMapper.selectArdAppPatrolpointRecordList(ardAppPatrolpointRecord);
    }

    /**
     * æ–°å¢žapp巡检计划记录
     *
     * @param ardAppPatrolpointRecord app巡检计划记录
     * @return ç»“æžœ
     */
    @Override
    public int insertArdAppPatrolpointRecord(ArdAppPatrolpointRecord ardAppPatrolpointRecord) {
                ardAppPatrolpointRecord.setUserId(SecurityUtils.getUserId());
            return ardAppPatrolpointRecordMapper.insertArdAppPatrolpointRecord(ardAppPatrolpointRecord);
    }

    /**
     * ä¿®æ”¹app巡检计划记录
     *
     * @param ardAppPatrolpointRecord app巡检计划记录
     * @return ç»“æžœ
     */
    @Override
    public int updateArdAppPatrolpointRecord(ArdAppPatrolpointRecord ardAppPatrolpointRecord) {
        return ardAppPatrolpointRecordMapper.updateArdAppPatrolpointRecord(ardAppPatrolpointRecord);
    }

    /**
     * æ‰¹é‡åˆ é™¤app巡检计划记录
     *
     * @param ids éœ€è¦åˆ é™¤çš„app巡检计划记录主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteArdAppPatrolpointRecordByIds(String[] ids) {
        return ardAppPatrolpointRecordMapper.deleteArdAppPatrolpointRecordByIds(ids);
    }

    /**
     * åˆ é™¤app巡检计划记录信息
     *
     * @param id app巡检计划记录主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteArdAppPatrolpointRecordById(String id) {
        return ardAppPatrolpointRecordMapper.deleteArdAppPatrolpointRecordById(id);
    }

    @Override
    public Results record(ArdAppPatrolpointRecord ardAppPatrolpointRecord) {
        String id = IdUtils.simpleUUID();
@@ -423,7 +356,7 @@
    }

    @Override
    public Results executeMonth(RecordMonthParam RecordMonthParam) throws ParseException {
    public Results executeMonthOld(RecordMonthParam RecordMonthParam) throws ParseException {
        //获取前端参数
        String begin = RecordMonthParam.getBegin();
        String end = RecordMonthParam.getEnd();
@@ -622,4 +555,99 @@
        return Results.succeed(list);
    }

    @Override
    public Results executeMonth(RecordMonthExParam recordMonthExParam) throws ParseException {
        //获取前端参数
        String begin = recordMonthExParam.getBegin();
        String end = recordMonthExParam.getEnd();
        //返回这个
        JSONArray jsonArray = new JSONArray();
        //时间拆分
        String[] parts = end.split("[-\\s:]");
        int year = Integer.parseInt(parts[0]);
        int month = Integer.parseInt(parts[1]);
        int day = Integer.parseInt(parts[2]);
        String monthZero;
        if(month<10){
            monthZero = String.format("%02d", month);
        }else {
            monthZero = String.valueOf(month);
        }
        String userId = SecurityUtils.getUserId();
        recordMonthExParam.setUserId(userId);
        //查询该用户下需要执行的单次计划
        List<ArdAppPatrolplan> onceList = patrolplanMapper.oncePlan(recordMonthExParam);
        //查询该用户下需要执行的每日计划
        List<ArdAppPatrolplan> dayList = patrolplanMapper.dayPlan(recordMonthExParam);
        //循环一个月中的每一天
        for (int i = 1; i <= day; i++) {
            String di;
            Boolean planBoolean = false;
            Boolean recordBoolean = false;
            //记录这天计划条数
            int dayNum = 0;
            int onceNum = 0;
            //记录这天的打开地点数
            int dayWell = 0;
            int onceWell = 0;
            if (i < 10) {
                di = String.format("%02d", i);
            } else {
                di = String.valueOf(i);
            }
            //每一天
            String ymd = year + "-" + monthZero + "-" + di;
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("toDay",ymd );
            //如果每日计划有数据
            if (dayList.size() > 0) {
                for (int j = 0; j < dayList.size(); j++) {
                    String dayTime = dayList.get(j).getCreateTime();
                    String dt = dayTime.substring(0,10);
                    //如果每日计划日期等于这一天，那从这一天之后的每一天都是有计划的
                    if(dt.compareTo(ymd)<=0){
                        planBoolean =true;
                        dayNum+=1;
                        String id = dayList.get(j).getId();
                        List<ArdAlarmpointsWell> dayWells = wellMapper.wellByPlanId(id);
                        dayWell = dayWells.size();
                    }
                }
            }
            //如果单次计划有数据
            if(onceList.size()>0){
                for (int j = 0; j < onceList.size(); j++) {
                    String beginTime = onceList.get(j).getPatroBeginTime();
                    String bt = beginTime.substring(0,10);
                    if(bt.equals(ymd)){
                        planBoolean = true;
                        onceNum+=1;
                        List<ArdAlarmpointsWell> onceWells = wellMapper.wellByPlanId(onceList.get(j).getId());
                        onceWell = onceWells.size();
                    }
                }
            }
            if(planBoolean){
                //这天总任务条数
                int planNum = dayNum+onceNum;
                //这天总兴趣点数
                int wellNum = dayWell+onceWell;
                QueryWrapper<ArdAppPatrolpointRecord> queryWrapper = new QueryWrapper<>();
                queryWrapper.eq("user_id",userId).like("record_time",ymd);
                List<ArdAppPatrolpointRecord> list = ardAppPatrolpointRecordMapper.selectList(queryWrapper);
                //已打卡总条数
                int num = list.size();
                //应打卡总条数
                int record = planNum*wellNum;
                if(num==record){
                    recordBoolean = true;
                }
            }
            jsonObject.put("toDay",ymd );
            jsonObject.put("plan",planBoolean);
            jsonObject.put("record",recordBoolean);
            jsonArray.add(jsonObject);
        }
        return Results.succeed(jsonArray);
    }
}

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

@@ -144,4 +144,16 @@
        </where>
        group by ard_app_patrolplan.id
    </select>

    <select id="oncePlan" parameterType="recordMonthExParam" resultMap="ArdAppPatrolplanResult">
        select plan.* from ard_app_patrolplan plan
        LEFT JOIN ard_app_patroluser users on users.patrolplan_id = plan."id"
        where users.app_user_id = #{userId} and cycle = 'once' and patro_begin_time like #{begin} and plan.del_name is null and plan.del_time is null ;
    </select>

    <select id="dayPlan" parameterType="recordMonthExParam" resultMap="ArdAppPatrolplanResult">
        select plan.* from ard_app_patrolplan plan
                               LEFT JOIN ard_app_patroluser users on users.patrolplan_id = plan."id"
        where users.app_user_id = #{userId} and cycle = 'day' and create_time &lt; #{end} and del_name is null and del_time is null ;
    </select>
</mapper>