修改外部接口DataSource注解

acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java

@@ -6,12 +6,14 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
 import com.acupuncture.common.annotation.Anonymous;
+import com.acupuncture.common.annotation.DataSource;
 import com.acupuncture.common.config.RuoYiConfig;
 import com.acupuncture.common.core.domain.AjaxResult;
 import com.acupuncture.common.core.domain.BaseDto;
 import com.acupuncture.common.core.domain.JsonResponse;
 import com.acupuncture.common.core.redis.RedisCache;
 import com.acupuncture.common.core.text.Convert;
+import com.acupuncture.common.enums.DataSourceType;
 import com.acupuncture.common.exception.base.BaseException;
 import com.acupuncture.common.utils.file.FileUploadUtils;
 import com.acupuncture.common.utils.file.FileUtils;
@@ -61,6 +63,7 @@ public class ExternalController {
     @Anonymous
     @ApiOperation("获取人员信息")
     @GetMapping("/http/getUserInfo")
+    @DataSource(DataSourceType.MASTER)
     public Object test(@RequestParam("from") String from, @RequestParam("memberid") String memberid) {
         log.info("获取人员信息:{},{}",from, memberid);
         checkoutData(from);

acupuncture-system/src/main/java/com/acupuncture/system/mapper/SysRoleMapper.java

@@ -27,7 +27,6 @@ public interface SysRoleMapper
      * @param userId 用户ID
      * @return 角色列表
      */
-//    @DataSource(DataSourceType.MASTER)
     public List<SysRole> selectRolePermissionByUserId(Long userId);
 
     /**

acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/AdminDataSourceDao.java

@@ -23,7 +23,6 @@ public interface AdminDataSourceDao {
      * @param dto
      * @return
      */
-    @DataSource(value = DataSourceType.MASTER)
     List<AdminDataSourceVo.Result> query(@Param("query") AdminDataSourceDto.Query dto,
                                          @Param("userId") Long userId,
                                          @Param("tenantId")Long tenantId);

acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/DmsUserDao.java

@@ -16,7 +16,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface DmsUserDao {
 
-    @DataSource(DataSourceType.MASTER)
     DmsTenant queryById(@Param("id") Long id);
 
     /**

acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/FmsFollowupDao.java

@@ -74,6 +74,5 @@ public interface FmsFollowupDao {
 
     List<PmsTreatmentVo.TreatmentVO.QueueVo> queryQueueListByPatientId(@Param("patientId") Long patientId);
 
-    @DataSource(DataSourceType.MASTER)
     List<PmsTreatmentVo.TreatmentVO.QueueVo> adminQueryQueueListByPatientId(@Param("patientId") Long patientId);
 }

acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/PmsPatientDao.java

@@ -20,7 +20,6 @@ public interface PmsPatientDao {
 
     List<PmsPatientVo.PatientResult> query(@Param("query") PmsPatientDto.PatientQuery query);
 
-    @DataSource(DataSourceType.MASTER)
     List<PmsPatientVo.PatientResult> adminQuery(@Param("query") PmsPatientDto.PatientQuery query);
     void batchInsert(@Param("pmsPatientList") List<PmsPatient> pmsPatientList);
 }

acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/PmsTreatmentDao.java

@@ -25,14 +25,9 @@ public interface PmsTreatmentDao {
     List<PmsTreatmentVo.TreatmentRecord> selectRecord(@Param("treatmentId") Long treatmentId,
                                                       @Param("codeList") List<String> codeList);
 
-//    @DataSource(DataSourceType.MASTER)
     List<PmsTreatmentVo.TreatmentRecord> adminSelectRecord(@Param("treatmentId") Long treatmentId,
                                                       @Param("codeList") List<String> codeList);
-//    void batchInsert(@Param("pmsPatientList") List<PmsPatient> pmsPatientList);
-
-//    @DataSource(DataSourceType.MASTER)
     List<PmsTreatmentVo.TreatmentVO> adminQuery(@Param("query") PmsTreatmentDto.TreatmentQueryDTO query);
 
-//    @DataSource(DataSourceType.MASTER)
     PmsTreatmentVo.TreatmentRecordVO adminQueryTreatment(@Param("id") Long id);
 }

acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/ScreeningDetailDao.java

@@ -42,7 +42,6 @@ public interface ScreeningDetailDao extends ScrScreeningDetailMapper {
                                          @Param("type") Byte type,
                                          @Param("param") ScreeningDto.Query param);
 
-    @DataSource(DataSourceType.MASTER)
     List<ScrScreenVo.Result> adminQueryResult(@Param("detailId") Long detailId,
                                          @Param("type") Byte type,
                                          @Param("param") ScreeningDto.Query param);

acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/UmsDataSourceDao.java

@@ -14,7 +14,6 @@ import java.util.List;
  * @description:
  */
 public interface UmsDataSourceDao {
-
     @DataSource(DataSourceType.MASTER)
     List<UmsDataSourceVo.Result> query(@Param("tenantId") Long tenantId);
 

acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/WxQrCodeDao.java

@@ -9,7 +9,6 @@ import java.util.List;
 
 public interface WxQrCodeDao {
 
-//    @DataSource(DataSourceType.MASTER)
     AmsWxQrCodeVo.Result queryById(@Param("id")Long id);
 
     /**
@@ -28,7 +27,6 @@ public interface WxQrCodeDao {
                                                       @Param("userId") Long userId,
                                                       @Param("tenantId") Long tenantId);
 
-//    @DataSource(DataSourceType.MASTER)
     List<AmsWxQrCodeVo.ScreenResult> adminSelectScreenList(@Param("hospitalIdList") List<Long> hospitalIdList);
 
 

acupuncture-system/src/main/java/com/acupuncture/system/service/AdminFmsFollowupQueueService.java

@@ -19,7 +19,6 @@ public interface AdminFmsFollowupQueueService {
      * 查询公共队列
      * @return
      */
-//    @DataSource(DataSourceType.MASTER)
     List<FmsFollowupVo.FollowupQueueVO> queryCommonQueue(String name, Long tenantId);
 
     /**
@@ -27,7 +26,6 @@ public interface AdminFmsFollowupQueueService {
      * @param dto
      * @return
      */
-    @DataSource(DataSourceType.MASTER)
     int addQueue(FmsFollowupDto.Add dto);
 
     /**
@@ -35,7 +33,6 @@ public interface AdminFmsFollowupQueueService {
      * @param dto
      * @return
      */
-    @DataSource(DataSourceType.MASTER)
     int updQueue(FmsFollowupDto.Upd dto);
 
     /**
@@ -43,7 +40,6 @@ public interface AdminFmsFollowupQueueService {
      * @param dto
      * @return
      */
-    @DataSource(DataSourceType.MASTER)
     int delQueue(FmsFollowupDto.Del dto);
 
     /**

acupuncture-system/src/main/java/com/acupuncture/system/service/FmsFollowupService.java

@@ -71,7 +71,6 @@ public interface FmsFollowupService {
      * @param dto
      * @return
      */
-    @DataSource(DataSourceType.MASTER)
     List<FmsFollowupVo.FollowupTaskVO> adminQueryTask(FmsFollowupDto.FollowupTaskQueryDTO dto);
     /**
      * 标记为失访

acupuncture-system/src/main/java/com/acupuncture/system/service/impl/AdminFmsFollowupQueueServiceImpl.java

@@ -40,13 +40,11 @@ public class AdminFmsFollowupQueueServiceImpl implements AdminFmsFollowupQueueSe
     private FmsFollowupQueueMapper fmsFollowupQueueMapper;
 
     @Override
-//    @DataSource(DataSourceType.MASTER)
     public List<FmsFollowupVo.FollowupQueueVO> queryCommonQueue(String name, Long tenantId) {
         return fmsFollowupDao.queryAll(name, tenantId);
     }
 
     @Override
-    @DataSource(DataSourceType.MASTER)
     public int addQueue(FmsFollowupDto.Add dto) {
         FmsFollowupQueue fmsFollowupQueue = BeanUtil.copyProperties(dto, FmsFollowupQueue.class);
         fmsFollowupQueue.setId(IdUtil.getSnowflakeNextId());
@@ -57,7 +55,6 @@ public class AdminFmsFollowupQueueServiceImpl implements AdminFmsFollowupQueueSe
     }
 
     @Override
-    @DataSource(DataSourceType.MASTER)
     public int updQueue(FmsFollowupDto.Upd dto) {
         FmsFollowupQueue fmsFollowupQueue = BeanUtil.copyProperties(dto, FmsFollowupQueue.class);
         fmsFollowupQueue.setUpdateBy(SecurityUtils.getUsername());
@@ -66,7 +63,6 @@ public class AdminFmsFollowupQueueServiceImpl implements AdminFmsFollowupQueueSe
     }
 
     @Override
-    @DataSource(DataSourceType.MASTER)
     public int delQueue(FmsFollowupDto.Del dto) {
         FmsFollowupQueueExample fmsFollowupQueueExample = new FmsFollowupQueueExample();
         fmsFollowupQueueExample.createCriteria().andIdIn(dto.getIdList());

acupuncture-system/src/main/java/com/acupuncture/system/service/impl/SysConfigServiceImpl.java

@@ -47,7 +47,7 @@ public class SysConfigServiceImpl implements ISysConfigService
      * @return 参数配置信息
      */
     @Override
-    @DataSource(DataSourceType.MASTER)
+
     public SysConfig selectConfigById(Long configId)
     {
         SysConfig config = new SysConfig();