删除无用切换数据源方法

acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysUserController.java

@@ -165,7 +165,6 @@ public class SysUserController extends BaseController
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysUser user)
     {
-//        changeDataSource(user.getTenantId());
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
         deptService.checkDeptDataScope(user.getDeptId());
@@ -186,16 +185,6 @@ public class SysUserController extends BaseController
         return toAjax(userService.updateUser(user));
     }
 
-    private void changeDataSource(Long tenantId) {
-        DmsTenant dmsTenant = dmsTenantMapper.selectByPrimaryKey(tenantId);
-        if (dmsTenant != null) {
-            UmsDataSource umsDataSource = umsDataSourceMapper.selectByPrimaryKey(dmsTenant.getDataSourceId());
-            if (umsDataSource != null) {
-                DynamicDataSourceContextHolder.setDataSourceType(umsDataSource.getDataSourceKey());
-            }
-        }
-    }
-
     /**
      * 删除用户
      */

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

@@ -67,23 +67,14 @@ public class AdminPmsTreatmentController {
         treatmentService.adminExportTreatment(response, dto);
     }
 
-    @ApiOperation("修改诊疗档案")
+//    @ApiOperation("修改诊疗档案")
-    @PostMapping("/upd")
+//    @PostMapping("/upd")
-    public JsonResponse<Integer> updateTreatment(@RequestBody @Validated PmsTreatmentDto.TreatmentUpdateDTO dto) {
+//    public JsonResponse<Integer> updateTreatment(@RequestBody @Validated PmsTreatmentDto.TreatmentUpdateDTO dto) {
-        DmsTenant dmsTenant = dmsTenantMapper.selectByPrimaryKey(dto.getTenantId());
+//        treatmentService.updateTreatment(dto);
-        if (dmsTenant != null) {
+//        return JsonResponse.ok();
-            UmsDataSource umsDataSource = umsDataSourceMapper.selectByPrimaryKey(dmsTenant.getDataSourceId());
+//    }
-            if (umsDataSource != null) {
+//
-                changeDataSource(umsDataSource.getDataSourceKey());
-            }
-        }
-        treatmentService.updateTreatment(dto);
-        return JsonResponse.ok();
-    }
 
-    private static void changeDataSource(String dataSourceKey) {
-        DynamicDataSourceContextHolder.setDataSourceType(dataSourceKey);
-    }
 
 //    @ApiOperation("导出诊疗档案评估报告")
 //    @PostMapping("/exportTreatmentPg")

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

@@ -80,17 +80,13 @@ public class ExternalController {
                 throw new BaseException("查询不到社区");
             }
             //切换数据源查询
-            changeDataSource(dataSourceList.get(0).getDataSourceKey());
+            DynamicDataSourceContextHolder.setDataSourceType(dataSourceList.get(0).getDataSourceKey());
         }catch (Exception e) {
             throw new BaseException("UUID错误:{}", from);
         }
 
     }
 
-    private static void changeDataSource(String key) {
-        DynamicDataSourceContextHolder.setDataSourceType(key);
-    }
-
 //    @Anonymous
 //    @ApiOperation("上传数据")
 //    @PostMapping("/http/uploadMemberInfo")

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

@@ -82,21 +82,11 @@ public class ScreeningController {
     @RequestMapping(value = "/createNoToken", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<QuestionnaireVo.DetailInfo> createNoToken(@ApiParam @Validated @RequestBody BaseDto<ScreeningDto.CreateDetail> params) throws Exception {
         log.info("创建筛查详情{}", params);
-//        changeDataSource(params.getParam().getTenantId());
         QuestionnaireVo.DetailInfo detailInfo = screeningService.createDetail(params.getParam(), params.getParam().getUserId(), params.getParam().getTenantId());
         log.info("创建筛查详情结束");
         return JsonResponse.ok(detailInfo);
     }
 
-    private void changeDataSource(Long tenantId) {
-        DmsTenant dmsTenant = dmsTenantMapper.selectByPrimaryKey(tenantId);
-        if (dmsTenant != null) {
-            UmsDataSource umsDataSource = umsDataSourceMapper.selectByPrimaryKey(dmsTenant.getDataSourceId());
-            if (umsDataSource != null) {
-                DynamicDataSourceContextHolder.setDataSourceType(umsDataSource.getDataSourceKey());
-            }
-        }
-    }
 
     @ApiOperation(value = "提交筛查", notes = "")
     @RequestMapping(value = "/submit", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
@@ -111,7 +101,6 @@ public class ScreeningController {
     @RequestMapping(value = "/submitNoToken", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse submitNoToken(@ApiParam @Validated @RequestBody BaseDto<ScreeningDto.SubmitScreeningQuestionnaire> params) throws Exception {
         log.info("提交筛查开始{}", params);
-//        changeDataSource(params.getParam().getTenantId());
         screeningService.submitQuestionnaire(params.getParam(), 0L);
         return JsonResponse.ok();
     }
@@ -121,7 +110,6 @@ public class ScreeningController {
     @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse saveQuestionnaire(@ApiParam @Validated @RequestBody BaseDto<ScreeningDto.SaveQuestionnaire> params) throws Exception {
         log.info("保存调查筛查开始{}", params);
-//        changeDataSource(params.getParam().getTenantId());
         screeningService.saveQuestionnaire(params.getParam(), params.getParam().getUserId());
         log.info("保存调查筛查结束");
         return JsonResponse.ok();

acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java

@@ -74,7 +74,6 @@ public class TaskController {
         //查询租户，根据租户循环切换数据源，定时处理所有医院的随访工单
 //        UmsDataSourceVo.Result result1 = new UmsDataSourceVo.Result();
 //        result1.setDataSourceKey("MASTER");
-//        changeDataSource(result1);
         List<UmsDataSourceVo.Result> query = umsDataSourceDao.query(null);
         if (CollectionUtil.isEmpty(query)) {
             return;