定时任务逻辑修改

guoshilong

2023-11-13 68f80a7451a126335153ec00bb6cb520a5ae1f8d

定时任务逻辑修改

 src/main/java/com/dji/sample/utils/GeoUtils.java

@@ -1,8 +1,16 @@
package com.dji.sample.utils;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dji.sample.wayline.dao.IWaylineJobMapper;
import com.dji.sample.wayline.model.dto.WaylineJobDTO;
import com.dji.sample.wayline.model.entity.WaylineJobEntity;
import com.dji.sample.wayline.model.param.PointPOJO;
import com.dji.sample.wayline.service.IWaylineJobService;
import com.dji.sample.wayline.service.impl.WaylineJobServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;

import java.util.List;
import java.util.Optional;

/**
 * 空间计算工具类

 src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java

@@ -1,14 +1,18 @@
package com.dji.sample.wayline.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dji.sample.common.model.CustomClaim;
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.log.aspect.SysLogAnnotation;
import com.dji.sample.wayline.dao.IWaylineJobMapper;
import com.dji.sample.wayline.model.dto.WaylineJobCountDTO;
import com.dji.sample.wayline.model.dto.WaylineJobDTO;
import com.dji.sample.wayline.model.entity.WaylineJobEntity;
import com.dji.sample.wayline.model.param.*;
import com.dji.sample.wayline.service.IWaylineJobService;
import com.dji.sample.wayline.service.impl.WaylineJobServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -16,6 +20,7 @@
import javax.validation.Valid;
import java.sql.SQLException;
import java.util.List;
import java.util.Optional;
import java.util.Set;

import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -89,6 +94,20 @@
    }

    /**
     * 子查询
     * @param workspaceId
     * @return
     */
    @GetMapping("/{workspace_id}/getChildrenJobs")
    @SysLogAnnotation(operModul = "计划库", operType = "查询", operDesc = "分页查询")
    public ResponseResult<List<WaylineJobDTO>> getChildrenJobs(
                                                                 @PathVariable(name = "workspace_id") String workspaceId, WaylineJobQueryParam waylineJobQueryParam) {
        List<WaylineJobDTO> data = waylineJobService.getChildrenJobs(workspaceId, waylineJobQueryParam);
        return ResponseResult.success(data);
    }


    /**
     * 查询最新的记录
     *
     * @return

 src/main/java/com/dji/sample/wayline/dao/IWaylineJobMapper.java

@@ -19,5 +19,7 @@

    WaylineJobEntity getLatest(@Param("workspaceId")String workspaceId,@Param("queryParam") WaylineJobQueryParam waylineJobQueryParam);

    List<WaylineJobEntity> getJobs(@Param("workspaceId") String workspaceId,@Param("queryParam") WaylineJobQueryParam waylineJobQueryParam);

    List<WaylineJobEntity> patrolStatistics(@Param("workspaceId") String workspaceId, @Param("queryTime") String queryTime);
}

 src/main/java/com/dji/sample/wayline/dao/IWaylineJobMapper.xml

@@ -5,9 +5,11 @@

    <select id="getPage" resultType="com.dji.sample.wayline.model.entity.WaylineJobEntity">

        SELECT job.* FROM wayline_job job
        SELECT job.*,
        ( SELECT CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END FROM wayline_job WHERE parent_id = job.id ) AS hasChildren
        FROM wayline_job job
            LEFT JOIN wayline_file file ON job.file_id = file.wayline_id
        WHERE job.workspace_id = #{workspaceId}
        WHERE job.workspace_id = #{workspaceId} and job.parent_id is NULL
            <if test="queryParam.taskType != null and queryParam.taskType!= '' or  queryParam.taskType==0 ">
                AND job.task_type = #{queryParam.taskType}
            </if>
@@ -40,6 +42,7 @@
        ORDER BY job.create_time DESC

    </select>

    <select id="getLatest" resultType="com.dji.sample.wayline.model.entity.WaylineJobEntity">
        SELECT job.* FROM wayline_job job
        WHERE job.workspace_id = #{workspaceId}
@@ -54,6 +57,49 @@


    </select>
    <select id="getJobs" resultType="com.dji.sample.wayline.model.entity.WaylineJobEntity">

        SELECT job.*
        FROM wayline_job job
        LEFT JOIN wayline_file file ON job.file_id = file.wayline_id
        WHERE job.workspace_id = #{workspaceId}
        <if test="queryParam.taskType != null and queryParam.taskType!= '' or  queryParam.taskType==0 ">
            AND job.task_type = #{queryParam.taskType}
        </if>

        <if test="queryParam.name != null and queryParam.name != '' ">
            AND (  (job.name LIKE CONCAT('%',#{queryParam.name},'%'))or(file.name LIKE CONCAT('%',#{queryParam.name},'%'))  )
        </if>

        <if test="queryParam.status != null and queryParam.status !='' ">
            AND job.status in
            <foreach collection="queryParam.status.split(',')" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>

        <if test="queryParam.startTime !=null and queryParam.endTime !=null">
            AND DATE_FORMAT(FROM_UNIXTIME(job.begin_time/1000,'%Y-%m-%d'),'%Y-%m-%d')  &gt;=  DATE_FORMAT(#{queryParam.startTime},'%Y-%m-%d')
        </if>

        <if test="queryParam.endTime !=null and queryParam.endTime !=null">
            AND DATE_FORMAT(FROM_UNIXTIME(job.end_time/1000,'%Y-%m-%d'),'%Y-%m-%d')   &lt;= DATE_FORMAT(#{queryParam.endTime},'%Y-%m-%d')
        </if>

        <if test="queryParam.dockSn != null and queryParam.dockSn != '' ">
            AND job.dock_sn in
            <foreach collection="queryParam.dockSn.split(',')" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>

        <if test="queryParam.parentId != null and queryParam.parentId !='' ">
            AND job.parent_id = (SELECT id FROM wayline_job where job_id = #{queryParam.parentId})
        </if>
        ORDER BY job.create_time DESC


    </select>
    <select id="patrolStatistics" resultType="com.dji.sample.wayline.model.entity.WaylineJobEntity">
        SELECT
            *

 src/main/java/com/dji/sample/wayline/model/dto/WaylineJobDTO.java

@@ -67,4 +67,6 @@
    private WaylineTaskConditionDTO conditions;

    private String parentId;

    private String hasChildren;
}

 src/main/java/com/dji/sample/wayline/model/entity/WaylineJobEntity.java

@@ -123,4 +123,7 @@

    @TableField("user_id")
    private String userId;

    @TableField(exist = false)
    private String hasChildren;
}

 src/main/java/com/dji/sample/wayline/model/param/WaylineJobQueryParam.java

@@ -40,4 +40,6 @@
     * 设备编码
     */
    private String dockSn;

    private String parentId;
}

 src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java

