Переглянути джерело

Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tags/v1.0.0^2
wanjing 1 рік тому
джерело
коміт
8d543f5c76
3 змінених файлів з 6 додано та 4 видалено
  1. +2
    -0
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/Inspection.java
  2. +3
    -4
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/status/UpdateFlightStatusService.java
  3. +1
    -0
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/status/UpdateInspectionStatusService.java

+ 2
- 0
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/Inspection.java Переглянути файл

import com.tuoheng.common.core.common.BaseEntity; import com.tuoheng.common.core.common.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;


@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("th_inspection") @TableName("th_inspection")
@ToString(callSuper = true)
public class Inspection extends BaseEntity { public class Inspection extends BaseEntity {


private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

+ 3
- 4
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/status/UpdateFlightStatusService.java Переглянути файл

Inspection inspectionUpdate = new Inspection(); Inspection inspectionUpdate = new Inspection();
inspectionUpdate.setId(inspection.getId()); inspectionUpdate.setId(inspection.getId());
JsonResult result = startAI(missionStatusRequest); JsonResult result = startAI(missionStatusRequest);

if (0 != result.getCode()) { if (0 != result.getCode()) {
//如果调用DSP失败就直接失败! //如果调用DSP失败就直接失败!
log.info("修改任务状态业务接口:调用DSP数据失败:{}", result.getMsg()); log.info("修改任务状态业务接口:调用DSP数据失败:{}", result.getMsg());
log.info("dsp响应体:{}", JacksonUtil.obj2StringPretty(dspCallbackVo)); log.info("dsp响应体:{}", JacksonUtil.obj2StringPretty(dspCallbackVo));


log.info("修改inspection status 开始"); log.info("修改inspection status 开始");
log.info("inspectionUpdate id : {}", inspectionUpdate.getId());
log.info("inspectionUpdate status", InspectionStatusEnum.IN_FLIGHT.getCode());
inspectionUpdate.setStatus(InspectionStatusEnum.IN_FLIGHT.getCode()); inspectionUpdate.setStatus(InspectionStatusEnum.IN_FLIGHT.getCode());
log.info("修改inspection:{}", inspectionUpdate);
log.info("inspectionUpdate:{}", inspectionUpdate);
Integer count = inspectionMapper.updateById(inspectionUpdate); Integer count = inspectionMapper.updateById(inspectionUpdate);
if (count <= 0) { if (count <= 0) {
log.info("修改inspection status 失败"); log.info("修改inspection status 失败");
} else {
log.info("修改inspection status 成功");
} }
log.info("修改inspection status 结束"); log.info("修改inspection status 结束");



+ 1
- 0
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/status/UpdateInspectionStatusService.java Переглянути файл

.eq(Inspection::getId, missionStatusRequest.getRequestId()) .eq(Inspection::getId, missionStatusRequest.getRequestId())
.eq(Inspection::getInspectionLine, missionStatusRequest.getId())); .eq(Inspection::getInspectionLine, missionStatusRequest.getId()));
if (ObjectUtil.isEmpty(inspection)) { if (ObjectUtil.isEmpty(inspection)) {
log.info("任务不存在");
return JsonResult.error(EditInspectionStatusCodeEnum.INSPECTION_IS_NOT_EXIST.getCode(), EditInspectionStatusCodeEnum.INSPECTION_IS_NOT_EXIST.getMsg()); return JsonResult.error(EditInspectionStatusCodeEnum.INSPECTION_IS_NOT_EXIST.getCode(), EditInspectionStatusCodeEnum.INSPECTION_IS_NOT_EXIST.getMsg());
} }
return JsonResult.success(inspection); return JsonResult.success(inspection);

Завантаження…
Відмінити
Зберегти