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

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/java/com/tuoheng/admin/service/third/dsp/DspCallbackServiceImpl.java

@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.tuoheng.admin.entity.*;
 import com.tuoheng.admin.enums.*;
-import com.tuoheng.admin.enums.code.questiontype.QuestionTypeEnum;
 import com.tuoheng.admin.mapper.*;
 import com.tuoheng.admin.request.third.DspCallbackRequest;
 import com.tuoheng.admin.request.third.QuestionFile;
@@ -301,11 +300,13 @@ public class DspCallbackServiceImpl implements IDspCallbackService {
         for (InspectionFile inspectionFile : inspectionFileList) {
             Accident accident = new Accident();
             //问题类型为应急类型时添加数据
-            if(inspectionFile.getQuestionCode().equals(QuestionCodeEnum.TURN_OVER.getCode()) || inspectionFile.getQuestionCode().equals(QuestionCodeEnum.REAR_END_COLLISION.getCode())){
+            if(inspectionFile.getQuestionCode().equals(QuestionCodeEnum.PONDING.getCode())
+                    || inspectionFile.getQuestionCode().equals(QuestionCodeEnum.BIOCKY_CRACK.getCode())){
                 accident.setTenantId(inspectionFile.getTenantId());
                 accident.setDeptId(deptId);
                 accident.setInspectionId(inspectionFile.getInspectionId());
                 accident.setInspectionFileId(inspectionFile.getId());
+                //应急任务id
                 accident.setAccidentInspectionId(inspectionFile.getInspectionId());
                 //根据巡检任务查询对应的公路id
                 Inspection inspection = inspectionMapper.selectById(inspectionFile.getInspectionId());

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/oidc/OidcServiceImpl.java

@@ -7,7 +7,9 @@ import com.tuoheng.admin.query.RoleClientQuery;
 import com.tuoheng.admin.request.third.oidc.CreateOidcTenantRequest;
 import com.tuoheng.admin.request.third.oidc.DeletedOidcTenantRequest;
 import com.tuoheng.admin.request.third.oidc.EditOidcTenantRequest;
+import com.tuoheng.admin.service.permissions.OpPermissionsService;
 import com.tuoheng.admin.service.role.IRoleService;
+import com.tuoheng.admin.service.role.OpRolePermissionService;
 import com.tuoheng.common.core.utils.JsonResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +39,8 @@ public class OidcServiceImpl implements OidcService {
 
     @Autowired
     private IRoleService roleService;
+    @Autowired
+    private OpPermissionsService opPermissionsService;
 
 
     public JsonResult addUser(User user, String password, Tenant tenant) {
@@ -89,6 +93,6 @@ public class OidcServiceImpl implements OidcService {
 
         RoleClientQuery query = new RoleClientQuery();
         query.setRoleId(roleId);
-        return roleService.getMenuList(query);
+        return opPermissionsService.getRolePermissionByRoleId(query);
     }
 }

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