From a7833a3b722d09240ff957e7b91e057c6f51d596 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 15 五月 2021 14:34:54 +0800
Subject: [PATCH] remove 移除ruoyi自带服务监控(Admin已全部包含)
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
index a096a26..faae4aa 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
@@ -1,13 +1,17 @@
package com.ruoyi.system.service.impl;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.service.ISysDictDataService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
import java.util.List;
/**
@@ -17,8 +21,16 @@
*/
@Service
public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDictData> implements ISysDictDataService {
- @Autowired
- private SysDictDataMapper dictDataMapper;
+
+ @Override
+ public TableDataInfo<SysDictData> selectPageDictDataList(SysDictData dictData) {
+ LambdaQueryWrapper<SysDictData> lqw = new LambdaQueryWrapper<SysDictData>()
+ .eq(StrUtil.isNotBlank(dictData.getDictType()), SysDictData::getDictType, dictData.getDictType())
+ .like(StrUtil.isNotBlank(dictData.getDictLabel()), SysDictData::getDictLabel, dictData.getDictLabel())
+ .eq(StrUtil.isNotBlank(dictData.getStatus()), SysDictData::getStatus, dictData.getStatus())
+ .orderByAsc(SysDictData::getDictSort);
+ return PageUtils.buildDataInfo(page(PageUtils.buildPage(),lqw));
+ }
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瀛楀吀鏁版嵁
@@ -28,7 +40,11 @@
*/
@Override
public List<SysDictData> selectDictDataList(SysDictData dictData) {
- return dictDataMapper.selectDictDataList(dictData);
+ return list(new LambdaQueryWrapper<SysDictData>()
+ .eq(StrUtil.isNotBlank(dictData.getDictType()), SysDictData::getDictType, dictData.getDictType())
+ .like(StrUtil.isNotBlank(dictData.getDictLabel()), SysDictData::getDictLabel, dictData.getDictLabel())
+ .eq(StrUtil.isNotBlank(dictData.getStatus()), SysDictData::getStatus, dictData.getStatus())
+ .orderByAsc(SysDictData::getDictSort));
}
/**
@@ -40,7 +56,11 @@
*/
@Override
public String selectDictLabel(String dictType, String dictValue) {
- return dictDataMapper.selectDictLabel(dictType, dictValue);
+ return getOne(new LambdaQueryWrapper<SysDictData>()
+ .select(SysDictData::getDictLabel)
+ .eq(SysDictData::getDictType, dictType)
+ .eq(SysDictData::getDictValue, dictValue))
+ .getDictLabel();
}
/**
@@ -51,7 +71,7 @@
*/
@Override
public SysDictData selectDictDataById(Long dictCode) {
- return dictDataMapper.selectDictDataById(dictCode);
+ return getById(dictCode);
}
/**
@@ -62,7 +82,7 @@
*/
@Override
public int deleteDictDataByIds(Long[] dictCodes) {
- int row = dictDataMapper.deleteDictDataByIds(dictCodes);
+ int row = baseMapper.deleteBatchIds(Arrays.asList(dictCodes));
if (row > 0) {
DictUtils.clearDictCache();
}
@@ -77,7 +97,7 @@
*/
@Override
public int insertDictData(SysDictData dictData) {
- int row = dictDataMapper.insertDictData(dictData);
+ int row = baseMapper.insert(dictData);
if (row > 0) {
DictUtils.clearDictCache();
}
@@ -92,7 +112,7 @@
*/
@Override
public int updateDictData(SysDictData dictData) {
- int row = dictDataMapper.updateDictData(dictData);
+ int row = baseMapper.updateById(dictData);
if (row > 0) {
DictUtils.clearDictCache();
}
--
Gitblit v1.9.3