Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_telecomumale into develop

tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/config/common/CommonConfig.java

@@ -68,11 +68,6 @@ public class CommonConfig {
      */
     public static String templateId;
 
-    /**
-     * 天翼星云地址
-     */
-    public static String tianYiUrl;
-
     /**
      * 小程序 appId赋值
      *
@@ -193,14 +188,4 @@ public class CommonConfig {
         wechatURL = url;
     }
 
-
-    /**
-     * 天翼url
-     * @param url
-     */
-    @Value("${tuoheng.tianyi-url}")
-    public void tianYiUrl(String url) {
-        tianYiUrl = url;
-    }
-
 }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/tzhl/service/CallTianYiPlatformService.java

@@ -36,7 +36,7 @@ public class CallTianYiPlatformService {
             throw new ServiceException(HttpStatus.BAD_REQUEST.value(), "token不能为空");
         }
 
-        String url = CommonConfig.tianYiUrl + apiPath;
+        String url = TZHLConfig.tzhlURL + apiPath;
         String properties = "Bearer " + token;
         HttpHeaders headers = new HttpHeaders();
         headers.add("Authorization", properties);

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/tzhl/task/FlyDataTask.java

@@ -38,8 +38,6 @@ public class FlyDataTask {
                 .eq(Inspection::getMark, MarkEnum.VALID.getCode())
                 //查询巡检方式为机场的任务
                 .eq(Inspection::getInspectionType, InspectionTypeEnum.AIRPORT.getCode())
-                //查询未执行任务
-                .eq(Inspection::getExecutionStatus, 1)
                 //任务飞行中
                 .eq(Inspection::getStatus, InspectionStatusEnum.IN_FLIGHT.getCode()));
         if (StringUtils.isEmpty(inspectionList)) {

tuoheng-service/tuoheng-admin/src/main/resources/application-dev.yml

@@ -160,8 +160,6 @@ tuoheng:
   airport-url: http://192.168.11.22:9060
   #小程序配置地址
   wechat-url: http://192.168.11.11:9151
-  #天翼星云配置地址
-  tianyi-url: http://221.230.150.241:8889
   # 文件配置
   uploads:
     #上传的服务器上的映射文件夹

tuoheng-service/tuoheng-admin/src/main/resources/application-local.yml

@@ -172,8 +172,6 @@ tuoheng:
   airport-url: http://192.168.11.22:9060
   #小程序配置地址
   wechat-url: http://192.168.11.11:9151
-  #天翼星云配置地址
-  tianyi-url: http://221.230.150.241:8889
   # 文件配置
   uploads:
     #上传的服务器上的映射文件夹

tuoheng-service/tuoheng-admin/src/main/resources/application-prod.yml

@@ -161,8 +161,6 @@ tuoheng:
   airport-url: https://airport.t-aaron.com
   #小程序配置地址
   wechat-url: https://telecomumale-miniprogram.t-aaron.com
-  #天翼星云配置地址
-  tianyi-url: http://221.230.150.241:8889
   # 文件配置
   uploads:
     #上传的服务器上的映射文件夹

tuoheng-service/tuoheng-admin/src/main/resources/application-test.yml

@@ -161,8 +161,6 @@ tuoheng:
   airport-url: https://airport-test.t-aaron.com
   #小程序配置地址
   wechat-url: https://telecomumale-miniprogram-test.t-aaron.com
-  #天翼星云配置地址
-  tianyi-url: http://221.230.150.241:8889
   # 文件配置
   uploads:
     #上传的服务器上的映射文件夹

tuoheng-service/tuoheng-admin/src/test/java/com/tuoheng/admin/tzhl/TZHLFlyDataServiceTest.java

@@ -23,8 +23,8 @@ public class TZHLFlyDataServiceTest {
     private FlyDataService flyDataService;
 
     @Test
-    public void testFlyLog() {
-        String id = "da5da2c67dc152de5e43c7e7a104bfcf";
+    public void testFlyData() {
+        String id = "d51d654e4b8aae6533cbdd997af100d9";
         Inspection inspection = inspectionMapper.selectById(id);
         flyDataService.getFlyData(inspection);
     }