@@ -175,4 +175,12 @@
     * @param job
     */
    ResponseResult checkNextJob(WaylineJobDTO job)  throws SQLException ;

    /**
     * 根据父Id获取子项
     * @param workspaceId
     * @param waylineJobQueryParam
     * @return
     */
    List<WaylineJobDTO> getChildrenJobs(String workspaceId, WaylineJobQueryParam waylineJobQueryParam);
}

 src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java

@@ -1,6 +1,7 @@
package com.dji.sample.wayline.service.impl;

import com.alibaba.druid.stat.TableStat;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -283,108 +284,6 @@
            return response;
        }


        //新增多条数据
        //开始日期
//        String parentId = "";
//        for (int i = 0; i < param.getExecuteStartTimeArr().size(); i++) {
//            List<Long> timeArr = param.getExecuteStartTimeArr().get(i);
//
//            long beginTimeLong = 0L;
//            long endTimeLong = 0L;
//            LocalDateTime beginTime = null;
//            if (i == 0) {
//                //父,开始-结束为整个区间
//                //开始日期
//                LocalDate startDate = LocalDate.ofInstant(Instant.ofEpochSecond(param.getTaskDays().get(0)), ZoneId.systemDefault());
//                beginTimeLong = LocalDateTime.of(startDate, LocalTime.ofInstant(Instant.ofEpochSecond(param.getExecuteStartTimeArr().get(0).get(0)), ZoneId.systemDefault()))
//                        .atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
//
//                //结束日期
//                LocalDate endDate = LocalDate.ofInstant(Instant.ofEpochSecond(param.getTaskDays().get(1)), ZoneId.systemDefault());
//                endTimeLong = LocalDateTime.of(endDate, LocalTime.ofInstant(Instant.ofEpochSecond(param.getExecuteStartTimeArr().get(param.getExecuteStartTimeArr().size() - 1).get(0)), ZoneId.systemDefault()))
//                        .atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
//            } else {
//                //子,开始-结束为当前区间
//                //开始日期
//                LocalDate date = LocalDate.ofInstant(Instant.ofEpochSecond(timeArr.get(0)), ZoneId.systemDefault());
//                //任务执行开始时间
//                beginTime = LocalDateTime.of(date, LocalTime.ofInstant(Instant.ofEpochSecond(timeArr.get(0)), ZoneId.systemDefault()));
//                //任务结束时间
//                LocalDateTime endTime = timeArr.size() > 1 && Objects.nonNull(timeArr.get(1)) ?
//                        LocalDateTime.of(date, LocalTime.ofInstant(Instant.ofEpochSecond(timeArr.get(1)), ZoneId.systemDefault())) : beginTime;
//
//                beginTimeLong = beginTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
//                endTimeLong = endTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
//            }
//
//
//            //保存数据
//            WaylineJobEntity waylineJobEntity = WaylineJobEntity.builder()
//                    .parentId(parentId.equals("") ? null : parentId)
//                    .jobId(UUID.randomUUID().toString())
//                    .name(param.getName())
//                    .dockSn(param.getDockSn())
//                    .fileId(param.getFileId())
//                    .username(customClaim.getUsername())
//                    .workspaceId(customClaim.getWorkspaceId())
//
//                    .beginTime(beginTimeLong)
//                    .endTime(endTimeLong)
//                    .status(WaylineJobStatusEnum.PENDING.getVal())
//                    .taskType(param.getTaskType().getVal())
//                    .waylineType(param.getWaylineType().getVal())
//                    .outOfControlAction(param.getOutOfControlAction())
//                    .batteryCapacity(param.getMinBatteryCapacity())
//                    .rthAltitude(param.getRthAltitude())
//                    .mediaCount(0)
//                    .repFreVal(param.getRepFreVal())
//                    .repFreType(param.getRepFreType())
//                    .repRuleType(param.getRepRuleType())
//                    .repRuleVal(param.getRepRuleVal())
//                    .executeTimeArr(param.getTaskPeriods())
//                    .executeStartTimeArr(param.getExecuteStartTimeArr())
//                    .build();
//
//            Optional<WaylineJobDTO> waylineJobOpt = insertWaylineJob(waylineJobEntity);
//
//            if (waylineJobOpt.isEmpty()) {
//                throw new SQLException("任务创建失败");
//            }
//
//
//            if (i == 0) {
//                //把第一个当作父
//                parentId = waylineJobEntity.getId().toString();
//            }
//            WaylineJobDTO waylineJob = waylineJobOpt.get();
//
//            //条件任务
//            if (param.getTaskType() == WaylineTaskTypeEnum.CONDITION) {
//                //如果是条件任务类型，需要在任务参数中添加条件。
//                waylineJob.setConditions(
//                        WaylineTaskConditionDTO.builder()
//                                .executableConditions(Objects.nonNull(param.getMinStorageCapacity()) ? WaylineTaskExecutableConditionDTO.builder().storageCapacity(param.getMinStorageCapacity()).build() : null)
//                                .readyConditions(WaylineTaskReadyConditionDTO.builder()
//                                        .batteryCapacity(param.getMinBatteryCapacity())
//                                        .beginTime(beginTimeLong)
//                                        .endTime(endTimeLong)
//                                        .build())
//                                .build());
//            } else {
//                waylineJob.setBeginTime(beginTime);
//            }
//
//            if (waylineJobOpt.isEmpty()) {
//                throw new SQLException("任务创建失败");
//            }
//
//            ResponseResult response = this.publishOneFlightTask(waylineJob);
//            if (ResponseResult.CODE_SUCCESS != response.getCode()) {
//                return response;
//            }
//        }

        return ResponseResult.success();
    }

