return iInspectionService.updateTaskByCode(request); | return iInspectionService.updateTaskByCode(request); | ||||
} | } | ||||
/** | |||||
* 取消任务 | |||||
* | |||||
* @param id | |||||
* @return | |||||
*/ | |||||
@PostMapping("/cancelTask/{id}") | |||||
public JsonResult cancelTask(@PathVariable("id") String id) { | |||||
log.info("进入取消任务接口, id={}", id); | |||||
return iInspectionService.cancelTask(id); | |||||
} | |||||
} | } |
INSPECTION_IS_NOT_EXIST(1230308, "任务不存在"), | INSPECTION_IS_NOT_EXIST(1230308, "任务不存在"), | ||||
INSPECTION_IS_NOT_WAIT_FLIGHT(1230309, "非待飞行任务,不可修改"), | INSPECTION_IS_NOT_WAIT_FLIGHT(1230309, "非待飞行任务,不可修改"), | ||||
INSPECTION_IS_EXECUTED(1230310, "任务已执行,不可修改"), | INSPECTION_IS_EXECUTED(1230310, "任务已执行,不可修改"), | ||||
INSPECTION_IS_NOT_TO_BE_EXECUTED(1230314, "任务不是待执行状态,不可取消"), | |||||
INSPECTION_CANCEL_FAILED(1230315, "任务取消失败"), | |||||
ROAD_IS_NOT_EXIST(1230311, "公路不存在"), | ROAD_IS_NOT_EXIST(1230311, "公路不存在"), | ||||
SECTION_IS_NOT_EXIST(1230312, "路段不存在"), | SECTION_IS_NOT_EXIST(1230312, "路段不存在"), | ||||
NON_DEPT_ADMIN_NOT_EDIT(1230313, "非本部门管理员不能修改"); | NON_DEPT_ADMIN_NOT_EDIT(1230313, "非本部门管理员不能修改"); |
Inspection selectInspectionByAirport(@Param("id") Integer id); | Inspection selectInspectionByAirport(@Param("id") Integer id); | ||||
int cancelTask(Inspection inspection); | |||||
} | } |
*/ | */ | ||||
private Integer airportId; | private Integer airportId; | ||||
/** | |||||
* 巡检机场名称 | |||||
*/ | |||||
private Integer airportName; | |||||
/** | /** | ||||
* 航线id | * 航线id | ||||
*/ | */ | ||||
private Integer airportLineId; | private Integer airportLineId; | ||||
/** | |||||
* 航线名称 | |||||
*/ | |||||
private Integer inspectionLineName; | |||||
/** | /** | ||||
* 航线长度 | * 航线长度 | ||||
*/ | */ |
import com.tuoheng.common.core.common.BaseQuery; | import com.tuoheng.common.core.common.BaseQuery; | ||||
import lombok.Data; | import lombok.Data; | ||||
import org.springframework.format.annotation.DateTimeFormat; | |||||
import java.util.List; | import java.util.List; | ||||
private Integer inspectionLine; | private Integer inspectionLine; | ||||
/** | /** | ||||
* 巡检任务类型: 1 临时巡检 2 应急任务 | |||||
* 巡检任务类型: 0:周期巡检 1: 临时巡检 2: 应急巡检 | |||||
*/ | */ | ||||
private Integer type; | private Integer type; | ||||
*/ | */ | ||||
private String tenantId; | private String tenantId; | ||||
/** | |||||
* 周期性任务Id | |||||
*/ | |||||
private String inspectionCycleId; | |||||
/** | |||||
* 计划巡检开始时间 | |||||
*/ | |||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") | |||||
private String inspectionTimeBegin; | |||||
/** | |||||
* 计划巡检截止时间 | |||||
*/ | |||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") | |||||
private String inspectionTimeEnd; | |||||
/** | |||||
* 单次任务标识(0:否、1:是),单次任务只查询“待执行”状态的单次任务 | |||||
*/ | |||||
private Integer singleTask; | |||||
/** | |||||
* 实际巡检开始时间 | |||||
*/ | |||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") | |||||
private String executionTimeBegin; | |||||
/** | |||||
* 实际巡检截止时间 | |||||
*/ | |||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") | |||||
private String executionTimeEnd; | |||||
} | } |
* @return | * @return | ||||
*/ | */ | ||||
JsonResult videoByAirportId(Integer id); | JsonResult videoByAirportId(Integer id); | ||||
/** | |||||
* 根据任务id,若状态为“待执行”则可取消此任务 | |||||
* @param inspectionId | |||||
* @return | |||||
*/ | |||||
JsonResult cancelTask(String inspectionId); | |||||
} | } |
return queryVideoService.videoByAirportId(id); | return queryVideoService.videoByAirportId(id); | ||||
} | } | ||||
/** | |||||
* 根据任务id,若状态为“待执行”则可取消此任务 | |||||
* @param inspectionId | |||||
* @return | |||||
*/ | |||||
@Override | |||||
public JsonResult cancelTask(String inspectionId) { | |||||
return updateInspectionService.cancelTask(inspectionId); | |||||
} | |||||
} | } |
} | } | ||||
return JsonResult.success(); | return JsonResult.success(); | ||||
} | } | ||||
/** | |||||
* 根据任务id,若状态为“待执行”则可取消此任务 | |||||
* | |||||
* @param inspectionId | |||||
* @return | |||||
*/ | |||||
public JsonResult cancelTask(String inspectionId) { | |||||
log.info("进入取消任务业务接口"); | |||||
if (ObjectUtil.isEmpty(inspectionId)) { | |||||
log.info("取消任务业务接口:校验失败:{}", "任务ID为空"); | |||||
return JsonResult.error(EditInspectionCodeEnum.ID_IS_NULL.getCode(), EditInspectionCodeEnum.ID_IS_NULL.getMsg()); | |||||
} | |||||
// 查询巡检任务当前信息 | |||||
Inspection inspection = inspectionMapper.selectById(inspectionId); | |||||
if (ObjectUtil.isNull(inspection)) { | |||||
log.info("取消任务业务接口:校验失败:{}", "任务不存在"); | |||||
return JsonResult.error(EditInspectionCodeEnum.INSPECTION_IS_NOT_EXIST.getCode(), EditInspectionCodeEnum.INSPECTION_IS_NOT_EXIST.getMsg()); | |||||
} | |||||
// 任务不是“待执行”状态,不可取消 | |||||
if (InspectionStatusEnum.WAIT_FLIGHT.getCode() != inspection.getStatus()) { | |||||
log.info("取消任务业务接口:取消任务失败:{}", "任务不是待执行状态,不可取消"); | |||||
return JsonResult.error(EditInspectionCodeEnum.INSPECTION_IS_NOT_TO_BE_EXECUTED.getCode(), EditInspectionCodeEnum.INSPECTION_IS_NOT_TO_BE_EXECUTED.getMsg()); | |||||
} | |||||
// 任务为“待执行”状态,可取消 | |||||
User user = CurrentUserUtil.getUserInfo(); | |||||
inspection.setExecutionStartTime(DateUtils.now()); | |||||
inspection.setUpdateUser(user.getId()); | |||||
inspection.setUpdateTime(DateUtils.now()); | |||||
int rowId = inspectionMapper.cancelTask(inspection); | |||||
log.info("取消任务业务接口, 返回结果: rowId={}", rowId); | |||||
if (rowId <= 0) { | |||||
log.info("取消任务业务接口:取消任务失败"); | |||||
return JsonResult.error(EditInspectionCodeEnum.INSPECTION_CANCEL_FAILED.getCode(), EditInspectionCodeEnum.INSPECTION_CANCEL_FAILED.getMsg()); | |||||
} | |||||
log.info("取消任务业务接口:取消任务成功:{}", inspection); | |||||
return JsonResult.success(); | |||||
} | |||||
} | } |
delete from th_inspection where id = #{id} | delete from th_inspection where id = #{id} | ||||
</delete> | </delete> | ||||
<update id="cancelTask" parameterType="com.tuoheng.admin.entity.Inspection"> | |||||
update th_inspection | |||||
set status = 16, | |||||
update_user = #{updateUser}, | |||||
update_time = #{updateTime}, | |||||
execution_start_time = #{executionStartTime} | |||||
where status = 5 | |||||
and mark = 1 | |||||
and tenant_id = #{tenantId} | |||||
and id = #{id} | |||||
</update> | |||||
</mapper> | </mapper> |