1. 航线任务增加任务描述。

Xiajijian

2026-02-03 6ffcb1a19bd759b664e565349a7132a2b17fbf72

1. 航线任务增加任务描述。

 ard-route/src/main/java/com/ard/route/domain/route/ArdRouteMission.java

@@ -49,4 +49,7 @@
    /** 航线任务航点列表 */
    private List<ArdRoutePoint> missionDetailList;

    /** 任务描述 */
    private String taskDescription;

}

 ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java

@@ -5,6 +5,7 @@

import com.ard.common.exception.ControlException;
import com.ard.common.utils.DateUtils;
import com.ard.common.utils.SecurityUtils;
import com.ard.common.utils.file.FileUtils;
import com.ard.common.utils.uuid.IdUtils;
import com.ard.data.noflyzone.domain.ArdNoFlyZone;
@@ -36,10 +37,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;

import static com.ard.common.utils.SecurityUtils.getUsername;
import static com.ard.route.enums.kml.DroneEnumValueEnums.M350_RTK;
import static com.ard.route.util.InitializationUtils.divided_23;
import static com.ard.route.util.ToolUtils.*;
@@ -200,7 +198,7 @@
        if ("0".equals(mission.getExecuteStatus())) {
            mission.setRouteId(ardRouteInfo.getId());
            mission.setExecuteStatus("1");
            mission.setExecuteBy(getUsername());
            mission.setExecuteBy(SecurityUtils.getUsername());
            mission.setExecuteTime(DateUtils.getNowDate());
            mission.setUpdateTime(DateUtils.getNowDate());
            ardRouteMissionMapper.updateArdRouteMission(mission);

 ard-route/src/main/java/com/ard/route/service/impl/ArdRouteMissionServiceImpl.java

@@ -2,6 +2,7 @@

import java.util.List;
import com.ard.common.utils.DateUtils;
import com.ard.common.utils.SecurityUtils;
import com.ard.common.utils.uuid.IdUtils;
import com.ard.route.domain.route.ArdRouteMission;
import com.ard.route.domain.route.ArdRoutePoint;
@@ -138,7 +139,7 @@
        ArdRouteMission ardRouteMission = new ArdRouteMission();
        ardRouteMission.setId(id);
        ardRouteMission.setExecuteStatus(status);
        ardRouteMission.setExecuteBy(getUsername());
        ardRouteMission.setExecuteBy(SecurityUtils.getUsername());
        ardRouteMission.setExecuteTime(DateUtils.getNowDate());
        ardRouteMission.setUpdateTime(DateUtils.getNowDate());
        return ardRouteMissionMapper.updateArdRouteMission(ardRouteMission);

 ard-route/src/main/resources/mapper/ArdRouteMissionMapper.xml

@@ -16,6 +16,7 @@
        <result property="executeBy"    column="execute_by"    />
        <result property="executeTime"    column="execute_time"    />
        <result property="taskType"    column="task_type"    />
        <result property="taskDescription"    column="task_description"    />
    </resultMap>

    <sql id="selectArdRouteMissionVo">
@@ -29,7 +30,8 @@
               update_time,
               execute_by,
               execute_time,
               task_type
               task_type,
               task_description
        from ard_route_mission
    </sql>

@@ -43,13 +45,13 @@
            <if test="executeTime != null "> and execute_time = #{executeTime}</if>
            <if test="taskType != null  and taskType != ''"> and task_type = #{taskType}</if>
        </where>
        order by create_time asc
        order by create_time DESC
    </select>
    
    <select id="selectArdRouteMissionById" parameterType="String" resultMap="ArdRouteMissionResult">
        <include refid="selectArdRouteMissionVo"/>
        where id = #{id}
        order by create_time asc
        order by create_time DESC
    </select>

    <insert id="insertArdRouteMission" parameterType="ArdRouteMission">
@@ -66,6 +68,7 @@
            <if test="executeBy != null">execute_by,</if>
            <if test="executeTime != null">execute_time,</if>
            <if test="taskType != null">task_type,</if>
            <if test="taskDescription != null">task_description,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
@@ -79,6 +82,7 @@
            <if test="executeBy != null">#{executeBy},</if>
            <if test="executeTime != null">#{executeTime},</if>
            <if test="taskType != null">#{taskType},</if>
            <if test="taskDescription != null">#{taskDescription},</if>
         </trim>
    </insert>

@@ -95,6 +99,7 @@
            <if test="executeBy != null">execute_by = #{executeBy},</if>
            <if test="executeTime != null">execute_time = #{executeTime},</if>
            <if test="taskType != null">task_type = #{taskType},</if>
            <if test="taskDescription != null">task_description = #{taskDescription},</if>
        </trim>
        where id = #{id}
    </update>