Merge remote-tracking branch 'origin/master_tuzuo' into master_tuzuo

src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/controller/AppXunjianController.java

@@ -53,7 +53,7 @@ public class AppXunjianController {
     }
 
     @RequestMapping("getItems")
-    public AjaxResult getItems(AppXunjianVO vo) {
+    public AjaxResult getItems(@RequestBody AppXunjianVO vo) {
         return appXunjianService.getItems(vo);
     }
 

src/main/java/com/sooka/sponest/data/emergency/domain/TBusTrack.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.emergency.domain;
 
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -11,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author ruoyi
  * @date 2022-11-15
  */
-public class TBusTrack extends BaseEntity
+public class TBusTrack extends BaseBusinessEntity
 {
     private static final long serialVersionUID = 1L;
 

src/main/java/com/sooka/sponest/data/emergency/service/impl/TBusInspectionServiceImpl.java

@@ -2,10 +2,10 @@ package com.sooka.sponest.data.emergency.service.impl;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.datascope.annotation.DataScope;
+import com.ruoyi.system.api.RemoteConfigService;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.emergency.domain.*;
 import com.sooka.sponest.data.emergency.mapper.*;
-import com.sooka.sponest.data.emergency.remoteapi.service.center.data.RemoteSystemBaseService;
 import com.sooka.sponest.data.emergency.service.ITBusInspectionService;
 import org.springframework.stereotype.Service;
 
@@ -41,7 +41,7 @@ public class TBusInspectionServiceImpl extends BaseServiceImpl implements ITBusI
     private TAttachMapper tAttachMapper;
 
     @Resource
-    RemoteSystemBaseService remoteSystemBaseService;
+    RemoteConfigService configService;
 
     /**
      * 查询巡检项记录
@@ -121,11 +121,13 @@ public class TBusInspectionServiceImpl extends BaseServiceImpl implements ITBusI
     public AjaxResult detail(TBusInspection tBusInspection) {
         AjaxResult ajaxResult = new AjaxResult();
         try{
-            String pictureBasePath = remoteSystemBaseService.configKeyapp("pictureBasePath").get("code").toString();
+            String pictureBasePath = configService.remotegetConfigKey("fileUrl").getData();
             //巡检项目信息
             //进度信息第一项有照片
             TBusTrack tBusTrack = new TBusTrack();
             tBusTrack.setBusInspectionId(tBusInspection.getBusInspectionId());
+            setSookaDataBase(tBusTrack);
+
             List<TBusTrack> tracks_list = tBusTrackMapper.selectTBusTrackList(tBusTrack);
             List<String> pictures = new ArrayList<>();
             for(TBusTrack tr : tracks_list){

src/main/resources/mapper/emergency/system/TBusTrackMapper.xml

@@ -18,14 +18,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTBusTrackVo">
-        select bus_track_id, bus_log_id, bus_inspection_id, dept_id, user_id, risk_status, bus_track_content, create_time,
-         (select s.nick_name from sys_user s where user_id=t.user_id) nick_name,
-         (select dict_label from sys_dict_data  where dict_value=t.risk_status) risk_status_str
-         from t_bus_track t
+        select t.bus_track_id, t.bus_log_id, t.bus_inspection_id, t.dept_id, s.user_id, t.risk_status, t.bus_track_content, t.create_time,
+        s.nick_name ,dict_label risk_status_str
+        from t_bus_track t
     </sql>
 
     <select id="selectTBusTrackList" parameterType="TBusTrack" resultMap="TBusTrackResult">
         <include refid="selectTBusTrackVo"/>
+        left join ${database_system}.sys_user s on s.user_id = t.user_id
+        left join ${database_system}.sys_dict_data dict on dict.dict_value = t.risk_status
         <where>
             <if test="busTrackId != null  and busTrackId != ''"> and bus_track_id = #{busTrackId}</if>
             <if test="busLogId != null  and busLogId != ''"> and bus_log_id = #{busLogId}</if>
@@ -39,6 +40,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTBusTrackByBusTrackId" parameterType="String" resultMap="TBusTrackResult">
         <include refid="selectTBusTrackVo"/>
+        left join ${database_system}.sys_user s on s.user_id = t.user_id
+        left join ${database_system}.sys_dict_data dict on dict.dict_value = t.risk_status
         where bus_track_id = #{busTrackId}
     </select>