@@ -610,19 +509,7 @@

    @Override
    public PaginationData<WaylineJobDTO> getJobsByWorkspaceId(String workspaceId, long page, long pageSize, WaylineJobQueryParam waylineJobQueryParam) {
//        Page<WaylineJobEntity> pageData = mapper.selectPage(
//                new Page<WaylineJobEntity>(page, pageSize),
//                new LambdaQueryWrapper<WaylineJobEntity>()
//                        .eq(WaylineJobEntity::getWorkspaceId, workspaceId)
//                        .eq(waylineJobDTO.getTaskType() !=null, WaylineJobEntity::getTaskType, waylineJobDTO.getTaskType())
//                        .eq(waylineJobDTO.getStatus()!=null, WaylineJobEntity::getStatus, waylineJobDTO.getStatus())
//                        .like(StringUtils.hasText(waylineJobDTO.getJobName()),WaylineJobEntity::getName,waylineJobDTO.getJobName())
//
//
//                        .orderByDesc(WaylineJobEntity::getId));

        Page<WaylineJobEntity> pageData = mapper.getPage(new Page<WaylineJobEntity>(page, pageSize), waylineJobQueryParam, workspaceId);


        List<WaylineJobDTO> records = pageData.getRecords()
                .stream()
@@ -630,6 +517,18 @@
                .collect(Collectors.toList());

        return new PaginationData<WaylineJobDTO>(records, new Pagination(pageData));
    }

    @Override
    public List<WaylineJobDTO> getChildrenJobs(String workspaceId, WaylineJobQueryParam waylineJobQueryParam) {

        List<WaylineJobEntity> list= mapper.getJobs(workspaceId, waylineJobQueryParam);
        List<WaylineJobDTO> records =list
                .stream()
                .map(this::entity2Dto)
                .collect(Collectors.toList());

        return records;
    }


