mozhe
/
mental-tenant-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化租户查询设置

This commit is contained in:
cjw 2024-11-13 16:08:24 +08:00
parent 65cd3defa1
commit a6b6142925
11 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxCounselorController.java
View File

@ -2,6 +2,7 @@ package org.dromara.system.controller.wx;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.core.constant.TenantConstants;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
@ -11,6 +12,7 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.common.web.core.BaseController; import org.dromara.common.web.core.BaseController;
import org.dromara.system.service.ICounselorExperienceService; import org.dromara.system.service.ICounselorExperienceService;
import org.dromara.system.service.ICounselorQualificationService; import org.dromara.system.service.ICounselorQualificationService;
@ -50,7 +52,7 @@ public class WxCounselorController extends BaseController {
*/ */
@GetMapping("/pageList") @GetMapping("/pageList")
public TableDataInfo<CounselorVo> list(QueryCounselorBo bo, PageQuery pageQuery) { public TableDataInfo<CounselorVo> list(QueryCounselorBo bo, PageQuery pageQuery) {
return counselorService.queryPageList4Wx(bo, pageQuery); return TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID, () -> counselorService.queryPageList4Wx(bo, pageQuery));
} }
/** /**
@ -61,7 +63,7 @@ public class WxCounselorController extends BaseController {
@GetMapping("/{id}") @GetMapping("/{id}")
public R<CounselorVo> getInfo(@NotNull(message = "主键不能为空") public R<CounselorVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) { @PathVariable Long id) {
return R.ok(counselorService.queryById4Wx(id)); return R.ok(TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID, () -> counselorService.queryById4Wx(id)));
} }
/** /**
@ -70,7 +72,7 @@ public class WxCounselorController extends BaseController {
@GetMapping() @GetMapping()
public R<CounselorVo> getInfo() { public R<CounselorVo> getInfo() {
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
return R.ok(counselorService.queryById(userId)); return R.ok(TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID, () -> counselorService.queryById(userId)));
} }
/** /**
@ -80,7 +82,7 @@ public class WxCounselorController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PutMapping() @PutMapping()
public R<Void> editInfo(@RequestBody CounselorBo bo) { public R<Void> editInfo(@RequestBody CounselorBo bo) {
return toAjax(counselorService.updateInfo(bo)); return toAjax(TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID, () -> counselorService.updateInfo(bo)));
} }
/** /**

9
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxEvaluationController.java
View File

@ -2,6 +2,7 @@ package org.dromara.system.controller.wx;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.core.constant.TenantConstants;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.idempotent.annotation.RepeatSubmit;
@ -47,7 +48,7 @@ public class WxEvaluationController extends BaseController {
*/ */
@GetMapping("/answer/{id}") @GetMapping("/answer/{id}")
public R<List<QuestionAnswerVo>> queryAnswer(@NotNull(message = "主键不能为空") @PathVariable Long id) { public R<List<QuestionAnswerVo>> queryAnswer(@NotNull(message = "主键不能为空") @PathVariable Long id) {
return R.ok(TenantHelper.ignore(() -> evaluationService.queryQuestionAnswerListByScaleId(id))); return R.ok(TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID,() -> evaluationService.queryQuestionAnswerListByScaleId(id)));
} }
@ -58,7 +59,7 @@ public class WxEvaluationController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/record/create/{scaleId}") @PostMapping("/record/create/{scaleId}")
public R<Void> newRecord(@NotNull(message = "主键不能为空") @PathVariable Long scaleId) { public R<Void> newRecord(@NotNull(message = "主键不能为空") @PathVariable Long scaleId) {
return toAjax(TenantHelper.ignore(() -> evaluationService.newRecord(scaleId))); return toAjax(TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID,() -> evaluationService.newRecord(scaleId)));
} }
/** /**
@ -68,7 +69,7 @@ public class WxEvaluationController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/record/{id}") @PostMapping("/record/{id}")
public R<Void> checkRecord(@NotNull(message = "主键不能为空") @PathVariable Long id) { public R<Void> checkRecord(@NotNull(message = "主键不能为空") @PathVariable Long id) {
return toAjax(TenantHelper.ignore(() -> evaluationService.checkRecord(id))); return toAjax(TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID,() -> evaluationService.checkRecord(id)));
} }
/** /**
@ -78,6 +79,6 @@ public class WxEvaluationController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/record/answer") @PostMapping("/record/answer")
public R<Map<String, Object>> add(@Validated(AddGroup.class) @RequestBody SubmitAnswerBo bo) { public R<Map<String, Object>> add(@Validated(AddGroup.class) @RequestBody SubmitAnswerBo bo) {
return R.ok(TenantHelper.ignore(() -> evaluationService.submitAnswer(bo))); return R.ok(TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID,() -> evaluationService.submitAnswer(bo)));
} }
} }

11
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxMyController.java
View File

@ -54,7 +54,7 @@ public class WxMyController extends BaseController {
*/ */
@GetMapping("/num") @GetMapping("/num")
public R<List<StatisticNumVo>> getEvaluationTaskNum() { public R<List<StatisticNumVo>> getEvaluationTaskNum() {
return R.ok(TenantHelper.ignore(() -> myService.getMyNum())); return R.ok(TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID, myService::getMyNum));
} }
/** /**
@ -62,7 +62,7 @@ public class WxMyController extends BaseController {
*/ */
@GetMapping("/evaluation/task/pageList") @GetMapping("/evaluation/task/pageList")
public TableDataInfo<SysEvaluationRecordVo> taskList(PageQuery pageQuery) { public TableDataInfo<SysEvaluationRecordVo> taskList(PageQuery pageQuery) {
return TenantHelper.ignore(() -> myService.queryPersonalTaskPageList(pageQuery)); return TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID,() -> myService.queryPersonalTaskPageList(pageQuery));
} }
/** /**
@ -70,8 +70,7 @@ public class WxMyController extends BaseController {
*/ */
@GetMapping("/scale/pageList") @GetMapping("/scale/pageList")
public TableDataInfo<SysScaleVo> list(SysScaleBo bo, PageQuery pageQuery) { public TableDataInfo<SysScaleVo> list(SysScaleBo bo, PageQuery pageQuery) {
bo.setTenantId(TenantConstants.DEFAULT_TENANT_ID); return TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID,() -> myService.queryScalePageList(bo, pageQuery));
return TenantHelper.ignore(() -> myService.queryScalePageList(bo, pageQuery));
} }
/** /**
@ -113,7 +112,7 @@ public class WxMyController extends BaseController {
@GetMapping("/archive/pageList") @GetMapping("/archive/pageList")
public TableDataInfo<ArchiveStatisticVo> statisticPageList(PageQuery pageQuery) { public TableDataInfo<ArchiveStatisticVo> statisticPageList(PageQuery pageQuery) {
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
return TenantHelper.ignore(() -> archiveService.queryStatisticPageList(userId, pageQuery)); return TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID,() -> archiveService.queryStatisticPageList(userId, pageQuery));
} }
/** /**
@ -123,7 +122,7 @@ public class WxMyController extends BaseController {
public void export(BaseQueryBo bo, HttpServletResponse response) throws Exception { public void export(BaseQueryBo bo, HttpServletResponse response) throws Exception {
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
bo.setUserId(userId); bo.setUserId(userId);
String filePath = TenantHelper.ignore(() -> { String filePath = TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID,() -> {
try { try {
return sysEvaluationRecordService.getWordTemplate(bo); return sysEvaluationRecordService.getWordTemplate(bo);
} catch (Exception e) { } catch (Exception e) {

10
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxScaleController.java
View File

@ -43,8 +43,7 @@ public class WxScaleController extends BaseController {
@GetMapping("/pageList") @GetMapping("/pageList")
public TableDataInfo<SysScaleVo> pageList(SysScaleBo bo, PageQuery pageQuery) { public TableDataInfo<SysScaleVo> pageList(SysScaleBo bo, PageQuery pageQuery) {
bo.setOrderBy("num"); bo.setOrderBy("num");
bo.setTenantId(TenantConstants.DEFAULT_TENANT_ID); return TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID,() -> sysScaleService.queryPageList(bo, pageQuery));
return TenantHelper.ignore(() -> sysScaleService.queryPageList(bo, pageQuery));
} }
/** /**
@ -53,8 +52,7 @@ public class WxScaleController extends BaseController {
@GetMapping("/typeList") @GetMapping("/typeList")
public R<List<SysScaleVo>> pageListTest(SysScaleBo bo) { public R<List<SysScaleVo>> pageListTest(SysScaleBo bo) {
bo.setOrderBy("num"); bo.setOrderBy("num");
bo.setTenantId(TenantConstants.DEFAULT_TENANT_ID); return R.ok(TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID,() -> sysScaleService.queryPageListType(bo)));
return R.ok(TenantHelper.ignore(() -> sysScaleService.queryPageListType(bo)));
} }
/** /**
@ -65,7 +63,7 @@ public class WxScaleController extends BaseController {
if (StringUtils.isEmpty(scaleType)) { if (StringUtils.isEmpty(scaleType)) {
throw new ServiceException("类型不能为空"); throw new ServiceException("类型不能为空");
} }
return R.ok(TenantHelper.ignore(() ->sysScaleService.queryWxMapList(scaleType))); return R.ok(TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID,() ->sysScaleService.queryWxMapList(scaleType)));
} }
/** /**
@ -75,6 +73,6 @@ public class WxScaleController extends BaseController {
*/ */
@GetMapping("/{scaleId}") @GetMapping("/{scaleId}")
public R<SysScaleVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long scaleId) { public R<SysScaleVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long scaleId) {
return R.ok(TenantHelper.ignore(() ->sysScaleService.queryById4Wx(scaleId))); return R.ok(TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID,() ->sysScaleService.queryById4Wx(scaleId)));
} }
} }

