From a9488ba3c9c1e951264a349d4b191887b450ad31 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 09 十二月 2021 11:50:25 +0800
Subject: [PATCH] update 多数据源切换标注过期 3.6.0 移除 推荐使用原生注解
---
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java
index a953412..daff12b 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java
@@ -1,11 +1,11 @@
package com.ruoyi.demo.service.impl;
import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.demo.domain.TestTree;
import com.ruoyi.demo.domain.bo.TestTreeBo;
import com.ruoyi.demo.domain.vo.TestTreeVo;
@@ -23,6 +23,7 @@
* @author Lion Li
* @date 2021-07-26
*/
+// @DS("slave") // 鍒囨崲浠庡簱鏌ヨ
@Service
public class TestTreeServiceImpl extends ServicePlusImpl<TestTreeMapper, TestTree, TestTreeVo> implements ITestTreeService {
@@ -31,21 +32,22 @@
return getVoById(id);
}
-// @DataSource(DataSourceType.SLAVE) // 鍒囨崲浠庡簱鏌ヨ
- @DataScope(isUser = true)
+// @DS("slave") // 鍒囨崲浠庡簱鏌ヨ
+ @DataScope(isUser = true)
@Override
public List<TestTreeVo> queryList(TestTreeBo bo) {
- return listVo(buildQueryWrapper(bo));
+ LambdaQueryWrapper<TestTree> lqw = buildQueryWrapper(bo);
+ return listVo(lqw);
}
private LambdaQueryWrapper<TestTree> buildQueryWrapper(TestTreeBo bo) {
Map<String, Object> params = bo.getParams();
Object dataScope = params.get("dataScope");
LambdaQueryWrapper<TestTree> lqw = Wrappers.lambdaQuery();
- lqw.like(StrUtil.isNotBlank(bo.getTreeName()), TestTree::getTreeName, bo.getTreeName());
+ lqw.like(StringUtils.isNotBlank(bo.getTreeName()), TestTree::getTreeName, bo.getTreeName());
lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
TestTree::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
- lqw.apply(dataScope != null && StrUtil.isNotBlank(dataScope.toString()),
+ lqw.apply(dataScope != null && StringUtils.isNotBlank(dataScope.toString()),
dataScope != null ? dataScope.toString() : null);
return lqw;
}
@@ -54,7 +56,11 @@
public Boolean insertByBo(TestTreeBo bo) {
TestTree add = BeanUtil.toBean(bo, TestTree.class);
validEntityBeforeSave(add);
- return save(add);
+ boolean flag = save(add);
+ if (flag) {
+ bo.setId(add.getId());
+ }
+ return flag;
}
@Override
--
Gitblit v1.9.3