update 调整监控依赖 从 common 迁移到 framework

疯狂的狮子li

2021-12-24 5ca038d888922e93bf45c7bd37f3c6dce849dcff

 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 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 +22,7 @@
 * @author Lion Li
 * @date 2021-07-26
 */
// @DS("slave") // 切换从库查询
@Service
public class TestTreeServiceImpl extends ServicePlusImpl<TestTreeMapper, TestTree, TestTreeVo> implements ITestTreeService {

@@ -31,22 +31,19 @@
      return getVoById(id);
   }

//   @DataSource(DataSourceType.SLAVE) // 切换从库查询
   @DataScope(isUser = true)
//   @DS("slave") // 切换从库查询
   @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()),
         dataScope != null ? dataScope.toString() : null);
      return lqw;
   }

@@ -54,7 +51,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