修改直播视频地址playUrl

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/request/inspection/QueryInspectionPageListRequest.java

@@ -23,13 +23,6 @@ public class QueryInspectionPageListRequest extends BaseQuery {
      */
     private String name;
 
-    /**
-     * 计划巡检日期
-     */
-//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-//    private Date inspectionTime;
-
     /**
      * 计划巡检开始时间
      */
@@ -49,4 +42,9 @@ public class QueryInspectionPageListRequest extends BaseQuery {
      */
     private String tenantId;
 
+    /**
+     * 标识
+     */
+    private Integer status;
+
 }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/airport/reversal/ReversalFlightService.java

@@ -55,7 +55,6 @@ public class ReversalFlightService {
 
     private JsonResult getReversalFlight(Inspection inspection) {
         log.info("执行无人机回仓");
-        inspection.setStatus(InspectionStatusEnum.FLIGHT_COMPLETED.getCode());
         inspection.setUpdateTime(DateUtils.now());
         inspection.setUpdateUser(CurrentUserUtil.getUserId());
         int count = inspectionMapper.updateById(inspection);

tuoheng-service/tuoheng-admin/src/main/resources/mapper/InspectionMapper.xml

@@ -95,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="request.tenantId != null and request.tenantId != ''"> and tenant_id = #{request.tenantId} </if>
             <if test="request.beginTime != null"> and inspection_time &gt;= #{request.beginTime} </if>
             <if test="request.endTime != null"> and inspection_time &lt;= #{request.endTime} </if>
+            <if test="request.status != null"> and status = #{request.status} </if>
             <if test="request.name != null and request.name != ''"> and name like concat('%', #{request.name}, '%') </if>
         </where>
         order by create_time desc