drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdTaskResultDTO.java

@@ -84,4 +84,22 @@
    @ApiModelProperty(value = "区域编码")
    private String areaCode;

    /**
     * 数据类型：1实时回传、2历史补传
     */
    @ApiModelProperty(value = "数据类型：1实时回传、2历史补传")
    private Integer dateType;

    /**
     * 文件类型：1可见光、2热成像、3点云、4全景
     */
    @ApiModelProperty(value = "文件类型：1可见光、2热成像、3点云、4全景")
    private Integer fileType;

    /**
     * GeoJSON格式数据
     */
    @ApiModelProperty(value = "GeoJSON格式数据")
    private String geojson;

}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdXingtuFlyTaskSaveDTO.java

@@ -45,8 +45,8 @@
    @ApiModelProperty("巡检类型，字典")
    private String inspectionType;

    @ApiModelProperty("巡检类型，字典-数组格式")
    private List<String> inspectionTypeArr;
    // @ApiModelProperty("巡检类型，字典-数组格式")
    // private String inspectionTypeArr;

    @ApiModelProperty("任务类型：定时飞行、航线飞行")
    private String taskType;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java

@@ -24,9 +24,11 @@
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;

import org.sxkj.common.handler.ListToStringTypeHandler;
import org.sxkj.common.handler.StringToIntegerTypeHandler;

import java.util.Date;
import java.util.List;

/**
 * 巡查任务表 实体类
@@ -90,7 +92,8 @@

    // 算法 algorithmIds
    @ApiModelProperty("算法ids")
    private String algorithmIds;
    @TableField(typeHandler = ListToStringTypeHandler.class)
    private List<String> algorithmIds;

    /**
     * 关联设备ID

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml

@@ -26,6 +26,7 @@
        <result column="is_deleted" property="isDeleted"/>
        <result column="result_count" property="resultCount"/>
        <result column="issue_event_count" property="issueEventCount"/>
        <result column="algorithm_ids" property="algorithmIds" typeHandler="org.sxkj.common.handler.ListToStringTypeHandler"/>
    </resultMap>


@@ -88,7 +89,7 @@
        SELECT * FROM ja_gd_patrol_task ${ew.customSqlSegment}
    </select>

    <select id="getPatrolTaskIdById" resultType="org.sxkj.gd.workorder.vo.GdPatrolTaskVO">
    <select id="getPatrolTaskIdById" resultMap="gdPatrolTaskResultMap">
        SELECT
            pt.*,
            md.airport_id as airport_id
@@ -100,7 +101,7 @@
    </select>


    <select id="getPatrolTaskDetail" resultType="org.sxkj.gd.workorder.vo.GdPatrolTaskVO">
    <select id="getPatrolTaskDetail" resultMap="gdPatrolTaskResultMap">
        SELECT
            pt.*,
            md.airport_id as airport_id,

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdPatrolTaskAddParam.java

@@ -5,6 +5,7 @@
import lombok.Data;

import java.util.Date;
import java.util.List;

@Data
public class GdPatrolTaskAddParam {
@@ -63,7 +64,7 @@
    private String deviceFlyerId;
     // 算法 algorithmIds
    @ApiModelProperty("算法ids")
    private String algorithmIds;
    private List<String> algorithmIds;




 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdPatrolTaskUpdateParam.java

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

import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;

@Data
public class GdPatrolTaskUpdateParam {
@@ -73,7 +74,7 @@

    // 算法 algorithmIds
    @ApiModelProperty("算法ids")
    private String algorithmIds;
    private List<String> algorithmIds;


}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java

@@ -16,6 +16,7 @@
 */
package org.sxkj.gd.workorder.service.impl;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -643,7 +644,7 @@
            return R.fail("巡查任务不存在");
        }
        GdXingtuFlyTaskSaveDTO param = buildXingtuFlyTask(taskEntity);
        return jianXingtuApiService.saveFlyTask(param);
         return jianXingtuApiService.saveFlyTask(param);
    }

    /**
@@ -671,7 +672,7 @@
        }
        if (gdPatrolTaskVO.getExecuteTime() != null) {
            param.setSingleTime(DateUtil.format(gdPatrolTaskVO.getExecuteTime(), "yyyy-MM-dd HH:mm:ss"));
        }
         }
        if (StringUtil.isNotBlank(gdPatrolTaskVO.getAreaCode())) {
            param.setRegionCode(gdPatrolTaskVO.getAreaCode());
        }
@@ -681,13 +682,15 @@
        if (StringUtil.isNotBlank(gdPatrolTaskVO.getDeviceFlyerId())) {
            param.setDeviceFlyerId(gdPatrolTaskVO.getDeviceFlyerId());
        }
        if (StringUtil.isNotBlank(gdPatrolTaskVO.getAlgorithmIds())) {
            param.setAlgorithmId(gdPatrolTaskVO.getAlgorithmIds());
        if (gdPatrolTaskVO.getAlgorithmIds() != null && !gdPatrolTaskVO.getAlgorithmIds().isEmpty()) {
            // 将 List<String> 转换为逗号分隔的字符串
            String algorithmIdStr = String.join(",", gdPatrolTaskVO.getAlgorithmIds());
            param.setAlgorithmId(algorithmIdStr);
        }
        // 机构
        param.setDeptId(gdPatrolTaskVO.getCreateDept());
        // 巡检类型
        param.setInspectionTypeArr(Arrays.asList(gdPatrolTaskVO.getPatrolTaskType()));
        // param.setInspectionTypeArr(gdPatrolTaskVO.getPatrolTaskType());
        param.setInspectionType(gdPatrolTaskVO.getPatrolTaskType());
        // 机巢名称
        param.setAirportName(gdPatrolTaskVO.getDeviceName());

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java

@@ -20,6 +20,8 @@
import lombok.Data;
import java.util.Date;
import java.io.Serializable;
import java.util.List;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

@@ -153,8 +155,7 @@
    @ApiModelProperty(value = "纬度")
    private String latitude;

    // 算法 algorithmIds
    @ApiModelProperty("算法ids")
    private String algorithmIds;
    private List<String> algorithmIds;

}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/xingtu/JianXingtuApiService.java

@@ -1,5 +1,6 @@
package org.sxkj.gd.xingtu;

import com.alibaba.fastjson.JSON;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.redis.cache.BladeRedis;
@@ -15,6 +16,7 @@
import org.sxkj.gd.workorder.dto.GdXingtuFlyTaskSaveDTO;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;

@@ -130,7 +132,7 @@
        try {
            HttpHeaders headers = new HttpHeaders();
            headers.set("authorization", token);
            log.info("请求外部接口: {} {}", url, body);
            log.info("请求外部接口: {} {}", url, JSON.toJSONString(body));
            HttpEntity<Object> entity = new HttpEntity<>(body, headers);
            ResponseEntity<R> response = restTemplate.exchange(url, HttpMethod.POST, entity, R.class);
            log.info("响应外部接口: {}", response);