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

src/main/java/com/sooka/sponest/data/emergency/appmin/zhenggaijindu/domain/AppZhenggaijinduVO.java

@@ -1,11 +1,12 @@
 package com.sooka.sponest.data.emergency.appmin.zhenggaijindu.domain;
 
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class AppZhenggaijinduVO {
+public class AppZhenggaijinduVO extends BaseBusinessEntity {
 
     String busInspectionId;
 

src/main/java/com/sooka/sponest/data/emergency/appmin/zhenggaijindu/service/impl/AppZhenggaijinduServiceImpl.java

@@ -1,11 +1,11 @@
 package com.sooka.sponest.data.emergency.appmin.zhenggaijindu.service.impl;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
+import com.ruoyi.system.api.RemoteConfigService;
+import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.emergency.appmin.zhenggaijindu.domain.AppZhenggaijinduVO;
 import com.sooka.sponest.data.emergency.appmin.zhenggaijindu.mapper.AppZhenggaijinduMapper;
 import com.sooka.sponest.data.emergency.appmin.zhenggaijindu.service.AppZhenggaijinduService;
-import com.sooka.sponest.data.emergency.remoteapi.service.center.data.RemoteSystemBaseService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -14,19 +14,19 @@ import java.util.List;
 import java.util.Map;
 
 @Service
-public class AppZhenggaijinduServiceImpl extends AppBaseService implements AppZhenggaijinduService {
+public class AppZhenggaijinduServiceImpl extends BaseServiceImpl implements AppZhenggaijinduService {
 
     @Resource
     AppZhenggaijinduMapper appZhenggaijinduMapper;
 
     @Resource
-    RemoteSystemBaseService remoteSystemBaseService;
+    RemoteConfigService remoteSystemBaseService;
 
     @Override
     public AjaxResult getZhenggaijinduList(AppZhenggaijinduVO vo) {
-
+        setSookaDataBase(vo);
         try {
-            String pictureBasePath = remoteSystemBaseService.configKeyapp("pictureBasePath").get("code").toString();
+            String pictureBasePath = remoteSystemBaseService.remotegetConfigKey("appUrl").getData();
             List list = appZhenggaijinduMapper.getZhenggaijinduList(vo);
             Map map = new HashMap();
             map.put("pictureBasePath", pictureBasePath);

src/main/resources/mapper/emergency/appmin/AppZhenggaijinduMapper.xml

@@ -31,10 +31,10 @@
 select * from
 (select
 t.bus_track_id busTrackId,
-(select nick_name from sys_user where user_id=t.user_id) nickName,
-(select dept_name from sys_dept where dept_id=t.dept_id) deptName,
+(select nick_name from ${database_system}.sys_user where user_id=t.user_id) nickName,
+(select dept_name from ${database_system}.sys_dept where dept_id=t.dept_id) deptName,
 t.risk_status riskStatus,
-(select dict_label from sys_dict_data where dict_value = t.risk_status) riskStatusValue,
+(select dict_label from ${database_system}.sys_dict_data where dict_value = t.risk_status) riskStatusValue,
 g.bus_enterprise_name enterpriseName,
 ifnull(t.bus_track_content,'') busTrackContent,
 t.create_time crreateTime,