1

src/main/java/com/sooka/sponest/data/emergency/appmin/base/AppBaseService.java

@@ -1,12 +1,13 @@
 package com.sooka.sponest.data.emergency.appmin.base;
 
+import com.ruoyi.common.datascope.base.service.BaseService;
 import com.ruoyi.system.api.domain.SysDept;
 import com.sooka.sponest.data.emergency.remoteapi.service.center.data.RemoteSystemBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class AppBaseService {
+public class AppBaseService extends BaseService {
     @Autowired
     private RemoteSystemBaseService remoteSystemBaseService;
 

src/main/java/com/sooka/sponest/data/emergency/appmin/xuncha/controller/AppXunchaController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.sooka.sponest.data.emergency.appmin.xuncha.domain.AppXunchaVO;
 import com.sooka.sponest.data.emergency.appmin.xuncha.service.AppXunchaService;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -23,13 +24,15 @@ public class AppXunchaController extends BaseController {
     public AjaxResult getXunchaCount(AppXunchaVO vo){
         return appXunchaService.getXunchaCount(vo);
     }
-    @RequestMapping("getXunchaList")
+
+
+    @GetMapping("/getXunchaList")
     public AjaxResult getXunchaList(AppXunchaVO vo){
         startPage();
         List list = appXunchaService.getXunchaList(vo);
         list.removeAll(Collections.singleton(null));
         TableDataInfo tableDataInfo = getDataTable(list);
-        return AjaxResult.success(tableDataInfo);
+        return AjaxResult.success(tableDataInfo.getRows());
     }
 
 

src/main/java/com/sooka/sponest/data/emergency/appmin/xuncha/domain/AppXunchaVO.java

@@ -1,12 +1,13 @@
 package com.sooka.sponest.data.emergency.appmin.xuncha.domain;
 
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class AppXunchaVO extends BaseEntity {
+public class AppXunchaVO extends BaseBusinessEntity {
 
     String todayStart;
     String todayEnd;

src/main/java/com/sooka/sponest/data/emergency/appmin/xuncha/service/impl/AppXunchaServiceImpl.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.emergency.appmin.xuncha.service.impl;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.datascope.annotation.DataScope;
+import com.ruoyi.common.datascope.base.service.BaseService;
 import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
 import com.sooka.sponest.data.emergency.appmin.xuncha.domain.AppXunchaCountBO;
 import com.sooka.sponest.data.emergency.appmin.xuncha.domain.AppXunchaListBO;
@@ -63,6 +64,7 @@ public class AppXunchaServiceImpl extends AppBaseService implements AppXunchaSer
     @Override
     @DataScope(deptAlias = "e")
     public List<AppXunchaListBO> getXunchaList(AppXunchaVO vo) {
+        setSookaDataBase(vo);
         return appXunchaMapper.getXunchaList(vo);
     }
 

src/main/java/com/sooka/sponest/data/emergency/remoteapi/service/center/data/RemoteSystemBaseService.java

@@ -41,7 +41,7 @@ public interface RemoteSystemBaseService {
      * @author pengyu
      * @date 2023/2/22 13:05
      **/
-    @GetMapping("/notice/noticlist")
+    @GetMapping("/notice/noticeList")
     public TableDataInfo noticlist(@RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize") Integer pageSize);
 
     //根据通知公告编号获取详细信息（App）

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

@@ -59,7 +59,7 @@
         t.deptName as deptName,
 
         log.bus_log_id as busLogId,
-        (select dict_label from sys_dict_data where dict_value = log.bus_log_type ) as busLogTypeLabel ,
+        (select dict_label from ${database_system}.sys_dict_data where dict_value = log.bus_log_type ) as busLogTypeLabel ,
         log.bus_enterprise_id as busEnterpriseId,
         log.bus_enterprise_name as busEnterpriseName,
         log.is_risk as isRisk,
@@ -67,8 +67,8 @@
         log.create_by as createBy
         from t_bus_log log,t_bus_enterprise e,
         (select sd.bus_log_id bus_log_id,
-        sd.user_id, (select s.nick_name from sys_user s where s.user_id= sd.user_id) as nickName,
-        sd.dept_id,(select d.dept_name from sys_dept d where d.dept_id = sd.dept_id) as deptName,
+        sd.user_id, (select s.nick_name from ${database_system}.sys_user s where s.user_id= sd.user_id) as nickName,
+        sd.dept_id,(select d.dept_name from ${database_system}.sys_dept d where d.dept_id = sd.dept_id) as deptName,
         min(sd.create_time) as create_time from t_bus_dept sd
         group by bus_log_id) t
         where log.bus_log_id=t.bus_log_id and e.bus_enterprise_id=log.bus_enterprise_id