From 26fc652d33fb82a75d6ec7771ca50ee414b21723 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 11 一月 2022 16:58:47 +0800
Subject: [PATCH] update 统一代码间隔符

---
 ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java |  101 +++++++++++++++++++++++++-------------------------
 1 files changed, 51 insertions(+), 50 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 1985c1e..99a39f3 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,10 @@
 package com.ruoyi.demo.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
 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,61 +22,63 @@
  * @author Lion Li
  * @date 2021-07-26
  */
+// @DS("slave") // 鍒囨崲浠庡簱鏌ヨ
 @Service
 public class TestTreeServiceImpl extends ServicePlusImpl<TestTreeMapper, TestTree, TestTreeVo> implements ITestTreeService {
 
-	@Override
-	public TestTreeVo queryById(Long id) {
-		return getVoById(id);
-	}
+    @Override
+    public TestTreeVo queryById(Long id) {
+        return getVoById(id);
+    }
 
-//	@DataSource(DataSourceType.SLAVE) // 鍒囨崲浠庡簱鏌ヨ
-	@DataScope(isUser = true)
-	@Override
-	public List<TestTreeVo> queryList(TestTreeBo bo) {
-		return listVo(buildQueryWrapper(bo));
-	}
+    // @DS("slave") // 鍒囨崲浠庡簱鏌ヨ
+    @Override
+    public List<TestTreeVo> queryList(TestTreeBo 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(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 && StringUtils.isNotBlank(dataScope.toString()),
-			dataScope != null ? dataScope.toString() : null);
-		return lqw;
-	}
+    private LambdaQueryWrapper<TestTree> buildQueryWrapper(TestTreeBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<TestTree> lqw = Wrappers.lambdaQuery();
+        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"));
+        return lqw;
+    }
 
-	@Override
-	public Boolean insertByBo(TestTreeBo bo) {
-		TestTree add = BeanUtil.toBean(bo, TestTree.class);
-		validEntityBeforeSave(add);
-		return save(add);
-	}
+    @Override
+    public Boolean insertByBo(TestTreeBo bo) {
+        TestTree add = BeanUtil.toBean(bo, TestTree.class);
+        validEntityBeforeSave(add);
+        boolean flag = save(add);
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
 
-	@Override
-	public Boolean updateByBo(TestTreeBo bo) {
-		TestTree update = BeanUtil.toBean(bo, TestTree.class);
-		validEntityBeforeSave(update);
-		return updateById(update);
-	}
+    @Override
+    public Boolean updateByBo(TestTreeBo bo) {
+        TestTree update = BeanUtil.toBean(bo, TestTree.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
 
-	/**
-	 * 淇濆瓨鍓嶇殑鏁版嵁鏍￠獙
-	 *
-	 * @param entity 瀹炰綋绫绘暟鎹�
-	 */
-	private void validEntityBeforeSave(TestTree entity) {
-		//TODO 鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
-	}
+    /**
+     * 淇濆瓨鍓嶇殑鏁版嵁鏍￠獙
+     *
+     * @param entity 瀹炰綋绫绘暟鎹�
+     */
+    private void validEntityBeforeSave(TestTree entity) {
+        //TODO 鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
+    }
 
-	@Override
-	public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-		if (isValid) {
-			//TODO 鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
-		}
-		return removeByIds(ids);
-	}
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
+        }
+        return removeByIds(ids);
+    }
 }

--
Gitblit v1.9.3