From 10ac81485cf20ea4a18b80f52b16af1d9ba82af6 Mon Sep 17 00:00:00 2001 From: zzc Date: Fri, 28 Mar 2025 16:46:40 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=A7=9F=E6=88=B7=E7=94=A8=E6=88=B7=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/AdminDmsUserController.java | 52 +++++++++++-------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java index 49193abc..580e64d1 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java @@ -2,6 +2,7 @@ package com.acupuncture.web.controller.web; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.acupuncture.common.core.domain.BaseDto; import com.acupuncture.common.core.domain.JsonResponse; import com.acupuncture.common.core.domain.entity.SysUser; @@ -68,15 +69,28 @@ public class AdminDmsUserController { @ApiOperation("添加租户用户") @PostMapping("/add") public JsonResponse insert(@RequestBody @Validated AdminTenantUserDto.AddDto dto) { - //新增分库数据 - //切换到分库数据源 + //判定租户及数据源是否存在 DmsTenant dmsTenant = dmsTenantMapper.selectByPrimaryKey(dto.getTenantId()); - if (dmsTenant != null) { - UmsDataSource umsDataSource = umsDataSourceMapper.selectByPrimaryKey(dmsTenant.getDataSourceId()); - if (umsDataSource != null) { - changeDataSource(umsDataSource.getDataSourceKey()); - } + if (dmsTenant == null) { + return JsonResponse.ok().fail("租户不存在"); + } + UmsDataSource umsDataSource = umsDataSourceMapper.selectByPrimaryKey(dmsTenant.getDataSourceId()); + if (umsDataSource == null || StrUtil.isEmpty(umsDataSource.getDataSourceKey())) { + return JsonResponse.ok().fail("数据源不存在"); } + + //新增主库租户用户 + if (!dmsLoginService.checkUserNameUnique(dto)) { + return JsonResponse.ok().fail("新增用户'" + dto.getUserName() + "'失败，登录账号已存在"); + } else if (StringUtils.isNotEmpty(dto.getPhonenumber()) && !dmsLoginService.checkPhoneUnique(dto)) { + return JsonResponse.ok().fail("新增用户'" + dto.getUserName() + "'失败，手机号码已存在"); + } + dto.setPassword(SecurityUtils.encryptPassword(dto.getPassword())); + adminTenantUserService.insert(dto); + + //切换至从库 + DynamicDataSourceContextHolder.setDataSourceType(umsDataSource.getDataSourceKey()); + //新增从库数据 SysUser user = BeanUtil.copyProperties(dto, SysUser.class); if (!userService.checkUserNameUnique(user)) { return JsonResponse.ok().fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); @@ -90,17 +104,10 @@ public class AdminDmsUserController { user.setPhonenumber(dto.getContactPhone()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); int insert = userService.insertUser(user); - //新增主库 - if (insert > 0) { - DynamicDataSourceContextHolder.setDataSourceType("MASTER"); - if (!dmsLoginService.checkUserNameUnique(dto)) { - return JsonResponse.ok().fail("新增用户'" + dto.getUserName() + "'失败，登录账号已存在"); - } else if (StringUtils.isNotEmpty(dto.getPhonenumber()) && !dmsLoginService.checkPhoneUnique(dto)) { - return JsonResponse.ok().fail("新增用户'" + dto.getUserName() + "'失败，手机号码已存在"); - } - dto.setPassword(user.getPassword()); - adminTenantUserService.insert(dto); - } + + //销毁切换数据源 + DynamicDataSourceContextHolder.clearDataSourceType(); + return JsonResponse.ok(insert); } @@ -124,11 +131,13 @@ public class AdminDmsUserController { if (CollectionUtil.isNotEmpty(tenantList)) { for (AdminTenantsVo.Result result : tenantList) { //切换数据源 删除分库数据 - changeDataSource(result.getDataSourceKey()); + DynamicDataSourceContextHolder.setDataSourceType(result.getDataSourceKey()); //修改分库用户 SysUser sysUser = BeanUtil.copyProperties(dto, SysUser.class); sysUser.setPhonenumber(dto.getContactPhone()); userService.updateUser(sysUser); + //销毁切换数据源 + DynamicDataSourceContextHolder.clearDataSourceType(); } } } @@ -154,7 +163,7 @@ public class AdminDmsUserController { if (CollectionUtil.isNotEmpty(tenantList)) { for (AdminTenantsVo.Result result : tenantList) { //切换数据源 删除分库数据 - changeDataSource(result.getDataSourceKey()); + DynamicDataSourceContextHolder.setDataSourceType(result.getDataSourceKey()); //删除分库用户 userService.deleteUserByUsername(dmsUser.getUserName()); } @@ -172,7 +181,4 @@ public class AdminDmsUserController { return JsonResponse.ok(new PageInfo<>(adminTenantUserService.query(dto.getParam()))); } - private static void changeDataSource(String key) { - DynamicDataSourceContextHolder.setDataSourceType(key); - } } From 96c9f3cbd2403185e769e072f5e7e65798eae201 Mon Sep 17 00:00:00 2001 From: zzc Date: Fri, 28 Mar 2025 16:51:08 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=85=B7=E6=9C=89=E5=AE=A1=E6=A0=B8=E6=9D=83?= =?UTF-8?q?=E9=99=90=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/entity/SysUser.java | 12 ++++++++++++ .../system/domain/dto/AdminTenantUserDto.java | 6 ++++++ .../main/resources/mapper/system/SysUserMapper.xml | 5 ++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/acupuncture-common/src/main/java/com/acupuncture/common/core/domain/entity/SysUser.java b/acupuncture-common/src/main/java/com/acupuncture/common/core/domain/entity/SysUser.java index 997b8617..bd8bafcf 100644 --- a/acupuncture-common/src/main/java/com/acupuncture/common/core/domain/entity/SysUser.java +++ b/acupuncture-common/src/main/java/com/acupuncture/common/core/domain/entity/SysUser.java @@ -3,6 +3,8 @@ package com.acupuncture.common.core.domain.entity; import java.util.Date; import java.util.List; import javax.validation.constraints.*; + +import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.acupuncture.common.annotation.Excel; @@ -96,11 +98,21 @@ public class SysUser extends BaseEntity private String tenantPhone; private Long scoreId; + @ApiModelProperty("是否具有审核权限(0不具有； 1具有)") + private Byte slaverAdmin; public SysUser() { } + public Byte getSlaverAdmin() { + return slaverAdmin; + } + + public void setSlaverAdmin(Byte slaverAdmin) { + this.slaverAdmin = slaverAdmin; + } + public String getTenantPhone() { return tenantPhone; } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java index ea3dfb94..672ffa58 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java @@ -3,6 +3,7 @@ package com.acupuncture.system.domain.dto; import com.acupuncture.common.utils.SecurityUtils; import com.acupuncture.system.domain.po.DmsUser; import com.acupuncture.system.service.AdminTenantUserService; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @@ -36,6 +37,9 @@ public class AdminTenantUserDto { private String status; private String contactPhone; + + @ApiModelProperty("是否具有审核权限(0不具有； 1具有)") + private Byte slaverAdmin; // // public Long getTenantId() { // return SecurityUtils.getTenantId(); @@ -61,6 +65,8 @@ public class AdminTenantUserDto { private String status; private String contactPhone; + @ApiModelProperty("是否具有审核权限(0不具有； 1具有)") + private Byte slaverAdmin; } @Data diff --git a/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml b/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml index 6fe48291..322dfd54 100644 --- a/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -48,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select u.user_id, u.tenant_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, + select u.user_id, u.tenant_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.slaver_admin, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u @@ -167,6 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status, create_by, remark, + slaver_admin, create_time )values( #{userId}, @@ -182,6 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status}, #{createBy}, #{remark}, + #{slaverAdmin}, sysdate() ) From 900a21a984f63614fc0f0d9d79d8bfade9a8a978 Mon Sep 17 00:00:00 2001 From: zzc Date: Fri, 28 Mar 2025 16:52:14 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E7=94=A8=E6=88=B7ID=E6=9F=A5=E8=AF=A2=E8=A7=92=E8=89=B2mapper?= =?UTF-8?q?=E7=9A=84=E4=B8=BB=E5=BA=93=E6=95=B0=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/acupuncture/system/mapper/SysRoleMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/mapper/SysRoleMapper.java b/acupuncture-system/src/main/java/com/acupuncture/system/mapper/SysRoleMapper.java index 688d3324..9acb7743 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/mapper/SysRoleMapper.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/mapper/SysRoleMapper.java @@ -27,7 +27,7 @@ public interface SysRoleMapper * @param userId 用户ID * @return 角色列表 */ - @DataSource(DataSourceType.MASTER) +// @DataSource(DataSourceType.MASTER) public List selectRolePermissionByUserId(Long userId); /** From 4917a1f76ab8076a0d54dac3a6f5665239745ecd Mon Sep 17 00:00:00 2001 From: zzc Date: Fri, 28 Mar 2025 16:53:59 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=AA=8C=E8=AF=81=E7=A0=81=E9=89=B4=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acupuncture/framework/web/service/WebDmsLoginService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/WebDmsLoginService.java b/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/WebDmsLoginService.java index 9f65dacb..f5a40b40 100644 --- a/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/WebDmsLoginService.java +++ b/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/WebDmsLoginService.java @@ -62,7 +62,7 @@ public class WebDmsLoginService public String login(String username, String password, String code, String uuid) { // 验证码校验 -// validateCaptcha(username, code, uuid); + validateCaptcha(username, code, uuid); // 登录前置校验 loginPreCheck(username, password); // 用户验证 From ba09c0678c7fc8d7abb65a216fa5f6238766e3fa Mon Sep 17 00:00:00 2001 From: zzc Date: Fri, 28 Mar 2025 16:58:12 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=95=B0=E6=8D=AE=E6=BA=90=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysUserController.java | 11 --------- .../web/AdminPmsTreatmentController.java | 23 ++++++------------- .../controller/web/ExternalController.java | 6 +---- .../controller/web/ScreeningController.java | 12 ---------- .../acupuncture/web/task/TaskController.java | 1 - 5 files changed, 8 insertions(+), 45 deletions(-) diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysUserController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysUserController.java index 2ca06b37..d251be94 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysUserController.java +++ b/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()); - } - } - } - /** * 删除用户 */ diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminPmsTreatmentController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminPmsTreatmentController.java index b6dd684b..d857e193 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminPmsTreatmentController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminPmsTreatmentController.java @@ -67,23 +67,14 @@ public class AdminPmsTreatmentController { treatmentService.adminExportTreatment(response, dto); } - @ApiOperation("修改诊疗档案") - @PostMapping("/upd") - public JsonResponse updateTreatment(@RequestBody @Validated PmsTreatmentDto.TreatmentUpdateDTO dto) { - DmsTenant dmsTenant = dmsTenantMapper.selectByPrimaryKey(dto.getTenantId()); - if (dmsTenant != null) { - UmsDataSource umsDataSource = umsDataSourceMapper.selectByPrimaryKey(dmsTenant.getDataSourceId()); - if (umsDataSource != null) { - changeDataSource(umsDataSource.getDataSourceKey()); - } - } - treatmentService.updateTreatment(dto); - return JsonResponse.ok(); - } +// @ApiOperation("修改诊疗档案") +// @PostMapping("/upd") +// public JsonResponse updateTreatment(@RequestBody @Validated PmsTreatmentDto.TreatmentUpdateDTO dto) { +// treatmentService.updateTreatment(dto); +// return JsonResponse.ok(); +// } +// - private static void changeDataSource(String dataSourceKey) { - DynamicDataSourceContextHolder.setDataSourceType(dataSourceKey); - } // @ApiOperation("导出诊疗档案评估报告") // @PostMapping("/exportTreatmentPg") diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java index 67b944c5..404f10fa 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java +++ b/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") diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java index 7fdcf95b..7bfe7ebc 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java +++ b/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 createNoToken(@ApiParam @Validated @RequestBody BaseDto 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 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 params) throws Exception { log.info("保存调查筛查开始{}", params); -// changeDataSource(params.getParam().getTenantId()); screeningService.saveQuestionnaire(params.getParam(), params.getParam().getUserId()); log.info("保存调查筛查结束"); return JsonResponse.ok(); diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java index 76f20bed..26b6c12c 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java +++ b/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 query = umsDataSourceDao.query(null); if (CollectionUtil.isEmpty(query)) { return; From 45946ecf858957768a5ba8acfd68b892b832db7a Mon Sep 17 00:00:00 2001 From: zzc Date: Fri, 28 Mar 2025 17:32:07 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acupuncture/web/task/TaskController.java | 385 ++++++++++-------- .../aspectj/AdminGlobalDataSourceAspect.java | 11 - 2 files changed, 211 insertions(+), 185 deletions(-) diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java index 26b6c12c..d0a521dc 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; import com.acupuncture.common.annotation.Anonymous; import com.acupuncture.common.core.redis.RedisCache; import com.acupuncture.framework.datasource.DynamicDataSourceContextHolder; @@ -35,6 +36,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.*; +import java.util.stream.Collectors; /** * @Author zzc @@ -64,6 +66,200 @@ public class TaskController { @Resource private FmsFollowupQueueService fmsFollowupQueueService; + /** + * 处理业务 + * + * @param tenandId 租户用户 + * @param commonQueue 公共队列 + */ + public void doTask(Long tenandId, List commonQueue) { + //查询从库队列 + //1. 查询队列 + List slavelQueueList = fmsFollowupDao.selectQueueList(null, null, null, null); + + //合并公共队列和从库的队列 + slavelQueueList.addAll(commonQueue); + + //查询每个队列的对象 + for (FmsFollowupVo.FollowupQueueVO queue : slavelQueueList) { + FmsFollowupDto.FollowupPatientQueryDTO followupPatientQueryDTO = new FmsFollowupDto.FollowupPatientQueryDTO(); + followupPatientQueryDTO.setQueueId(queue.getId()); + followupPatientQueryDTO.setTenantId(queue.getTenantId()); + List patientList = fmsFollowupService.queryPatient(followupPatientQueryDTO); + log.info("查询每个队列的对象:{}", patientList); + } + + //定时任务 + +// //循环租户 +// for (UmsDataSourceVo.Result tenant : tenantList) { +// if ("MASTER".equals(tenant.getDataSourceKey())) { +// continue; +// } +// changeDataSource(tenant); +// { +// //获取随访患者列表，根据患者出院日时间和队列添加工单 +// //1. 查询队列 +// List queueList = fmsFollowupDao.selectQueueList(null, null, null, null); +// +// if (CollectionUtil.isEmpty(queueList)) { +// queueList = followupQueueVOS; +// } else { +// if (CollectionUtil.isEmpty(followupQueueVOS)) { +// queueList.addAll(followupQueueVOS); +// } +// } +// for (FmsFollowupVo.FollowupQueueVO followupQueueVO : queueList) { +// Integer followWindowAdys = followupQueueVO.getFollowWindowAdys(); +// +// //2. 查询队列随访患者列表 +//// changeDataSource(result); +// FmsFollowupDto.FollowupPatientQueryDTO followupPatientQueryDTO = new FmsFollowupDto.FollowupPatientQueryDTO(); +// followupPatientQueryDTO.setQueueId(followupQueueVO.getId()); +// followupPatientQueryDTO.setTenantId(followupQueueVO.getTenantId()); +// changeDataSource(result); +// +// List patientList = fmsFollowupService.queryPatient(followupPatientQueryDTO); +//// List patientList = fmsFollowupDao.queryPatient(followupQueueVO.getId(), null, null); +// if (CollectionUtil.isEmpty(patientList)) { +// continue; +// } +// //随访总月数 +// Integer followupMonth = followupQueueVO.getFollowupMonth(); +// for (FmsFollowupVo.FollowupPatient followupPatient : patientList) { +// //获取随访到期时间 出院时间+随访总月数 = 到期时间 +// Calendar calendar = Calendar.getInstance(); +// calendar.setTime(followupPatient.getDischargeTime()); +// calendar.set(Calendar.MONTH, followupMonth); +// Date time = calendar.getTime(); +// +// //获取队列信息 +// String frequency = followupQueueVO.getFrequency(); +// List dateList = new ArrayList<>(); +// try { +// CronTriggerImpl cronTrigger = new CronTriggerImpl(); +// cronTrigger.setCronExpression(frequency); +// //TriggerUtils.computeFireTimesBetween(要计算触发时间的触发器对象, 用于计算触发时间的日历对象, 计算触发时间的起始时间点, 计算触发时间的结束时间点); +// dateList = TriggerUtils.computeFireTimesBetween(cronTrigger, null, followupPatient.getDischargeTime(), time); +// if (CollectionUtil.isEmpty(dateList)) { +// continue; +// } +// } catch (Exception e) { +// e.printStackTrace(); +// } +// //3. 判断随访类型 +// if (followupQueueVO.getFollowupType() == 0) { +// //单次 +// +// //判断是否已有该次随访 +// FmsFollowupTaskExample fmsFollowupTaskExample = new FmsFollowupTaskExample(); +// fmsFollowupTaskExample.createCriteria().andTimesEqualTo(1).andPatientIdEqualTo(followupPatient.getPatientId()).andQueueIdEqualTo(followupQueueVO.getId()); +// List fmsFollowupTasks = fmsFollowupTaskMapper.selectByExample(fmsFollowupTaskExample); +// if (CollectionUtil.isNotEmpty(fmsFollowupTasks)) { +// continue; +// } +// FmsFollowupTask fmsFollowupTask = new FmsFollowupTask(); +// BeanUtil.copyProperties(followupQueueVO, fmsFollowupTask); +// fmsFollowupTask.setId(IdUtil.getSnowflakeNextId()); +// fmsFollowupTask.setName(followupPatient.getName()); +// fmsFollowupTask.setPinyinFull(followupPatient.getPinyinFull()); +// fmsFollowupTask.setPinyinSimple(followupPatient.getPinyinSimple()); +// fmsFollowupTask.setGender(followupPatient.getGender()); +// if (followupPatient.getBirthDate() != null) { +// fmsFollowupTask.setAge(DateUtil.age(followupPatient.getBirthDate(), new Date())); +// } +// fmsFollowupTask.setEthnicity(followupPatient.getEthnicity()); +// fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); +// fmsFollowupTask.setPhone(followupPatient.getPhone()); +// fmsFollowupTask.setTenantId(followupPatient.getTenantId()); +// fmsFollowupTask.setIdCardType(followupPatient.getIdCardType()); +// fmsFollowupTask.setIdCard(followupPatient.getIdCard()); +// fmsFollowupTask.setTimes(1); +// fmsFollowupTask.setQueueId(followupQueueVO.getId()); +// fmsFollowupTask.setPatientId(followupPatient.getId()); +// fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); +// fmsFollowupTask.setDelFlag((byte) 0); +// fmsFollowupTask.setCreateTime(new Date()); +// fmsFollowupTask.setStatus((byte) 0); +// +// //计算第一次随访的时间 +// DateComparator dateComparator = getDate(dateList); +// if (dateComparator.getDate() != null) { +// fmsFollowupTask.setStartTime(dateComparator.getDate()); +// } else { +// Calendar instance = Calendar.getInstance(); +// instance.setTime(dateList.get(0)); +// instance.add(Calendar.DATE, -followWindowAdys / 2); +// fmsFollowupTask.setStartTime(instance.getTime()); +// } +// Calendar instance1 = Calendar.getInstance(); +// instance1.setTime(dateList.get(0)); +// instance1.add(Calendar.DATE, followWindowAdys / 2); +// fmsFollowupTask.setEndTime(instance1.getTime()); +// fmsFollowupTask.setFollowuper(followupQueueVO.getPersonInCharge()); +// fmsFollowupTask.setFollowupTime(dateList.get(0)); +// changeDataSource(result); +// fmsFollowupTaskMapper.insertSelective(fmsFollowupTask); +// +// } else { +// //周期 +// //4. 根据频次和总月数添加 +// DateComparator dateComparator = getDate(dateList); +// if (dateComparator.getDate() == null || dateComparator.getIndex() == null) { +// continue; +// } +// Date date = dateComparator.getDate(); +// Integer index = dateComparator.getIndex(); +// +// //判断是否已有该次随访 +// FmsFollowupTaskExample fmsFollowupTaskExample = new FmsFollowupTaskExample(); +// fmsFollowupTaskExample.createCriteria().andTimesEqualTo(index).andPatientIdEqualTo(followupPatient.getPatientId()).andQueueIdEqualTo(followupQueueVO.getId()); +// List fmsFollowupTasks = fmsFollowupTaskMapper.selectByExample(fmsFollowupTaskExample); +// if (CollectionUtil.isNotEmpty(fmsFollowupTasks)) { +// continue; +// } +// +// FmsFollowupTask fmsFollowupTask = new FmsFollowupTask(); +// BeanUtil.copyProperties(followupQueueVO, fmsFollowupTask); +// fmsFollowupTask.setId(IdUtil.getSnowflakeNextId()); +// fmsFollowupTask.setName(followupPatient.getName()); +// fmsFollowupTask.setPinyinFull(followupPatient.getPinyinFull()); +// fmsFollowupTask.setPinyinSimple(followupPatient.getPinyinSimple()); +// fmsFollowupTask.setGender(followupPatient.getGender()); +// if (followupPatient.getBirthDate() != null) { +// fmsFollowupTask.setAge(DateUtil.age(followupPatient.getBirthDate(), new Date())); +// } +// fmsFollowupTask.setEthnicity(followupPatient.getEthnicity()); +// fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); +// fmsFollowupTask.setTimes(index); +// fmsFollowupTask.setPhone(followupPatient.getPhone()); +// fmsFollowupTask.setTenantId(followupPatient.getTenantId()); +// fmsFollowupTask.setIdCardType(followupPatient.getIdCardType()); +// fmsFollowupTask.setIdCard(followupPatient.getIdCard()); +// fmsFollowupTask.setId(IdUtil.getSnowflakeNextId()); +// fmsFollowupTask.setQueueId(followupQueueVO.getId()); +// fmsFollowupTask.setDelFlag((byte) 0); +// fmsFollowupTask.setCreateTime(new Date()); +// fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); +// fmsFollowupTask.setStatus((byte) 0); +// +// fmsFollowupTask.setStartTime(date); +// Calendar instance = Calendar.getInstance(); +// instance.setTime(date); +// instance.add(Calendar.DATE, followWindowAdys / 2); +// +// fmsFollowupTask.setEndTime(instance.getTime()); +// changeDataSource(result); +// fmsFollowupTask.setPatientId(followupPatient.getId()); +// fmsFollowupTaskMapper.insertSelective(fmsFollowupTask); +// } +// } +// } +// +// } +// } + } + @ApiOperation("定时任务添加随访工单") @PostMapping("/task") @Scheduled(cron = "0 0 0 * * ?") @@ -72,188 +268,29 @@ public class TaskController { // TODO 生成工单第一次生成之后2周的，往后只生成之后一周。第一次随访时间： （ 患者的出院时间 - 7 + 轮次时间） 到 （患者的出院时间 + 7 + 轮次时间 ） //查询租户，根据租户循环切换数据源，定时处理所有医院的随访工单 -// UmsDataSourceVo.Result result1 = new UmsDataSourceVo.Result(); -// result1.setDataSourceKey("MASTER"); - List query = umsDataSourceDao.query(null); - if (CollectionUtil.isEmpty(query)) { + List tenantList = umsDataSourceDao.query(null); + if (CollectionUtil.isEmpty(tenantList)) { return; } - //查询公共队列 - List queueResults = redisCache.getCacheList("common_followup_queue"); - List followupQueueVOS = new ArrayList<>(); - if (CollectionUtil.isEmpty(queueResults)) { - followupQueueVOS = fmsFollowupQueueService.queryCommonQueue(null); - } -// List queueResults = fmsFollowupDao.queryCommonQueue(null); - //切换数据源 - for (UmsDataSourceVo.Result result : query) { - if ("MASTER".equals(result.getDataSourceKey()) || "SXYFYY".equals(result.getDataSourceKey())) { - continue; - } - changeDataSource(result); - { - //获取随访患者列表，根据患者出院日时间和队列添加工单 - //1. 查询队列 - List queueList = fmsFollowupDao.selectQueueList(null, null, null, null); + //过滤掉没有数据源的租户 + tenantList = tenantList.stream().filter(result -> StrUtil.isNotEmpty(result.getDataSourceKey())).collect(Collectors.toList()); - if (CollectionUtil.isEmpty(queueList)) { - if (CollectionUtil.isEmpty(queueResults)) { - queueList = followupQueueVOS; - } - } else { - if (CollectionUtil.isEmpty(queueResults)) { - queueList.addAll(followupQueueVOS); - } - } - for (FmsFollowupVo.FollowupQueueVO followupQueueVO : queueList) { - Integer followWindowAdys = followupQueueVO.getFollowWindowAdys(); - - //2. 查询队列随访患者列表 -// changeDataSource(result); - FmsFollowupDto.FollowupPatientQueryDTO followupPatientQueryDTO = new FmsFollowupDto.FollowupPatientQueryDTO(); - followupPatientQueryDTO.setQueueId(followupQueueVO.getId()); - followupPatientQueryDTO.setTenantId(followupQueueVO.getTenantId()); - changeDataSource(result); - - List patientList = fmsFollowupService.queryPatient(followupPatientQueryDTO); -// List patientList = fmsFollowupDao.queryPatient(followupQueueVO.getId(), null, null); - if (CollectionUtil.isEmpty(patientList)) { - continue; - } - //随访总月数 - Integer followupMonth = followupQueueVO.getFollowupMonth(); - for (FmsFollowupVo.FollowupPatient followupPatient : patientList) { - //获取随访到期时间 出院时间+随访总月数 = 到期时间 - Calendar calendar = Calendar.getInstance(); - calendar.setTime(followupPatient.getDischargeTime()); - calendar.set(Calendar.MONTH, followupMonth); - Date time = calendar.getTime(); - - //获取队列信息 - String frequency = followupQueueVO.getFrequency(); - List dateList = new ArrayList<>(); - try { - CronTriggerImpl cronTrigger = new CronTriggerImpl(); - cronTrigger.setCronExpression(frequency); - //TriggerUtils.computeFireTimesBetween(要计算触发时间的触发器对象, 用于计算触发时间的日历对象, 计算触发时间的起始时间点, 计算触发时间的结束时间点); - dateList = TriggerUtils.computeFireTimesBetween(cronTrigger, null, followupPatient.getDischargeTime(), time); - if (CollectionUtil.isEmpty(dateList)) { - continue; - } - } catch (Exception e) { - e.printStackTrace(); - } - //3. 判断随访类型 - if (followupQueueVO.getFollowupType() == 0) { - //单次 - - //判断是否已有该次随访 - FmsFollowupTaskExample fmsFollowupTaskExample = new FmsFollowupTaskExample(); - fmsFollowupTaskExample.createCriteria().andTimesEqualTo(1).andPatientIdEqualTo(followupPatient.getPatientId()).andQueueIdEqualTo(followupQueueVO.getId()); - List fmsFollowupTasks = fmsFollowupTaskMapper.selectByExample(fmsFollowupTaskExample); - if (CollectionUtil.isNotEmpty(fmsFollowupTasks)) { - continue; - } - FmsFollowupTask fmsFollowupTask = new FmsFollowupTask(); - BeanUtil.copyProperties(followupQueueVO, fmsFollowupTask); - fmsFollowupTask.setId(IdUtil.getSnowflakeNextId()); - fmsFollowupTask.setName(followupPatient.getName()); - fmsFollowupTask.setPinyinFull(followupPatient.getPinyinFull()); - fmsFollowupTask.setPinyinSimple(followupPatient.getPinyinSimple()); - fmsFollowupTask.setGender(followupPatient.getGender()); - if (followupPatient.getBirthDate() != null) { - fmsFollowupTask.setAge(DateUtil.age(followupPatient.getBirthDate(), new Date())); - } - fmsFollowupTask.setEthnicity(followupPatient.getEthnicity()); - fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); - fmsFollowupTask.setPhone(followupPatient.getPhone()); - fmsFollowupTask.setTenantId(followupPatient.getTenantId()); - fmsFollowupTask.setIdCardType(followupPatient.getIdCardType()); - fmsFollowupTask.setIdCard(followupPatient.getIdCard()); - fmsFollowupTask.setTimes(1); - fmsFollowupTask.setQueueId(followupQueueVO.getId()); - fmsFollowupTask.setPatientId(followupPatient.getId()); - fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); - fmsFollowupTask.setDelFlag((byte) 0); - fmsFollowupTask.setCreateTime(new Date()); - fmsFollowupTask.setStatus((byte) 0); - - //计算第一次随访的时间 - DateComparator dateComparator = getDate(dateList); - if (dateComparator.getDate() != null) { - fmsFollowupTask.setStartTime(dateComparator.getDate()); - }else { - Calendar instance = Calendar.getInstance(); - instance.setTime(dateList.get(0)); - instance.add(Calendar.DATE, -followWindowAdys / 2); - fmsFollowupTask.setStartTime(instance.getTime()); - } - Calendar instance1 = Calendar.getInstance(); - instance1.setTime(dateList.get(0)); - instance1.add(Calendar.DATE, followWindowAdys / 2); - fmsFollowupTask.setEndTime(instance1.getTime()); - fmsFollowupTask.setFollowuper(followupQueueVO.getPersonInCharge()); - fmsFollowupTask.setFollowupTime(dateList.get(0)); - changeDataSource(result); - fmsFollowupTaskMapper.insertSelective(fmsFollowupTask); - - } else { - //周期 - //4. 根据频次和总月数添加 - DateComparator dateComparator = getDate(dateList); - if (dateComparator.getDate() == null || dateComparator.getIndex() == null) { - continue; - } - Date date = dateComparator.getDate(); - Integer index = dateComparator.getIndex(); + //查询公共队列 + List followupQueueVOS = fmsFollowupQueueService.queryCommonQueue(null); - //判断是否已有该次随访 - FmsFollowupTaskExample fmsFollowupTaskExample = new FmsFollowupTaskExample(); - fmsFollowupTaskExample.createCriteria().andTimesEqualTo(index).andPatientIdEqualTo(followupPatient.getPatientId()).andQueueIdEqualTo(followupQueueVO.getId()); - List fmsFollowupTasks = fmsFollowupTaskMapper.selectByExample(fmsFollowupTaskExample); - if (CollectionUtil.isNotEmpty(fmsFollowupTasks)) { - continue; - } + //循环租户 + for (UmsDataSourceVo.Result tenant : tenantList) { + //切换数据源 + DynamicDataSourceContextHolder.setDataSourceType(tenant.getDataSourceKey()); - FmsFollowupTask fmsFollowupTask = new FmsFollowupTask(); - BeanUtil.copyProperties(followupQueueVO, fmsFollowupTask); - fmsFollowupTask.setId(IdUtil.getSnowflakeNextId()); - fmsFollowupTask.setName(followupPatient.getName()); - fmsFollowupTask.setPinyinFull(followupPatient.getPinyinFull()); - fmsFollowupTask.setPinyinSimple(followupPatient.getPinyinSimple()); - fmsFollowupTask.setGender(followupPatient.getGender()); - if (followupPatient.getBirthDate() != null) { - fmsFollowupTask.setAge(DateUtil.age(followupPatient.getBirthDate(), new Date())); - } - fmsFollowupTask.setEthnicity(followupPatient.getEthnicity()); - fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); - fmsFollowupTask.setTimes(index); - fmsFollowupTask.setPhone(followupPatient.getPhone()); - fmsFollowupTask.setTenantId(followupPatient.getTenantId()); - fmsFollowupTask.setIdCardType(followupPatient.getIdCardType()); - fmsFollowupTask.setIdCard(followupPatient.getIdCard()); - fmsFollowupTask.setId(IdUtil.getSnowflakeNextId()); - fmsFollowupTask.setQueueId(followupQueueVO.getId()); - fmsFollowupTask.setDelFlag((byte) 0); - fmsFollowupTask.setCreateTime(new Date()); - fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); - fmsFollowupTask.setStatus((byte) 0); + //处理从库业务 + doTask(tenant.getTenantId(), followupQueueVOS); - fmsFollowupTask.setStartTime(date); - Calendar instance = Calendar.getInstance(); - instance.setTime(date); - instance.add(Calendar.DATE, followWindowAdys / 2); + //销毁数据源 + DynamicDataSourceContextHolder.clearDataSourceType(); + } - fmsFollowupTask.setEndTime(instance.getTime()); - changeDataSource(result); - fmsFollowupTask.setPatientId(followupPatient.getId()); - fmsFollowupTaskMapper.insertSelective(fmsFollowupTask); - } - } - } - } - } } private static void changeDataSource(UmsDataSourceVo.Result result) { diff --git a/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/AdminGlobalDataSourceAspect.java b/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/AdminGlobalDataSourceAspect.java index dbe8ad4c..3c130186 100644 --- a/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/AdminGlobalDataSourceAspect.java +++ b/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/AdminGlobalDataSourceAspect.java @@ -70,13 +70,11 @@ public class AdminGlobalDataSourceAspect { // 获取请求携带的令牌 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - //token为空 Long tenantId; String header = request.getHeader(UserConstants.DEPT); if(StrUtil.isNotEmpty(header)){ tenantId = Long.parseLong(header); }else { -// String deptId = request.getHeader(WebConstant.HEADER_KEY_DEPT_ID); String authHeader = request.getHeader(UserConstants.HEADER_KEY_TOKEN); if (StrUtil.isEmpty(authHeader)) { return null; @@ -86,15 +84,6 @@ public class AdminGlobalDataSourceAspect { return null; } } - - //设置所属医院和数据源 -// SecurityUtils.setCurrentHospitalId(Long.parseLong(deptId)); - -// // 获取当前的用户 -// LoginUser loginUser = SecurityUtils.getLoginUser(); -// if(ObjectUtil.isNull(loginUser) || loginUser.getUser().isAdmin()){ -// return null; -// } //根据组织ID查询数据源 UmsDataSource dataSource = dmsLoginService.getDataSourceByTenantId(tenantId); if (dataSource == null) { From 9860ba4d5620b82574713143e7b288b76722c0cb Mon Sep 17 00:00:00 2001 From: wzz Date: Fri, 28 Mar 2025 19:25:43 +0800 Subject: [PATCH 07/10] =?UTF-8?q?fix:=20=E5=A1=AB=E6=8A=A5=E7=AB=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/web/DmsLoginController.java | 50 ++++++++++++++++--- .../web/service/UserDetailsServiceImpl.java | 1 + .../system/domain/vo/DmsLoginUserVo.java | 2 +- .../system/service/DmsLoginService.java | 5 +- .../service/impl/DmsLoginServiceImpl.java | 6 ++- 5 files changed, 54 insertions(+), 10 deletions(-) diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java index 91360ec3..0061a383 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java @@ -1,5 +1,6 @@ package com.acupuncture.web.controller.web; +import com.acupuncture.common.annotation.DataSource; import com.acupuncture.common.annotation.Log; import com.acupuncture.common.constant.Constants; import com.acupuncture.common.core.domain.AjaxResult; @@ -8,6 +9,7 @@ import com.acupuncture.common.core.domain.entity.SysUser; import com.acupuncture.common.core.domain.model.LoginBody; import com.acupuncture.common.core.domain.model.LoginUser; import com.acupuncture.common.enums.BusinessType; +import com.acupuncture.common.enums.DataSourceType; import com.acupuncture.common.utils.SecurityUtils; import com.acupuncture.framework.web.service.SysPermissionService; import com.acupuncture.framework.web.service.TokenService; @@ -23,6 +25,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Map; import java.util.Set; /** @@ -53,6 +56,7 @@ public class DmsLoginController { * @return 结果 */ @PostMapping("/login") + @DataSource(DataSourceType.MASTER) public AjaxResult login(@RequestBody LoginBody loginBody) { AjaxResult ajax = AjaxResult.success(); // 生成令牌 @@ -81,14 +85,48 @@ public class DmsLoginController { return ajax; } - @PutMapping("/resetPwd") - public JsonResponse resetPwd(@RequestBody DmsLoginUserVo.DmsUserVo user) { -// webDmsLoginService.checkUserAllowed(user); -// webDmsLoginService.checkUserDataScope(user.getUserId()); - user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); - return JsonResponse.ok(dmsLoginService.resetPwd(user)); + /** + * 重置密码 + */ + @Log(title = "个人信息", businessType = BusinessType.UPDATE) + @PutMapping("/updatePwd") + @DataSource(DataSourceType.MASTER) + public AjaxResult updatePwd(@RequestBody Map params) + { + String oldPassword = params.get("oldPassword"); + String newPassword = params.get("newPassword"); + LoginUser loginUser = SecurityUtils.getLoginUser(); + Long userId = loginUser.getUserId(); + String userName = loginUser.getUsername(); + String password = loginUser.getPassword(); + if (!SecurityUtils.matchesPassword(oldPassword, password)) + { + return AjaxResult.error("修改密码失败，旧密码错误"); + } + if (SecurityUtils.matchesPassword(newPassword, password)) + { + return AjaxResult.error("新密码不能与旧密码相同"); + } + newPassword = SecurityUtils.encryptPassword(newPassword); + if (dmsLoginService.resetPwd(userId, userName, newPassword) > 0) + { + // 更新缓存用户密码 + loginUser.getUser().setPassword(newPassword); + tokenService.setLoginUser(loginUser); + return AjaxResult.success("操作成功"); + } + return AjaxResult.error("修改密码异常，请联系管理员"); } + +// @PutMapping("/resetPwd") +// public JsonResponse resetPwd(@RequestBody DmsLoginUserVo.DmsUserVo user) { +//// webDmsLoginService.checkUserAllowed(user); +//// webDmsLoginService.checkUserDataScope(user.getUserId()); +// user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); +// return JsonResponse.ok(dmsLoginService.resetPwd(user)); +// } + @PostMapping("/queryTenantById") public JsonResponse queryTenantById(@RequestBody DmsLoginUserVo.Query dto){ return JsonResponse.ok(dmsLoginService.queryById(dto.getId())); diff --git a/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/UserDetailsServiceImpl.java b/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/UserDetailsServiceImpl.java index 93dc3214..7a028599 100644 --- a/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/UserDetailsServiceImpl.java +++ b/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/UserDetailsServiceImpl.java @@ -100,6 +100,7 @@ public class UserDetailsServiceImpl implements UserDetailsService { SysUser sysUser = new SysUser(); sysUser.setUserName(user.getUsername()); + sysUser.setPassword(user.getPassword()); sysUser.setUserId(user.getDmsUserId()); return new LoginUser(user.getDmsUserId(), user.getHospitalId(), sysUser, CollUtil.newHashSet(), user.getTenantId() ,user.getScoreId()); } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java index afe90674..b11cfe63 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java @@ -22,7 +22,7 @@ public class DmsLoginUserVo { } @Data public static class DmsUserVo { - private Integer id; + private Long id; private Long tenantId; private String userName; diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/DmsLoginService.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/DmsLoginService.java index c54160fc..667bbe6c 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/DmsLoginService.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/DmsLoginService.java @@ -34,10 +34,11 @@ public interface DmsLoginService { /** * 重置用户密码 * - * @param user 用户信息 + * @param username 用户信息 + * @param password 密码 * @return 结果 */ - public int resetPwd(DmsLoginUserVo.DmsUserVo user); + public int resetPwd(Long userId, String username, String password); /** * 根据租户ID获取数据源 diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/DmsLoginServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/DmsLoginServiceImpl.java index e7989974..0ab9e407 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/DmsLoginServiceImpl.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/DmsLoginServiceImpl.java @@ -54,7 +54,11 @@ public class DmsLoginServiceImpl implements DmsLoginService { } @Override - public int resetPwd(DmsLoginUserVo.DmsUserVo user) { + public int resetPwd(Long userId, String username, String password) { + DmsLoginUserVo.DmsUserVo user = new DmsLoginUserVo.DmsUserVo(); + user.setId(userId); + user.setUserName(username); + user.setPassword(password); return dmsUserDao.updateUser(user); } From 131a6b17217540d796bb4c68e540226cfede47a0 Mon Sep 17 00:00:00 2001 From: wzz Date: Fri, 28 Mar 2025 20:12:25 +0800 Subject: [PATCH 08/10] =?UTF-8?q?fix:=20=E5=A1=AB=E6=8A=A5=E7=AB=AFgetInfo?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/web/DmsLoginController.java | 76 ++++++++++++------- .../controller/web/FmsFollowupController.java | 15 +--- .../system/domain/vo/DmsLoginUserVo.java | 2 + .../system/persist/dao/DmsUserDao.java | 7 ++ .../system/service/DmsLoginService.java | 2 + .../service/FmsFollowupQueueService.java | 1 - .../service/impl/DmsLoginServiceImpl.java | 5 ++ .../impl/FmsFollowupQueueServiceImpl.java | 1 - .../dao/{SysPowerDao.xml => DmsUserDao.xml} | 17 +++++ 9 files changed, 85 insertions(+), 41 deletions(-) rename acupuncture-system/src/main/resources/mapper/dao/{SysPowerDao.xml => DmsUserDao.xml} (85%) diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java index 0061a383..64c615f8 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java @@ -4,6 +4,7 @@ import com.acupuncture.common.annotation.DataSource; import com.acupuncture.common.annotation.Log; import com.acupuncture.common.constant.Constants; 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.domain.entity.SysUser; import com.acupuncture.common.core.domain.model.LoginBody; @@ -14,14 +15,22 @@ import com.acupuncture.common.utils.SecurityUtils; import com.acupuncture.framework.web.service.SysPermissionService; import com.acupuncture.framework.web.service.TokenService; import com.acupuncture.framework.web.service.WebDmsLoginService; +import com.acupuncture.system.domain.dto.FmsFollowupDto; import com.acupuncture.system.domain.po.DmsTenant; import com.acupuncture.system.domain.vo.DmsLoginUserVo; +import com.acupuncture.system.domain.vo.FmsFollowupVo; import com.acupuncture.system.service.DmsLoginService; +import com.acupuncture.system.service.FmsFollowupQueueService; +import com.acupuncture.system.service.FmsFollowupService; import com.acupuncture.system.service.ISysUserService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -48,6 +57,8 @@ public class DmsLoginController { private DmsLoginService dmsLoginService; @Resource private ISysUserService sysUserService; + @Resource + private FmsFollowupQueueService fmsFollowupQueueService; /** * 登录方法 @@ -66,25 +77,6 @@ public class DmsLoginController { return ajax; } - /** - * 获取用户信息 - * - * @return 用户信息 - */ - @GetMapping("getInfo") - public AjaxResult getInfo() { - LoginUser loginUser = SecurityUtils.getLoginUser(); - //获取用户从库信息 - SysUser user = sysUserService.selectUserByTenantId(loginUser.getTenantId(), loginUser.getUsername()); - //刷新token - tokenService.refreshToken(loginUser); - AjaxResult ajax = AjaxResult.success(); - ajax.put("user", user); - ajax.put("tenantId", loginUser.getTenantId()); - ajax.put("scoreId", loginUser.getScoreId()); - return ajax; - } - /** * 重置密码 */ @@ -118,16 +110,48 @@ public class DmsLoginController { return AjaxResult.error("修改密码异常，请联系管理员"); } + @ApiOperation("查询公共队列") + @PostMapping("/commonQueue") + @DataSource(DataSourceType.MASTER) + public JsonResponse> queryCommonQueue(@RequestBody @Validated BaseDto dto) { + if (dto.getPageNum() > 0) { + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + } + return JsonResponse.ok(new PageInfo<>(fmsFollowupQueueService.queryCommonQueue(dto.getParam().getName()))); + } -// @PutMapping("/resetPwd") -// public JsonResponse resetPwd(@RequestBody DmsLoginUserVo.DmsUserVo user) { -//// webDmsLoginService.checkUserAllowed(user); -//// webDmsLoginService.checkUserDataScope(user.getUserId()); -// user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); -// return JsonResponse.ok(dmsLoginService.resetPwd(user)); -// } + /** + * 获取用户信息，暂时先从主库获取 + * @return 用户信息 + */ + @ApiOperation("用户信息") + @GetMapping("/getInfo") + @DataSource(DataSourceType.MASTER) + public AjaxResult getInfo() { + LoginUser loginUser = SecurityUtils.getLoginUser(); + //获取用户从库信息 + DmsLoginUserVo.DmsUserVo tenantUser = dmsLoginService.selectTenantUserById(loginUser.getUserId()); + SysUser user = new SysUser(); + user.setUserId(tenantUser.getId()); + user.setUserName(tenantUser.getUserName()); + user.setNickName(tenantUser.getNickName()); + user.setTenantId(tenantUser.getTenantId()); + user.setTenantName(tenantUser.getTenantName()); + user.setTenantPhone(tenantUser.getTenantPhone()); + //刷新token + tokenService.refreshToken(loginUser); + AjaxResult ajax = AjaxResult.success(); + ajax.put("user", user); + return ajax; + } + /** + * 筛查接口，此接口已添加白名单，所以不需要@annomous + * @param dto + * @return + */ @PostMapping("/queryTenantById") + @DataSource(DataSourceType.MASTER) public JsonResponse queryTenantById(@RequestBody DmsLoginUserVo.Query dto){ return JsonResponse.ok(dmsLoginService.queryById(dto.getId())); } diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/FmsFollowupController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/FmsFollowupController.java index 9cfdff86..06df38de 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/FmsFollowupController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/FmsFollowupController.java @@ -4,8 +4,10 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.IdUtil; import com.acupuncture.common.annotation.Anonymous; +import com.acupuncture.common.annotation.DataSource; import com.acupuncture.common.core.domain.BaseDto; import com.acupuncture.common.core.domain.JsonResponse; +import com.acupuncture.common.enums.DataSourceType; import com.acupuncture.common.utils.SecurityUtils; import com.acupuncture.framework.datasource.DynamicDataSourceContextHolder; import com.acupuncture.system.domain.dto.FmsFollowupDto; @@ -47,22 +49,9 @@ import java.util.List; @RestController @RequestMapping("/followup") public class FmsFollowupController { - @Resource - private FmsFollowupQueueService fmsFollowupQueueService; @Resource private FmsFollowupService fmsFollowupService; - - @ApiOperation("查询公共队列") - @PostMapping("/commonQueue") - @Anonymous - public JsonResponse> queryCommonQueue(@RequestBody @Validated BaseDto dto) { - if (dto.getPageNum() > 0) { - PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); - } - return JsonResponse.ok(new PageInfo<>(fmsFollowupQueueService.queryCommonQueue(dto.getParam().getName()))); - } - @ApiOperation("查询随访队列") @PostMapping("/query") public JsonResponse> queryQueue(@RequestBody @Validated BaseDto dto) { diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java index b11cfe63..fbdf9672 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java @@ -24,6 +24,8 @@ public class DmsLoginUserVo { public static class DmsUserVo { private Long id; private Long tenantId; + private String tenantName; + private String tenantPhone; private String userName; private String password; diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/DmsUserDao.java b/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/DmsUserDao.java index a7764f18..56f59d88 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/DmsUserDao.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/DmsUserDao.java @@ -45,4 +45,11 @@ public interface DmsUserDao { DmsLoginUserVo.DmsUserVo checkUserNameUnique(String userName); DmsLoginUserVo.DmsUserVo checkPhoneUnique(String phonenumber); + + /** + * 根据租户用户id，查询租户用户信息 + * @param userId + * @return + */ + DmsLoginUserVo.DmsUserVo queryTenantUserById(Long userId); } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/DmsLoginService.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/DmsLoginService.java index 667bbe6c..218d8d73 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/DmsLoginService.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/DmsLoginService.java @@ -50,4 +50,6 @@ public interface DmsLoginService { boolean checkPhoneUnique(AdminTenantUserDto.AddDto dto); DmsTenant queryById(Long id); + + DmsLoginUserVo.DmsUserVo selectTenantUserById(Long userId); } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/FmsFollowupQueueService.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/FmsFollowupQueueService.java index 5c4000c6..326b4c74 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/FmsFollowupQueueService.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/FmsFollowupQueueService.java @@ -19,7 +19,6 @@ public interface FmsFollowupQueueService { * 查询公共队列 * @return */ - @DataSource(DataSourceType.MASTER) List queryCommonQueue(String name); } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/DmsLoginServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/DmsLoginServiceImpl.java index 0ab9e407..5ed9a215 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/DmsLoginServiceImpl.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/DmsLoginServiceImpl.java @@ -101,5 +101,10 @@ public class DmsLoginServiceImpl implements DmsLoginService { return dmsTenantMapper.selectByPrimaryKey(id); } + @Override + public DmsLoginUserVo.DmsUserVo selectTenantUserById(Long userId) { + return dmsUserDao.queryTenantUserById(userId); + } + } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/FmsFollowupQueueServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/FmsFollowupQueueServiceImpl.java index 865c4346..02f9549c 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/FmsFollowupQueueServiceImpl.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/FmsFollowupQueueServiceImpl.java @@ -29,7 +29,6 @@ public class FmsFollowupQueueServiceImpl implements FmsFollowupQueueService { public static String COMMON_FOLLOWUP_QUEUE = "common_followup_queue"; @Override - @DataSource(DataSourceType.MASTER) public List queryCommonQueue(String name) { redisCache.deleteObject(COMMON_FOLLOWUP_QUEUE); List followupQueueVOS = fmsFollowupDao.queryCommonQueue(name); diff --git a/acupuncture-system/src/main/resources/mapper/dao/SysPowerDao.xml b/acupuncture-system/src/main/resources/mapper/dao/DmsUserDao.xml similarity index 85% rename from acupuncture-system/src/main/resources/mapper/dao/SysPowerDao.xml rename to acupuncture-system/src/main/resources/mapper/dao/DmsUserDao.xml index ef0da034..b7104697 100644 --- a/acupuncture-system/src/main/resources/mapper/dao/SysPowerDao.xml +++ b/acupuncture-system/src/main/resources/mapper/dao/DmsUserDao.xml @@ -86,4 +86,21 @@ + From cb9b3e3e29943386c4ae71642ded5eaa66bc4c00 Mon Sep 17 00:00:00 2001 From: wzz Date: Fri, 28 Mar 2025 21:33:10 +0800 Subject: [PATCH 09/10] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9admin=E7=9A=84?= =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/AdminDmsUserController.java | 85 +++++++++++-------- .../src/main/resources/mbg.xml | 20 ++--- .../system/domain/dto/AdminTenantUserDto.java | 24 ++++-- .../acupuncture/system/domain/po/DmsUser.java | 17 +++- .../system/domain/po/DmsUserExample.java | 80 ++++++++++++++--- .../system/domain/vo/AdminTenantUserVo.java | 2 + .../system/persist/mapper/DmsUserMapper.java | 4 +- .../service/AdminTenantUserService.java | 1 + .../system/service/DmsLoginService.java | 2 + .../impl/AdminTenantUserServiceImpl.java | 10 ++- .../service/impl/DmsLoginServiceImpl.java | 19 ++++- .../resources/mapper/dao/AdminDmsUserDao.xml | 2 + .../resources/mapper/system/DmsUserMapper.xml | 57 ++++++++----- .../resources/mapper/system/SysUserMapper.xml | 6 +- 14 files changed, 235 insertions(+), 94 deletions(-) diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java index 580e64d1..b2c7babd 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java @@ -3,9 +3,14 @@ package com.acupuncture.web.controller.web; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; +import com.acupuncture.common.annotation.DataSource; +import com.acupuncture.common.annotation.Log; +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.domain.entity.SysUser; +import com.acupuncture.common.enums.BusinessType; +import com.acupuncture.common.enums.DataSourceType; import com.acupuncture.common.utils.SecurityUtils; import com.acupuncture.common.utils.StringUtils; import com.acupuncture.framework.datasource.DynamicDataSourceContextHolder; @@ -30,11 +35,9 @@ import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -68,6 +71,7 @@ public class AdminDmsUserController { @ApiOperation("添加租户用户") @PostMapping("/add") + @DataSource(DataSourceType.MASTER) public JsonResponse insert(@RequestBody @Validated AdminTenantUserDto.AddDto dto) { //判定租户及数据源是否存在 DmsTenant dmsTenant = dmsTenantMapper.selectByPrimaryKey(dto.getTenantId()); @@ -90,6 +94,7 @@ public class AdminDmsUserController { //切换至从库 DynamicDataSourceContextHolder.setDataSourceType(umsDataSource.getDataSourceKey()); + //新增从库数据 SysUser user = BeanUtil.copyProperties(dto, SysUser.class); if (!userService.checkUserNameUnique(user)) { @@ -113,44 +118,39 @@ public class AdminDmsUserController { @ApiOperation("修改租户用户") @PostMapping("/upd") + @DataSource(DataSourceType.MASTER) public JsonResponse update(@RequestBody @Validated AdminTenantUserDto.UpdDto dto) { - updSysUser(dto); - return JsonResponse.ok(adminTenantUserService.update(dto)); - } - - private void updSysUser(AdminTenantUserDto.UpdDto dto) { - //查询租户数据源，删除分库数据 - DmsUserExample dmsUserExample = new DmsUserExample(); - dmsUserExample.createCriteria().andDelFlagEqualTo((byte) 0).andIdEqualTo(dto.getId()); - List dmsUsers = dmsUserMapper.selectByExample(dmsUserExample); - if (CollectionUtil.isNotEmpty(dmsUsers)) { - DmsUser dmsUser = dmsUsers.get(0); - AdminTenantsDto.Query query = new AdminTenantsDto.Query(); - query.setId(dmsUser.getTenantId()); - List tenantList = adminTenantsService.query(query); - if (CollectionUtil.isNotEmpty(tenantList)) { - for (AdminTenantsVo.Result result : tenantList) { - //切换数据源 删除分库数据 - DynamicDataSourceContextHolder.setDataSourceType(result.getDataSourceKey()); - //修改分库用户 - SysUser sysUser = BeanUtil.copyProperties(dto, SysUser.class); - sysUser.setPhonenumber(dto.getContactPhone()); - userService.updateUser(sysUser); - //销毁切换数据源 - DynamicDataSourceContextHolder.clearDataSourceType(); - } - } + //判定租户及数据源是否存在 + DmsTenant dmsTenant = dmsTenantMapper.selectByPrimaryKey(dto.getTenantId()); + if (dmsTenant == null) { + return JsonResponse.ok().fail("租户不存在"); + } + UmsDataSource umsDataSource = umsDataSourceMapper.selectByPrimaryKey(dmsTenant.getDataSourceId()); + if (umsDataSource == null || StrUtil.isEmpty(umsDataSource.getDataSourceKey())) { + return JsonResponse.ok().fail("数据源不存在"); } + + //修改主库租户用户 + int rows = adminTenantUserService.update(dto); + + //切换至从库 + DynamicDataSourceContextHolder.setDataSourceType(umsDataSource.getDataSourceKey()); + + //修改从库用户信息 + SysUser sysUser = BeanUtil.copyProperties(dto, SysUser.class); + sysUser.setPhonenumber(dto.getContactPhone()); + userService.updateUser(sysUser); + + //销毁切换数据源 + DynamicDataSourceContextHolder.clearDataSourceType(); + + return JsonResponse.ok(rows); } @ApiOperation("删除租户用户") @PostMapping("/del") + @DataSource(DataSourceType.MASTER) public JsonResponse delete(@RequestBody @Validated AdminTenantUserDto.DeleteDto dto) { - delSysUser(dto); - return JsonResponse.ok(adminTenantUserService.delete(dto)); - } - - private void delSysUser(AdminTenantUserDto.DeleteDto dto) { //查询租户数据源，删除分库数据 DmsUserExample dmsUserExample = new DmsUserExample(); dmsUserExample.createCriteria().andDelFlagEqualTo((byte) 0).andIdIn(dto.getIdList()); @@ -166,14 +166,18 @@ public class AdminDmsUserController { DynamicDataSourceContextHolder.setDataSourceType(result.getDataSourceKey()); //删除分库用户 userService.deleteUserByUsername(dmsUser.getUserName()); + //销毁切换数据源 + DynamicDataSourceContextHolder.clearDataSourceType(); } } } } + return JsonResponse.ok(adminTenantUserService.delete(dto)); } @ApiOperation("查询租户用户") @PostMapping("/list") + @DataSource(DataSourceType.MASTER) public JsonResponse> query(@RequestBody @Validated BaseDto dto) { if (dto.getPageNum() > 0) { PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); @@ -181,4 +185,15 @@ public class AdminDmsUserController { return JsonResponse.ok(new PageInfo<>(adminTenantUserService.query(dto.getParam()))); } + + /** + * 重置密码 + */ + @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @PostMapping("/resetPwd") + @DataSource(DataSourceType.MASTER) + public JsonResponse resetPwd(@RequestBody @Validated AdminTenantUserDto.ResetPwd dto) { + //只修改主库密码，修改从库密码没有任何意义。 + return JsonResponse.ok(adminTenantUserService.resetPwd(dto)); + } } diff --git a/acupuncture-generator/src/main/resources/mbg.xml b/acupuncture-generator/src/main/resources/mbg.xml index 7ab9460b..3f1c96fd 100644 --- a/acupuncture-generator/src/main/resources/mbg.xml +++ b/acupuncture-generator/src/main/resources/mbg.xml @@ -20,7 +20,7 @@ @@ -57,16 +57,16 @@ - -
-
-
-
-
-
-
+ + + + + + + + - +
diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java index 672ffa58..2328d1db 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java @@ -5,7 +5,10 @@ import com.acupuncture.system.domain.po.DmsUser; import com.acupuncture.system.service.AdminTenantUserService; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -18,7 +21,7 @@ public class AdminTenantUserDto { @Data public static class AddDto { - private Integer id; + private Long id; private Long tenantId; @@ -39,16 +42,12 @@ public class AdminTenantUserDto { private String contactPhone; @ApiModelProperty("是否具有审核权限(0不具有； 1具有)") - private Byte slaverAdmin; -// -// public Long getTenantId() { -// return SecurityUtils.getTenantId(); -// } + private Byte slaverAdmin = 0; } @Data public static class UpdDto { - private Integer id; + private Long id; private Long tenantId; @@ -71,14 +70,21 @@ public class AdminTenantUserDto { @Data public static class DeleteDto { - private List idList; + private List idList; } @Data public static class Query { private Long tenantId; - private String tenantName; } + @Data + public static class ResetPwd { + @NotNull + private Long id; + @NotBlank + @Length(min = 6, max = 20) + private String password; + } } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/DmsUser.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/DmsUser.java index bc916b5f..a2a0ca44 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/DmsUser.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/DmsUser.java @@ -4,7 +4,7 @@ import java.io.Serializable; import java.util.Date; public class DmsUser implements Serializable { - private Integer id; + private Long id; private Long tenantId; @@ -20,6 +20,8 @@ public class DmsUser implements Serializable { private String sex; + private Byte slaverAdmin; + private String status; private Byte delFlag; @@ -36,11 +38,11 @@ public class DmsUser implements Serializable { private static final long serialVersionUID = 1L; - public Integer getId() { + public Long getId() { return id; } - public void setId(Integer id) { + public void setId(Long id) { this.id = id; } @@ -100,6 +102,14 @@ public class DmsUser implements Serializable { this.sex = sex == null ? null : sex.trim(); } + public Byte getSlaverAdmin() { + return slaverAdmin; + } + + public void setSlaverAdmin(Byte slaverAdmin) { + this.slaverAdmin = slaverAdmin; + } + public String getStatus() { return status; } @@ -170,6 +180,7 @@ public class DmsUser implements Serializable { sb.append(", email=").append(email); sb.append(", phonenumber=").append(phonenumber); sb.append(", sex=").append(sex); + sb.append(", slaverAdmin=").append(slaverAdmin); sb.append(", status=").append(status); sb.append(", delFlag=").append(delFlag); sb.append(", createBy=").append(createBy); diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/DmsUserExample.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/DmsUserExample.java index ce2395c7..9acc5265 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/DmsUserExample.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/DmsUserExample.java @@ -115,52 +115,52 @@ public class DmsUserExample { return (Criteria) this; } - public Criteria andIdEqualTo(Integer value) { + public Criteria andIdEqualTo(Long value) { addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andIdNotEqualTo(Integer value) { + public Criteria andIdNotEqualTo(Long value) { addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThan(Integer value) { + public Criteria andIdGreaterThan(Long value) { addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThanOrEqualTo(Integer value) { + public Criteria andIdGreaterThanOrEqualTo(Long value) { addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andIdLessThan(Integer value) { + public Criteria andIdLessThan(Long value) { addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andIdLessThanOrEqualTo(Integer value) { + public Criteria andIdLessThanOrEqualTo(Long value) { addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andIdIn(List values) { + public Criteria andIdIn(List values) { addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andIdNotIn(List values) { + public Criteria andIdNotIn(List values) { addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andIdBetween(Integer value1, Integer value2) { + public Criteria andIdBetween(Long value1, Long value2) { addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andIdNotBetween(Integer value1, Integer value2) { + public Criteria andIdNotBetween(Long value1, Long value2) { addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } @@ -645,6 +645,66 @@ public class DmsUserExample { return (Criteria) this; } + public Criteria andSlaverAdminIsNull() { + addCriterion("slaver_admin is null"); + return (Criteria) this; + } + + public Criteria andSlaverAdminIsNotNull() { + addCriterion("slaver_admin is not null"); + return (Criteria) this; + } + + public Criteria andSlaverAdminEqualTo(Byte value) { + addCriterion("slaver_admin =", value, "slaverAdmin"); + return (Criteria) this; + } + + public Criteria andSlaverAdminNotEqualTo(Byte value) { + addCriterion("slaver_admin <>", value, "slaverAdmin"); + return (Criteria) this; + } + + public Criteria andSlaverAdminGreaterThan(Byte value) { + addCriterion("slaver_admin >", value, "slaverAdmin"); + return (Criteria) this; + } + + public Criteria andSlaverAdminGreaterThanOrEqualTo(Byte value) { + addCriterion("slaver_admin >=", value, "slaverAdmin"); + return (Criteria) this; + } + + public Criteria andSlaverAdminLessThan(Byte value) { + addCriterion("slaver_admin <", value, "slaverAdmin"); + return (Criteria) this; + } + + public Criteria andSlaverAdminLessThanOrEqualTo(Byte value) { + addCriterion("slaver_admin <=", value, "slaverAdmin"); + return (Criteria) this; + } + + public Criteria andSlaverAdminIn(List values) { + addCriterion("slaver_admin in", values, "slaverAdmin"); + return (Criteria) this; + } + + public Criteria andSlaverAdminNotIn(List values) { + addCriterion("slaver_admin not in", values, "slaverAdmin"); + return (Criteria) this; + } + + public Criteria andSlaverAdminBetween(Byte value1, Byte value2) { + addCriterion("slaver_admin between", value1, value2, "slaverAdmin"); + return (Criteria) this; + } + + public Criteria andSlaverAdminNotBetween(Byte value1, Byte value2) { + addCriterion("slaver_admin not between", value1, value2, "slaverAdmin"); + return (Criteria) this; + } + public Criteria andStatusIsNull() { addCriterion("status is null"); return (Criteria) this; diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/AdminTenantUserVo.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/AdminTenantUserVo.java index 51dc94f1..2f226788 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/AdminTenantUserVo.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/AdminTenantUserVo.java @@ -38,6 +38,8 @@ public class AdminTenantUserVo { private Date createTime; private String tenantName; + + private Byte slaverAdmin; } } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/persist/mapper/DmsUserMapper.java b/acupuncture-system/src/main/java/com/acupuncture/system/persist/mapper/DmsUserMapper.java index b0fa8fc6..719f7f1e 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/persist/mapper/DmsUserMapper.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/persist/mapper/DmsUserMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param; public interface DmsUserMapper { long countByExample(DmsUserExample example); - int deleteByPrimaryKey(Integer id); + int deleteByPrimaryKey(Long id); int insert(DmsUser record); @@ -16,7 +16,7 @@ public interface DmsUserMapper { List selectByExample(DmsUserExample example); - DmsUser selectByPrimaryKey(Integer id); + DmsUser selectByPrimaryKey(Long id); int updateByExampleSelective(@Param("record") DmsUser record, @Param("example") DmsUserExample example); diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/AdminTenantUserService.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/AdminTenantUserService.java index e9c2cd1a..f62b9c6b 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/AdminTenantUserService.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/AdminTenantUserService.java @@ -21,4 +21,5 @@ public interface AdminTenantUserService { List query(AdminTenantUserDto.Query dto); + int resetPwd(AdminTenantUserDto.ResetPwd dto); } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/DmsLoginService.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/DmsLoginService.java index 218d8d73..354a7682 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/DmsLoginService.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/DmsLoginService.java @@ -52,4 +52,6 @@ public interface DmsLoginService { DmsTenant queryById(Long id); DmsLoginUserVo.DmsUserVo selectTenantUserById(Long userId); + + int updateTenantUserById(AdminTenantUserDto.UpdDto updDto); } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/AdminTenantUserServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/AdminTenantUserServiceImpl.java index 277b6928..4dc840ec 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/AdminTenantUserServiceImpl.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/AdminTenantUserServiceImpl.java @@ -35,7 +35,7 @@ public class AdminTenantUserServiceImpl implements AdminTenantUserService { @Override public int insert(AdminTenantUserDto.AddDto dto) { DmsUser dmsUser = BeanUtil.copyProperties(dto, DmsUser.class); - dmsUser.setId((int) IdUtil.getSnowflakeNextId()); + dmsUser.setId(IdUtil.getSnowflakeNextId()); dmsUser.setCreateBy(SecurityUtils.getUsername()); dmsUser.setCreateTime(new Date()); return dmsUserMapper.insertSelective(dmsUser); @@ -62,4 +62,12 @@ public class AdminTenantUserServiceImpl implements AdminTenantUserService { public List query(AdminTenantUserDto.Query dto) { return adminDmsUserDao.query(dto); } + + @Override + public int resetPwd(AdminTenantUserDto.ResetPwd dto) { + DmsUser dmsUser = new DmsUser(); + dmsUser.setId(dto.getId()); + dmsUser.setPassword(SecurityUtils.encryptPassword(dto.getPassword())); + return dmsUserMapper.updateByPrimaryKeySelective(dmsUser); + } } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/DmsLoginServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/DmsLoginServiceImpl.java index 5ed9a215..e81ae07c 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/DmsLoginServiceImpl.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/DmsLoginServiceImpl.java @@ -1,5 +1,6 @@ package com.acupuncture.system.service.impl; +import cn.hutool.core.bean.BeanUtil; import com.acupuncture.common.constant.UserConstants; import com.acupuncture.common.core.domain.entity.SysUser; import com.acupuncture.common.utils.StringUtils; @@ -10,6 +11,7 @@ import com.acupuncture.system.domain.po.UmsDataSource; import com.acupuncture.system.domain.vo.DmsLoginUserVo; import com.acupuncture.system.persist.dao.DmsUserDao; import com.acupuncture.system.persist.mapper.DmsTenantMapper; +import com.acupuncture.system.persist.mapper.DmsUserMapper; import com.acupuncture.system.persist.mapper.UmsDataSourceMapper; import com.acupuncture.system.service.DmsLoginService; import org.springframework.stereotype.Service; @@ -28,6 +30,9 @@ public class DmsLoginServiceImpl implements DmsLoginService { @Resource private DmsUserDao dmsUserDao; + @Resource + private DmsUserMapper dmsUserMapper; + @Resource private DmsTenantMapper dmsTenantMapper; @@ -106,5 +111,17 @@ public class DmsLoginServiceImpl implements DmsLoginService { return dmsUserDao.queryTenantUserById(userId); } - + @Override + public int updateTenantUserById(AdminTenantUserDto.UpdDto updDto) { + DmsUser dmsUser = new DmsUser(); + dmsUser.setId(updDto.getId()); + dmsUser.setUserName(updDto.getUserName()); + dmsUser.setNickName(updDto.getNickName()); + dmsUser.setEmail(updDto.getEmail()); + dmsUser.setPhonenumber(updDto.getPhonenumber()); + dmsUser.setSex(updDto.getSex()); + dmsUser.setTenantId(updDto.getTenantId()); + dmsUser.setSlaverAdmin(updDto.getSlaverAdmin()); + return dmsUserMapper.updateByPrimaryKeySelective(dmsUser); + } } diff --git a/acupuncture-system/src/main/resources/mapper/dao/AdminDmsUserDao.xml b/acupuncture-system/src/main/resources/mapper/dao/AdminDmsUserDao.xml index ac387340..0ef1605d 100644 --- a/acupuncture-system/src/main/resources/mapper/dao/AdminDmsUserDao.xml +++ b/acupuncture-system/src/main/resources/mapper/dao/AdminDmsUserDao.xml @@ -20,6 +20,7 @@ u.update_by as updateBy, u.update_time as updateTime, u.remark, + u.slaver_admin as slaverAdmin, t.name as tenantName FROM dms_user u @@ -34,6 +35,7 @@ AND t.name like concat('%',#{dto.tenantName},'%') + order by u.tenant_id desc, u.id desc diff --git a/acupuncture-system/src/main/resources/mapper/system/DmsUserMapper.xml b/acupuncture-system/src/main/resources/mapper/system/DmsUserMapper.xml index 0a378e18..01251565 100644 --- a/acupuncture-system/src/main/resources/mapper/system/DmsUserMapper.xml +++ b/acupuncture-system/src/main/resources/mapper/system/DmsUserMapper.xml @@ -2,7 +2,7 @@ - + @@ -10,6 +10,7 @@ + @@ -77,8 +78,8 @@ - id, tenant_id, user_name, password, nick_name, email, phonenumber, sex, status, del_flag, - create_by, create_time, update_by, update_time, remark + id, tenant_id, user_name, password, nick_name, email, phonenumber, sex, slaver_admin, + status, del_flag, create_by, create_time, update_by, update_time, remark - select from dms_user - where id = #{id,jdbcType=INTEGER} + where id = #{id,jdbcType=BIGINT} - + delete from dms_user - where id = #{id,jdbcType=INTEGER} + where id = #{id,jdbcType=BIGINT} insert into dms_user (id, tenant_id, user_name, password, nick_name, email, - phonenumber, sex, status, - del_flag, create_by, create_time, - update_by, update_time, remark - ) - values (#{id,jdbcType=INTEGER}, #{tenantId,jdbcType=BIGINT}, #{userName,jdbcType=VARCHAR}, + phonenumber, sex, slaver_admin, + status, del_flag, create_by, + create_time, update_by, update_time, + remark) + values (#{id,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}, #{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{nickName,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, - #{phonenumber,jdbcType=VARCHAR}, #{sex,jdbcType=CHAR}, #{status,jdbcType=CHAR}, - #{delFlag,jdbcType=TINYINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR} - ) + #{phonenumber,jdbcType=VARCHAR}, #{sex,jdbcType=CHAR}, #{slaverAdmin,jdbcType=TINYINT}, + #{status,jdbcType=CHAR}, #{delFlag,jdbcType=TINYINT}, #{createBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, + #{remark,jdbcType=VARCHAR}) insert into dms_user @@ -145,6 +146,9 @@ sex, + + slaver_admin, + status, @@ -169,7 +173,7 @@ - #{id,jdbcType=INTEGER}, + #{id,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}, @@ -192,6 +196,9 @@ #{sex,jdbcType=CHAR}, + + #{slaverAdmin,jdbcType=TINYINT}, + #{status,jdbcType=CHAR}, @@ -225,7 +232,7 @@ update dms_user - id = #{record.id,jdbcType=INTEGER}, + id = #{record.id,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT}, @@ -248,6 +255,9 @@ sex = #{record.sex,jdbcType=CHAR}, + + slaver_admin = #{record.slaverAdmin,jdbcType=TINYINT}, + status = #{record.status,jdbcType=CHAR}, @@ -276,7 +286,7 @@ update dms_user - set id = #{record.id,jdbcType=INTEGER}, + set id = #{record.id,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT}, user_name = #{record.userName,jdbcType=VARCHAR}, password = #{record.password,jdbcType=VARCHAR}, @@ -284,6 +294,7 @@ email = #{record.email,jdbcType=VARCHAR}, phonenumber = #{record.phonenumber,jdbcType=VARCHAR}, sex = #{record.sex,jdbcType=CHAR}, + slaver_admin = #{record.slaverAdmin,jdbcType=TINYINT}, status = #{record.status,jdbcType=CHAR}, del_flag = #{record.delFlag,jdbcType=TINYINT}, create_by = #{record.createBy,jdbcType=VARCHAR}, @@ -319,6 +330,9 @@ sex = #{sex,jdbcType=CHAR}, + + slaver_admin = #{slaverAdmin,jdbcType=TINYINT}, + status = #{status,jdbcType=CHAR}, @@ -341,7 +355,7 @@ remark = #{remark,jdbcType=VARCHAR}, - where id = #{id,jdbcType=INTEGER} + where id = #{id,jdbcType=BIGINT} update dms_user @@ -352,6 +366,7 @@ email = #{email,jdbcType=VARCHAR}, phonenumber = #{phonenumber,jdbcType=VARCHAR}, sex = #{sex,jdbcType=CHAR}, + slaver_admin = #{slaverAdmin,jdbcType=TINYINT}, status = #{status,jdbcType=CHAR}, del_flag = #{delFlag,jdbcType=TINYINT}, create_by = #{createBy,jdbcType=VARCHAR}, @@ -359,6 +374,6 @@ update_by = #{updateBy,jdbcType=VARCHAR}, update_time = #{updateTime,jdbcType=TIMESTAMP}, remark = #{remark,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} + where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml b/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml index 322dfd54..132b5550 100644 --- a/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -168,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status, create_by, remark, - slaver_admin, + slaver_admin, create_time )values( #{userId}, @@ -184,7 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status}, #{createBy}, #{remark}, - #{slaverAdmin}, + #{slaverAdmin}, sysdate() ) @@ -192,6 +192,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sys_user + tenant_id = #{tenantId}, + slaver_admin = #{slaverAdmin}, dept_id = #{deptId}, user_name = #{userName}, nick_name = #{nickName}, From 572b822fa055d4d29e546ec4c83b7c22b1f170c1 Mon Sep 17 00:00:00 2001 From: wzz Date: Fri, 28 Mar 2025 22:05:57 +0800 Subject: [PATCH 10/10] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=AB=AF=20=E7=A7=9F=E6=88=B7=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/web/AdminDataSourceController.java | 6 ++++++ .../web/controller/web/AdminTenantsController.java | 6 ++++++ .../acupuncture/web/controller/web/DmsLoginController.java | 1 + .../com/acupuncture/system/domain/vo/DmsLoginUserVo.java | 1 + .../src/main/resources/mapper/dao/DmsUserDao.xml | 3 ++- 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDataSourceController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDataSourceController.java index dfb0c11a..49e15fa1 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDataSourceController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDataSourceController.java @@ -1,7 +1,9 @@ package com.acupuncture.web.controller.web; +import com.acupuncture.common.annotation.DataSource; import com.acupuncture.common.core.domain.BaseDto; import com.acupuncture.common.core.domain.JsonResponse; +import com.acupuncture.common.enums.DataSourceType; import com.acupuncture.common.utils.SecurityUtils; import com.acupuncture.system.domain.dto.AdminDataSourceDto; import com.acupuncture.system.domain.vo.AdminDataSourceVo; @@ -34,6 +36,7 @@ public class AdminDataSourceController { @ApiOperation("添加数据源") @PostMapping("/add") + @DataSource(DataSourceType.MASTER) public JsonResponse insert(@RequestBody @Validated AdminDataSourceDto.AddDto dto) { if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) { return JsonResponse.ok().fail("无权限"); @@ -43,6 +46,7 @@ public class AdminDataSourceController { @ApiOperation("修改数据源") @PostMapping("/upd") + @DataSource(DataSourceType.MASTER) public JsonResponse update(@RequestBody @Validated AdminDataSourceDto.UpdDto dto) { if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) { return JsonResponse.ok().fail("无权限"); @@ -52,6 +56,7 @@ public class AdminDataSourceController { @ApiOperation("删除数据源") @PostMapping("/del") + @DataSource(DataSourceType.MASTER) public JsonResponse delete(@RequestBody @Validated AdminDataSourceDto.DeleteDto dto) { if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) { return JsonResponse.ok().fail("无权限"); @@ -61,6 +66,7 @@ public class AdminDataSourceController { @ApiOperation("查询数据源") @PostMapping("/list") + @DataSource(DataSourceType.MASTER) public JsonResponse> query(@RequestBody @Validated BaseDto dto) { return JsonResponse.ok(new PageInfo<>(adminDataSourceService.query(dto.getParam()))); } diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminTenantsController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminTenantsController.java index eafde8f2..c0173800 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminTenantsController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminTenantsController.java @@ -1,7 +1,9 @@ package com.acupuncture.web.controller.web; +import com.acupuncture.common.annotation.DataSource; import com.acupuncture.common.core.domain.BaseDto; import com.acupuncture.common.core.domain.JsonResponse; +import com.acupuncture.common.enums.DataSourceType; import com.acupuncture.common.utils.SecurityUtils; import com.acupuncture.system.domain.dto.AdminTenantsDto; import com.acupuncture.system.domain.vo.AdminTenantsVo; @@ -37,6 +39,7 @@ public class AdminTenantsController { @ApiOperation("添加租户") @PostMapping("/add") + @DataSource(DataSourceType.MASTER) public JsonResponse insert(@RequestBody @Validated AdminTenantsDto.AddDto dto) { if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) { return JsonResponse.ok().fail("无权限"); @@ -46,6 +49,7 @@ public class AdminTenantsController { @ApiOperation("修改租户") @PostMapping("/upd") + @DataSource(DataSourceType.MASTER) public JsonResponse update(@RequestBody @Validated AdminTenantsDto.UpdDto dto) { if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) { return JsonResponse.ok().fail("无权限"); @@ -55,6 +59,7 @@ public class AdminTenantsController { @ApiOperation("删除租户") @PostMapping("/del") + @DataSource(DataSourceType.MASTER) public JsonResponse delete(@RequestBody @Validated AdminTenantsDto.DeleteDto dto) { if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) { return JsonResponse.ok().fail("无权限"); @@ -64,6 +69,7 @@ public class AdminTenantsController { @ApiOperation("查询租户") @PostMapping("/list") + @DataSource(DataSourceType.MASTER) public JsonResponse> query(@RequestBody @Validated BaseDto dto) { if (dto.getPageNum() > 0) { PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java index 64c615f8..7eadfd7e 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java @@ -138,6 +138,7 @@ public class DmsLoginController { user.setTenantId(tenantUser.getTenantId()); user.setTenantName(tenantUser.getTenantName()); user.setTenantPhone(tenantUser.getTenantPhone()); + user.setSlaverAdmin(tenantUser.getSlaverAdmin()); //刷新token tokenService.refreshToken(loginUser); AjaxResult ajax = AjaxResult.success(); diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java index fbdf9672..ed890aed 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java @@ -35,6 +35,7 @@ public class DmsLoginUserVo { private String email; private String phonenumber; + private Byte slaverAdmin; private String sex; diff --git a/acupuncture-system/src/main/resources/mapper/dao/DmsUserDao.xml b/acupuncture-system/src/main/resources/mapper/dao/DmsUserDao.xml index b7104697..23f9908b 100644 --- a/acupuncture-system/src/main/resources/mapper/dao/DmsUserDao.xml +++ b/acupuncture-system/src/main/resources/mapper/dao/DmsUserDao.xml @@ -96,7 +96,8 @@ u.email as email, u.sex as sex, t.`name` as tenantName, - t.contact_phone as tenantPhone + t.contact_phone as tenantPhone, + u.slaver_admin as slaverAdmin from dms_user u join dms_tenant t on u.tenant_id = t.id WHERE