@@ -796,17 +695,7 @@

    @Override
    public WaylineJobEntity getLatestJob(String workspaceId, WaylineJobQueryParam waylineJobQueryParam) {
//        List<WaylineJobEntity> waylineJobEntities = mapper.selectList(new LambdaQueryWrapper<>(WaylineJobEntity.class)
//                .eq(WaylineJobEntity::getWorkspaceId, workspaceId)
//                .eq(WaylineJobEntity::getDockSn, waylineJobQueryParam.getDockSn())
//                //获取状态为待执行
//                        .eq(WaylineJobEntity::getStatus,1)
//                .orderByDesc(WaylineJobEntity::getBeginTime)
//        );

        WaylineJobEntity waylineJobEntity = mapper.getLatest(workspaceId, waylineJobQueryParam);


        return waylineJobEntity;
    }

@@ -860,38 +749,40 @@
        takeoffToPointParam.setMaxSpeed(10.0);
        takeoffToPointParam.setExitWaylineWhenRcLost(WaylineRcLostActionEnum.EXECUTE_RC_LOST_ACTION);

        //起飞
        ResponseResult responseResult = controlService.takeoffToPoint(sn, takeoffToPointParam);

        if (responseResult.getCode() != ResponseResult.CODE_SUCCESS) {
            return responseResult;
        }
        //向目标点飞行

        FlyToPointParam flyToPointParam = new FlyToPointParam();
        flyToPointParam.setMaxSpeed(14);
        List<PointDTO> pointDTOS = new ArrayList<>();
        targetList.forEach(pointPOJO -> {
            PointDTO pointDTO = new PointDTO();
            pointDTO.setHeight(150.0);
            pointDTO.setLongitude(pointPOJO.getLon());
            pointDTO.setLatitude(pointPOJO.getLat());

            pointDTOS.add(pointDTO);
        });
        flyToPointParam.setPoints(pointDTOS);
        ResponseResult responseResult1 = controlService.flyToPoint(sn, flyToPointParam);

        if (responseResult1.getCode() != ResponseResult.CODE_SUCCESS) {
            return responseResult1;
        }

        //返航
        //return_home


        return ResponseResult.success();
