Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/vo/LiveChannelVo.java

@@ -14,8 +14,19 @@ public class LiveChannelVo {
      */
     private String aipullUrl;
 
+    /**
+     * 直播地址
+     */
+    private String pullUrl;
+
+
     /**
      * AI识别后视频地址
      */
     private String aiVideoUrl;
+
+    /**
+     * 回放视频地址
+     */
+    private String videoUrl;
 }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/vo/VideoUrlVo.java

@@ -12,7 +12,7 @@ public class VideoUrlVo {
     /**
      * 直播视频url
      */
-    private String aipullUrl;
+    private String pullUrl;
 
     /**
      * 机场外部监控地址

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/enums/code/inspection/QueryVideoServiceEnum.java

@@ -9,8 +9,8 @@ public enum QueryVideoServiceEnum {
     QUERY_IS_FAILED(1230700, "获取数据失败"),
     INSPECTION_ID_IS_NULL(1230701, "任务id为空"),
     LIVE_CHANNEL_IS_NOT_EXIST(1230702, "直播通道为空"),
-    AIPULL_URL_IS_NULL(1230703, "直播地址为空"),
-    AIVIDEO_URL_IS_NULL(1230704, "回放地址为空"),
+    PULL_URL_IS_NULL(1230703, "直播地址为空"),
+    VIDEO_URL_IS_NULL(1230704, "回放地址为空"),
     DRONE_ID_IS_NULL(1230705, "无人机id为空"),
     INSPECTION_IS_NOT_EXIST(1230706, "任务不存在");
 

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/QueryVideoService.java

@@ -71,17 +71,19 @@ public class QueryVideoService {
             if (ObjectUtil.isNull(liveChannel)) {
                 return JsonResult.error(QueryVideoServiceEnum.LIVE_CHANNEL_IS_NOT_EXIST.getCode(), QueryVideoServiceEnum.LIVE_CHANNEL_IS_NOT_EXIST.getMsg());
             }
-            if (StringUtils.isEmpty(liveChannel.getAipullUrl())) {
-                return JsonResult.error(QueryVideoServiceEnum.AIPULL_URL_IS_NULL.getCode(), QueryVideoServiceEnum.AIPULL_URL_IS_NULL.getMsg());
+            if (StringUtils.isEmpty(liveChannel.getPullUrl())) {
+                return JsonResult.error(QueryVideoServiceEnum.PULL_URL_IS_NULL.getCode(), QueryVideoServiceEnum.PULL_URL_IS_NULL.getMsg());
             }
             liveChannelVo.setAipullUrl(liveChannel.getAipullUrl());
+            liveChannelVo.setPullUrl(liveChannel.getPullUrl());
 
         }
         if (15 == inspection.getStatus()) {
             //任务状态为任务飞行完成15视频回放
             if (StringUtils.isEmpty(inspection.getAiVideoUrl())) {
-                return JsonResult.error(QueryVideoServiceEnum.AIVIDEO_URL_IS_NULL.getCode(), QueryVideoServiceEnum.AIVIDEO_URL_IS_NULL.getMsg());
+                return JsonResult.error(QueryVideoServiceEnum.VIDEO_URL_IS_NULL.getCode(), QueryVideoServiceEnum.VIDEO_URL_IS_NULL.getMsg());
             }
+            liveChannelVo.setVideoUrl(CommonConfig.videoURL + inspection.getVideoUrl());
             liveChannelVo.setAiVideoUrl(CommonConfig.videoURL + inspection.getAiVideoUrl());
         }
         return JsonResult.success(liveChannelVo);
@@ -115,8 +117,8 @@ public class QueryVideoService {
                 .eq(LiveChannel::getInspectionId, inspection.getId())
                 .eq(LiveChannel::getStatus, 1));
         if (ObjectUtil.isNotNull(liveChannel)) {
-            if (StringUtils.isNotEmpty(liveChannel.getAipullUrl())) {
-                vo.setAipullUrl(liveChannel.getAipullUrl());
+            if (StringUtils.isNotEmpty(liveChannel.getPullUrl())) {
+                vo.setPullUrl(liveChannel.getPullUrl());
             }
         }
         //获取机场内外部视频

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/system/role/RoleServiceImpl.java

@@ -90,7 +90,7 @@ public class RoleServiceImpl implements IRoleService {
         }
         queryWrapper.eq("mark", MarkEnum.VALID.getCode());
         //queryWrapper.orderByAsc("sort");
-        queryWrapper.orderByAsc("create_time");
+        queryWrapper.orderByDesc("create_time");
         queryWrapper.ne("id", "1");
         // 查询分页数据
         IPage<Role> pageData = roleMapper.selectPage(page, queryWrapper);

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/system/user/query/QueryUserPageListService.java

@@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -115,6 +116,8 @@ public class QueryUserPageListService {
                 }
             }
         }
+        //对list排序
+        userPageListVoList = userPageListVoList.stream().sorted(Comparator.comparing(UserPageListVo::getCreateTime).reversed()).collect(Collectors.toList());
         return userPageListVoList;
     }
 

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

@@ -35,14 +35,14 @@ public class GetAirportDetailService {
             vo.setWspd(parmJson.getString("WSPD") + "m/s")
                     .setWdir(parmJson.getString("WDIRNAME"))
                     .setHpa(parmJson.getString("Hpa") + "Mpa")
-                    .setHum(parmJson.getString("Hum") + "rh")
-                    .setRainfull(parmJson.getString("Rainfull"))
+                    .setHum(parmJson.getString("Hum") + "%rh")
+                    .setRainfull(parmJson.getString("Rainfull") + "mm")
                     .setTmp(parmJson.getString("Tmp") + "℃");
         }
         JSONObject tahJson = dataObject.getJSONObject("TAH");
         if (Objects.nonNull(tahJson)) {
             JSONObject parmJson = tahJson.getJSONObject("parmNew");
-            vo.setHum(parmJson.getString("Hum") + "rh")
+            vo.setHum(parmJson.getString("Hum") + "%rh")
                     .setTmp(parmJson.getString("Tmp") + "℃");
 
         }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/pilot/AddPilotTaskService.java

@@ -46,7 +46,6 @@ public class AddPilotTaskService {
 
         //直播 大气飞手任务只有直播
         pilotTaskRequest.setIsLive(1);
-        //pilotTaskRequest.setIsLive(inspection.getIsLive());
 
         //经纬度
         pilotTaskRequest.setStartLatitude(inspection.getStartLatitude());