吉安感知网项目-后端
linwei
2026-06-03 77e38d8665ccebaa3ae9ed0db3dd822190d68878
refactor(workorder): 回滚代码
3 files modified
15 ■■■■■ changed files
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdXingtuFlyTaskSaveDTO.java 4 ●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java 9 ●●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/xingtu/JianXingtuApiService.java 2 ●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdXingtuFlyTaskSaveDTO.java
@@ -46,7 +46,7 @@
    private String inspectionType;
    @ApiModelProperty("巡检类型,字典-数组格式")
    private String patrolTaskType;
    private String inspectionTypeArr;
    @ApiModelProperty("任务类型:定时飞行、航线飞行")
    private String taskType;
@@ -56,8 +56,6 @@
    @ApiModelProperty("单次任务执行时间")
    private String singleTime;
    private String executeTime;
    @ApiModelProperty("周期(自定义)执行开始日期")
    private String startDate;
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
@@ -644,9 +644,7 @@
            return R.fail("巡查任务不存在");
        }
        GdXingtuFlyTaskSaveDTO param = buildXingtuFlyTask(taskEntity);
        List<GdXingtuFlyTaskSaveDTO> paramList = new ArrayList<>();
        paramList.add(param);
        return jianXingtuApiService.saveFlyTask(paramList);
         return jianXingtuApiService.saveFlyTask(param);
    }
    /**
@@ -674,8 +672,7 @@
        }
        if (gdPatrolTaskVO.getExecuteTime() != null) {
            param.setSingleTime(DateUtil.format(gdPatrolTaskVO.getExecuteTime(), "yyyy-MM-dd HH:mm:ss"));
            param.setExecuteTime(DateUtil.format(gdPatrolTaskVO.getExecuteTime(), "yyyy-MM-dd HH:mm:ss"));
        }
         }
        if (StringUtil.isNotBlank(gdPatrolTaskVO.getAreaCode())) {
            param.setRegionCode(gdPatrolTaskVO.getAreaCode());
        }
@@ -691,7 +688,7 @@
        // 机构
        param.setDeptId(gdPatrolTaskVO.getCreateDept());
        // 巡检类型
        param.setPatrolTaskType(gdPatrolTaskVO.getPatrolTaskType());
        param.setInspectionTypeArr(gdPatrolTaskVO.getPatrolTaskType());
        param.setInspectionType(gdPatrolTaskVO.getPatrolTaskType());
        // 机巢名称
        param.setAirportName(gdPatrolTaskVO.getDeviceName());
drone-service/drone-gd/src/main/java/org/sxkj/gd/xingtu/JianXingtuApiService.java
@@ -110,7 +110,7 @@
     * @param param 请求参数
     * @return 接口响应
     */
    public R saveFlyTask(List<GdXingtuFlyTaskSaveDTO> param) {
    public R saveFlyTask(GdXingtuFlyTaskSaveDTO param) {
        String url = JianXingTuApiClient.getFlyTaskSaveUrl();
        return postWithAuthHeader(url, param);
    }