7
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxScoreRecordController.java
View File

@ -37,8 +37,7 @@ public class WxScoreRecordController extends BaseController {
*/ */
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<ScoreRecordVo> list(ScoreRecordBo bo, PageQuery pageQuery) { public TableDataInfo<ScoreRecordVo> list(ScoreRecordBo bo, PageQuery pageQuery) {
bo.setTenantId(TenantConstants.DEFAULT_TENANT_ID); return TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID,() ->scoreRecordService.queryPageList(bo, pageQuery));
return TenantHelper.ignore(() ->scoreRecordService.queryPageList(bo, pageQuery));
} }
@ -50,7 +49,7 @@ public class WxScoreRecordController extends BaseController {
@GetMapping("/{id}") @GetMapping("/{id}")
public R<ScoreRecordVo> getInfo(@NotNull(message = "主键不能为空") public R<ScoreRecordVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) { @PathVariable Long id) {
return R.ok(TenantHelper.ignore(() ->scoreRecordService.queryById(id))); return R.ok(TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID,() ->scoreRecordService.queryById(id)));
} }
/** /**
@ -60,6 +59,6 @@ public class WxScoreRecordController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody ScoreRecordBo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody ScoreRecordBo bo) {
return toAjax(TenantHelper.ignore(() ->scoreRecordService.insertByBo(bo))); return toAjax(TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID,() ->scoreRecordService.insertByBo(bo)));
} }
} }

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ScoreRecordBo.java
View File

@ -6,7 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.tenant.core.TenantEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.system.domain.ScoreRecord; import org.dromara.system.domain.ScoreRecord;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -20,7 +20,7 @@ import java.math.BigDecimal;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@AutoMapper(target = ScoreRecord.class, reverseConvertGenerate = false) @AutoMapper(target = ScoreRecord.class, reverseConvertGenerate = false)
public class ScoreRecordBo extends TenantEntity { public class ScoreRecordBo extends BaseEntity {
/** /**
* *

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleBo.java
View File

@ -10,7 +10,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.tenant.core.TenantEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.system.domain.SysScale; import org.dromara.system.domain.SysScale;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -25,7 +25,7 @@ import java.util.List;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@AutoMapper(target = SysScale.class, reverseConvertGenerate = false) @AutoMapper(target = SysScale.class, reverseConvertGenerate = false)
public class SysScaleBo extends TenantEntity { public class SysScaleBo extends BaseEntity {
/** /**
* 测评id * 测评id

3
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleOrderVo.java
View File

@ -12,6 +12,7 @@ import org.dromara.system.domain.SysScaleOrder;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
/** /**
@ -81,5 +82,7 @@ public class SysScaleOrderVo implements Serializable {
@AutoMapping(target = "createBy") @AutoMapping(target = "createBy")
private Long createName; private Long createName;
private Date createTime;
} }

2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/MyServiceImpl.java
View File

@ -8,7 +8,6 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.constant.TenantConstants; import org.dromara.common.core.constant.TenantConstants;
import org.dromara.common.core.service.OssService; import org.dromara.common.core.service.OssService;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.satoken.utils.LoginHelper;
@ -123,7 +122,6 @@ public class MyServiceImpl implements IMyService {
List<String> list = evaluationRecordMapper.selectEvaluationScaleList(userId); List<String> list = evaluationRecordMapper.selectEvaluationScaleList(userId);
IPage<SysScaleVo> page = scaleMapper.selectVoPage(pageQuery.build(), IPage<SysScaleVo> page = scaleMapper.selectVoPage(pageQuery.build(),
new LambdaQueryWrapper<SysScale>() new LambdaQueryWrapper<SysScale>()
.eq(StringUtils.isNotBlank(bo.getTenantId()), SysScale::getTenantId, bo.getTenantId())
.in(SysScale::getScaleId, list)); .in(SysScale::getScaleId, list));
return TableDataInfo.build(page); return TableDataInfo.build(page);
} }

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ScoreRecordServiceImpl.java
View File

@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.core.constant.TenantConstants; import org.dromara.common.core.constant.TenantConstants;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.system.domain.ScoreRecord; import org.dromara.system.domain.ScoreRecord;
@ -73,7 +72,6 @@ public class ScoreRecordServiceImpl implements IScoreRecordService {
LambdaQueryWrapper<ScoreRecord> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<ScoreRecord> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getBusinessId() != null, ScoreRecord::getBusinessId, bo.getBusinessId()); lqw.eq(bo.getBusinessId() != null, ScoreRecord::getBusinessId, bo.getBusinessId());
lqw.eq(bo.getRecordStatus() != null, ScoreRecord::getRecordStatus, bo.getRecordStatus()); lqw.eq(bo.getRecordStatus() != null, ScoreRecord::getRecordStatus, bo.getRecordStatus());
lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), ScoreRecord::getTenantId, bo.getTenantId());
return lqw; return lqw;
} }
@ -85,8 +83,8 @@ public class ScoreRecordServiceImpl implements IScoreRecordService {
*/ */
@Override @Override
public Boolean insertByBo(ScoreRecordBo bo) { public Boolean insertByBo(ScoreRecordBo bo) {
bo.setTenantId(TenantConstants.DEFAULT_TENANT_ID);
ScoreRecord add = MapstructUtils.convert(bo, ScoreRecord.class); ScoreRecord add = MapstructUtils.convert(bo, ScoreRecord.class);
add.setTenantId(TenantConstants.DEFAULT_TENANT_ID);
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;
if (flag) { if (flag) {
bo.setId(add.getId()); bo.setId(add.getId());

1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleServiceImpl.java
View File

@ -158,7 +158,6 @@ public class SysScaleServiceImpl implements ISysScaleService {
lqw.like(StringUtils.isNotBlank(bo.getScaleName()), SysScale::getScaleName, bo.getScaleName()); lqw.like(StringUtils.isNotBlank(bo.getScaleName()), SysScale::getScaleName, bo.getScaleName());
lqw.like(StringUtils.isNotBlank(bo.getScaleCode()), SysScale::getScaleCode, bo.getScaleCode()); lqw.like(StringUtils.isNotBlank(bo.getScaleCode()), SysScale::getScaleCode, bo.getScaleCode());
lqw.eq(bo.getStatus() != null, SysScale::getStatus, bo.getStatus()); lqw.eq(bo.getStatus() != null, SysScale::getStatus, bo.getStatus());
lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), SysScale::getTenantId, bo.getTenantId());
if (CollUtil.isNotEmpty(bo.getScaleType())) { if (CollUtil.isNotEmpty(bo.getScaleType())) {
lqw.like(SysScale::getScaleType, bo.getScaleType().get(0)); lqw.like(SysScale::getScaleType, bo.getScaleType().get(0));
} }