吉安感知网项目-后端
linwei
2026-05-21 1159c4ef3606f50fecdacb8933efe24efac01e88
feat(workorder): 添加设备飞手ID字段支持

- 在GdPatrolTaskEntity实体类中新增deviceFlyerId字段
- 在GdPatrolTaskVO视图对象中新增deviceFlyerId字段
- 在GdXingtuFlyTaskSaveDTO数据传输对象中新增deviceFlyerId字段
- 在GdPatrolTaskServiceImpl服务实现中添加设备飞手ID参数设置逻辑
- 在GdTaskResultServiceImpl中为任务结果设置默认分配状态值
5 files modified
20 ■■■■■ changed files
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdXingtuFlyTaskSaveDTO.java 3 ●●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java 6 ●●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java 3 ●●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdTaskResultServiceImpl.java 5 ●●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java 3 ●●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdXingtuFlyTaskSaveDTO.java
@@ -125,4 +125,7 @@
    @ApiModelProperty("任务状态:草稿、待审核、待执行、执行中、已完成、已取消、审核不通过")
    private String status;
    @ApiModelProperty("设备飞手ID")
    private String deviceFlyerId;
}
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java
@@ -81,6 +81,12 @@
     */
    @ApiModelProperty(value = "推荐飞手名称")
    private String recommendFlyerName;
    /**
     * 设备飞手ID
     */
    @ApiModelProperty(value = "设备飞手ID")
    private String deviceFlyerId;
    /**
     * 关联设备ID
     */
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
@@ -678,6 +678,9 @@
        if (StringUtil.isNotBlank(gdPatrolTaskVO.getAirportId())) {
            param.setAirportId(gdPatrolTaskVO.getAirportId());
        }
        if (StringUtil.isNotBlank(gdPatrolTaskVO.getDeviceFlyerId())) {
            param.setDeviceFlyerId(gdPatrolTaskVO.getDeviceFlyerId());
        }
        param.setStatus("待执行");
        param.setTaskType("定时飞行");
        return param;
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdTaskResultServiceImpl.java
@@ -73,6 +73,10 @@
    @Override
    public boolean saveBatchTaskResult(List<GdTaskResultEntity> gdTaskResultEntities) {
        if (gdTaskResultEntities == null || gdTaskResultEntities.isEmpty()) {
            log.error("saveBatchTaskResult-批量新增-对外接口数据为空");
            return false;
        }
        gdTaskResultEntities.forEach(gdTaskResult -> {
            String resultUrl = gdTaskResult.getResultUrl();
            // 使用HeaderUtils处理区域代码
@@ -87,6 +91,7 @@
            gdTaskResult.setIsDeleted(0);
            gdTaskResult.setCreateDept(1L);
            gdTaskResult.setUpdateUser(1L);
            gdTaskResult.setDistributeStatus(0);
        });
        // 执行批量保存并返回结果
        int result = baseMapper.insertBatch(gdTaskResultEntities);
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java
@@ -82,6 +82,9 @@
     */
    @ApiModelProperty(value = "推荐飞手名称")
    private String recommendFlyerName;
    @ApiModelProperty(value = "设备飞手ID")
    private String deviceFlyerId;
    /**
     * 关联设备ID
     */