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