From 42cce7d9a859083818a0e10eb3b6c80385042e47 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期六, 18 三月 2023 18:20:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java
index 16a4554..67ca01b 100644
--- a/ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.mapper.dict.DataDictionaryMapper;
@@ -10,6 +11,8 @@
import com.ycl.service.redis.RedisService;
import com.ycl.utils.common.LiveTimeMillisecond;
import com.ycl.utils.redis.RedisKey;
+import com.ycl.vo.ViolationSettingVO;
+import com.ycl.vo.dict.DataDictionaryVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -47,9 +50,30 @@
}
@Override
- public DataDictionary queryByCode(String code) {
+ public List<DataDictionary> queryByCode(String code, String keyword) {
LambdaQueryWrapper<DataDictionary> queryWrapper = new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getTypeCode, code);
- DataDictionary dataDictionary = dataDictionaryMapper.selectOne(queryWrapper);
+ if (!com.aliyuncs.utils.StringUtils.isEmpty(keyword)) {
+ queryWrapper.eq(DataDictionary::getName, keyword);
+ }
+ List<DataDictionary> dataDictionary = dataDictionaryMapper.selectList(queryWrapper);
return dataDictionary;
}
+
+ @Override
+ public Page listIllegalBuildingSettings(Page<DataDictionary> dataDictionaryPage, String keyWord) {
+ Page<DataDictionary> dataDictionaryPageList = dataDictionaryMapper.listDataDictionaryPage(dataDictionaryPage, keyWord);
+ return dataDictionaryPageList;
+ }
+
+ @Override
+ public Page listViolations(Page<ViolationSettingVO> dataDictionaryPage, String keyWord) {
+ dataDictionaryPage.setOptimizeCountSql(false);
+ Page<ViolationSettingVO> dataDictionaryPageList = dataDictionaryMapper.listViolationPage(dataDictionaryPage, keyWord);
+ return dataDictionaryPageList;
+ }
+
+ @Override
+ public List<DataDictionaryVo> queryTreeType(String typeCode, Integer level) {
+ return baseMapper.queryTreeType(typeCode, level);
+ }
}
--
Gitblit v1.8.0