Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/index/IndexServiceImpl.java

@@ -26,9 +26,8 @@ public class IndexServiceImpl implements IndexService{
     @Override
     public JsonResult getAirportMsg(Integer airportId) {
         String url = CommonConfig.airportURL + "/api/airportInterface/getAirportStatus";
-        String param = "airportId" + airportId;
+        String param = "airportId=" + airportId;
         String result = HttpUtils.sendGet(url, param);
-        //JSONObject jsonObject = JSON.parseObject(result);
         JsonResult jsonResult = JacksonUtil.json2pojo(result, JsonResult.class);
         AirportMsgVo airportMsgVo = new AirportMsgVo();
         JSONObject dataObject = (JSONObject) JSONObject.toJSON(jsonResult.getData());

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

@@ -76,7 +76,7 @@ public class GetDroneDataByIdService {
             DroneDataVo droneDataVo = new DroneDataVo();
             droneDataVo.setInspectionId(flightData.getInspectionId());
             droneDataVo.setUavPower(79 + "%");
-            droneDataVo.setRange("");
+            droneDataVo.setRange(6 + "km");
             double dist = Integer.valueOf(flightData.getDistHome())/1000d;
             droneDataVo.setTargetLocation(dist+ "km");
             droneDataVo.setYsingal(flightData.getYsingal() + "%");

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

@@ -144,7 +144,8 @@ tuoheng:
   #飞手平台地址
   pilot-url: http://192.168.11.11:7011/pilot/web/
   #airport配置地址
-  airport-url: http://192.168.11.22:9060
+  #airport-url: http://192.168.11.22:9060
+  airport-url: https://airport-test.t-aaron.com
   # 文件配置
   uploads:
     #上传的服务器上的映射文件夹

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

@@ -32,7 +32,10 @@
         select
         <include refid="Base_Column_List"/>
         from op_menus
-        where mark = 1 and parent_id = 0 and client_id = #{clientId}
+        where mark = 1 and parent_id = 0
+        <if test="clientId != null and clientId !=''">
+            and client_id = #{clientId}
+        </if>
         and status = 1
         and id in (select menu_id from op_role_menu where role_id = #{roleId} and mark = 1)
         order by sort asc