Ver código fonte

Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tags/v1.2.0^2
chengwang 1 ano atrás
pai
commit
5c28c8d60e
5 arquivos alterados com 21 adições e 0 exclusões
  1. +5
    -0
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/Inspection.java
  2. +5
    -0
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/accident/AccidentFlightRequest.java
  3. +5
    -0
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/inspection/AddInspectionRequest.java
  4. +1
    -0
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/airport/PointFlightService.java
  5. +5
    -0
      tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/entity/Inspection.java

+ 5
- 0
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/Inspection.java Ver arquivo

*/ */
private Integer airportId; private Integer airportId;


/**
* 巡检无人机id
*/
private Integer droneId;

/** /**
* 巡检机场名称 * 巡检机场名称
*/ */

+ 5
- 0
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/accident/AccidentFlightRequest.java Ver arquivo

*/ */
private Integer airportId; private Integer airportId;


/**
* 巡检机场id
*/
private Integer droneId;

/** /**
* 巡检机场名称 * 巡检机场名称
*/ */

+ 5
- 0
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/inspection/AddInspectionRequest.java Ver arquivo

*/ */
private Integer airportId; private Integer airportId;


/**
* 巡检机场
*/
private Integer droneId;

/** /**
* 巡检机场名称 * 巡检机场名称
*/ */

+ 1
- 0
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/airport/PointFlightService.java Ver arquivo

inspection.setCreateTime(DateUtils.now()); inspection.setCreateTime(DateUtils.now());
inspection.setAccidentTask(1); inspection.setAccidentTask(1);
inspection.setIsLive(1); inspection.setIsLive(1);
inspection.setDroneId(request.getDroneId());
int result = inspectionMapper.insert(inspection); int result = inspectionMapper.insert(inspection);
if(result<=0){ if(result<=0){
log.info("创建应急任务失败"); log.info("创建应急任务失败");

+ 5
- 0
tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/entity/Inspection.java Ver arquivo

*/ */
private Integer airportId; private Integer airportId;


/**
* 巡检无人机id
*/
private Integer droneId;

/** /**
* 巡检机场名称 * 巡检机场名称
*/ */

Carregando…
Cancelar
Salvar