From b5b1b94a9d21712a8dc5710bb2ac1c389d79cca1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 21 一月 2022 14:55:44 +0800
Subject: [PATCH] update springboot 2.6.2 => 2.6.3
---
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java | 116 +++++++++++++++++++++++++++++----------------------------
1 files changed, 59 insertions(+), 57 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 36482f1..3e7fa20 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 lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.Collection;
@@ -23,63 +20,68 @@
* 娴嬭瘯鏍戣〃Service涓氬姟灞傚鐞�
*
* @author Lion Li
- * @date 2021-05-30
+ * @date 2021-07-26
*/
+// @DS("slave") // 鍒囨崲浠庡簱鏌ヨ
+@RequiredArgsConstructor
@Service
-public class TestTreeServiceImpl extends ServicePlusImpl<TestTreeMapper, TestTree> implements ITestTreeService {
+public class TestTreeServiceImpl implements ITestTreeService {
- @Override
- public TestTreeVo queryById(Long id) {
- return getVoById(id, TestTreeVo.class);
- }
+ private final TestTreeMapper baseMapper;
-// @DataSource(DataSourceType.SLAVE) // 鍒囨崲浠庡簱鏌ヨ
- @DataScope(isUser = true)
- @Override
- public List<TestTreeVo> queryList(TestTreeQueryBo bo) {
- return listVo(buildQueryWrapper(bo), TestTreeVo.class);
- }
+ @Override
+ public TestTreeVo queryById(Long id) {
+ return baseMapper.selectVoById(id);
+ }
- private LambdaQueryWrapper<TestTree> buildQueryWrapper(TestTreeQueryBo 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.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;
- }
+ // @DS("slave") // 鍒囨崲浠庡簱鏌ヨ
+ @Override
+ public List<TestTreeVo> queryList(TestTreeBo bo) {
+ LambdaQueryWrapper<TestTree> lqw = buildQueryWrapper(bo);
+ return baseMapper.selectVoList(lqw);
+ }
- @Override
- public Boolean insertByAddBo(TestTreeAddBo bo) {
- TestTree add = BeanUtil.toBean(bo, TestTree.class);
- validEntityBeforeSave(add);
- return save(add);
- }
+ 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 updateByEditBo(TestTreeEditBo bo) {
- TestTree update = BeanUtil.toBean(bo, TestTree.class);
- validEntityBeforeSave(update);
- return updateById(update);
- }
+ @Override
+ public Boolean insertByBo(TestTreeBo bo) {
+ TestTree add = BeanUtil.toBean(bo, TestTree.class);
+ validEntityBeforeSave(add);
+ boolean flag = baseMapper.insert(add) > 0;
+ if (flag) {
+ bo.setId(add.getId());
+ }
+ return flag;
+ }
- /**
- * 淇濆瓨鍓嶇殑鏁版嵁鏍￠獙
- *
- * @param entity 瀹炰綋绫绘暟鎹�
- */
- private void validEntityBeforeSave(TestTree entity) {
- //TODO 鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
- }
+ @Override
+ public Boolean updateByBo(TestTreeBo bo) {
+ TestTree update = BeanUtil.toBean(bo, TestTree.class);
+ validEntityBeforeSave(update);
+ return baseMapper.updateById(update) > 0;
+ }
- @Override
- public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
- if (isValid) {
- //TODO 鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
- }
- return removeByIds(ids);
- }
+ /**
+ * 淇濆瓨鍓嶇殑鏁版嵁鏍￠獙
+ *
+ * @param entity 瀹炰綋绫绘暟鎹�
+ */
+ private void validEntityBeforeSave(TestTree entity) {
+ //TODO 鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
+ }
+
+ @Override
+ public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+ if (isValid) {
+ //TODO 鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
+ }
+ return baseMapper.deleteBatchIds(ids) > 0;
+ }
}
--
Gitblit v1.9.3