From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 24 十二月 2021 11:36:02 +0800
Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework
---
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 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 78047d6..c4097e6 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,18 +1,15 @@
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.demo.bo.TestTreeAddBo;
-import com.ruoyi.demo.bo.TestTreeEditBo;
-import com.ruoyi.demo.bo.TestTreeQueryBo;
+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;
import com.ruoyi.demo.mapper.TestTreeMapper;
import com.ruoyi.demo.service.ITestTreeService;
-import com.ruoyi.demo.vo.TestTreeVo;
import org.springframework.stereotype.Service;
import java.util.Collection;
@@ -23,43 +20,46 @@
* 娴嬭瘯鏍戣〃Service涓氬姟灞傚鐞�
*
* @author Lion Li
- * @date 2021-05-30
+ * @date 2021-07-26
*/
+// @DS("slave") // 鍒囨崲浠庡簱鏌ヨ
@Service
-public class TestTreeServiceImpl extends ServicePlusImpl<TestTreeMapper, TestTree> implements ITestTreeService {
+public class TestTreeServiceImpl extends ServicePlusImpl<TestTreeMapper, TestTree, TestTreeVo> implements ITestTreeService {
@Override
public TestTreeVo queryById(Long id) {
- return getVoById(id, TestTreeVo.class);
+ return getVoById(id);
}
- @DataScope(isUser = true)
+// @DS("slave") // 鍒囨崲浠庡簱鏌ヨ
@Override
- public List<TestTreeVo> queryList(TestTreeQueryBo bo) {
- return listVo(buildQueryWrapper(bo), TestTreeVo.class);
+ public List<TestTreeVo> queryList(TestTreeBo bo) {
+ LambdaQueryWrapper<TestTree> lqw = buildQueryWrapper(bo);
+ return listVo(lqw);
}
- private LambdaQueryWrapper<TestTree> buildQueryWrapper(TestTreeQueryBo bo) {
+ 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()),
- dataScope != null ? dataScope.toString() : null);
return lqw;
}
@Override
- public Boolean insertByAddBo(TestTreeAddBo bo) {
+ 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
- public Boolean updateByEditBo(TestTreeEditBo bo) {
+ public Boolean updateByBo(TestTreeBo bo) {
TestTree update = BeanUtil.toBean(bo, TestTree.class);
validEntityBeforeSave(update);
return updateById(update);
--
Gitblit v1.9.3