//        //起飞
//        ResponseResult responseResult = controlService.takeoffToPoint(sn, takeoffToPointParam);
//
//        if (responseResult.getCode() != ResponseResult.CODE_SUCCESS) {
//            return responseResult;
//        }
//        //向目标点飞行
//
//        FlyToPointParam flyToPointParam = new FlyToPointParam();
//        flyToPointParam.setMaxSpeed(14);
//        List<PointDTO> pointDTOS = new ArrayList<>();
//        targetList.forEach(pointPOJO -> {
//            PointDTO pointDTO = new PointDTO();
//            pointDTO.setHeight(150.0);
//            pointDTO.setLongitude(pointPOJO.getLon());
//            pointDTO.setLatitude(pointPOJO.getLat());
//
//            pointDTOS.add(pointDTO);
//        });
//        flyToPointParam.setPoints(pointDTOS);
//        ResponseResult responseResult1 = controlService.flyToPoint(sn, flyToPointParam);
//
//        if (responseResult1.getCode() != ResponseResult.CODE_SUCCESS) {
//            return responseResult1;
//        }
//
//        //返航
//        //return_home
//
//
//        return ResponseResult.success();
    }


    @Override
    public ResponseResult checkNextJob(WaylineJobDTO job)  throws SQLException  {
@@ -900,7 +791,10 @@
        params.setJobId(job.getJobId());


        WaylineJobEntity currentJob = mapper.selectOne(Wrappers.query(params));
        WaylineJobEntity job1 = mapper.selectOne(Wrappers.query(params));

        WaylineJobEntity currentJob = JSON.parseObject(JSON.toJSONString(job1), WaylineJobEntity.class);

        if (currentJob == null) {
            return ResponseResult.error("该任务不存在");
        }
@@ -915,7 +809,7 @@

        long currentTime = System.currentTimeMillis();
        for (int i = 0; i < executeStartTimeArr.size(); i++) {
            Long startTime = Long.valueOf(executeStartTimeArr.get(i).get(0));
            Long startTime = executeStartTimeArr.get(i).get(0)*1000;
            //如果当前时间小于开始时间
            if (currentTime < startTime) {
                //当前索引就是下一次要执行的时间
@@ -923,6 +817,11 @@
                break;
            }
        }

        if (indexTime == -1) {
            return ResponseResult.success();
        }


        List<Long> timeArr = currentJob.getExecuteStartTimeArr().get(indexTime);
        LocalDate date = LocalDate.ofInstant(Instant.ofEpochSecond(timeArr.get(0)), ZoneId.systemDefault());
@@ -1002,6 +901,8 @@

        return ResponseResult.success();
    }




    @Override
@@ -1098,7 +999,8 @@
                .waylineType(WaylineTemplateTypeEnum.find(entity.getWaylineType()))
                .rthAltitude(entity.getRthAltitude())
                .outOfControlAction(entity.getOutOfControlAction())
                .mediaCount(entity.getMediaCount());
                .mediaCount(entity.getMediaCount())
                .hasChildren(entity.getHasChildren());

        if (Objects.nonNull(entity.getEndTime())) {
            builder.endTime(LocalDateTime.ofInstant(Instant.ofEpochMilli(entity.getEndTime()), ZoneId.systemDefault()));