From a4cd4c2d98392cd1036f36b96c262878743a7e63 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 05 九月 2024 19:52:22 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 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 0586ddf..2f34e0b 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
@@ -7,10 +7,13 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.mapper.dict.DataDictionaryMapper;
+import com.ycl.mapper.dict.DataDictionaryMapper;
import com.ycl.service.dict.IDataDictionaryService;
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;
@@ -48,21 +51,45 @@
}
@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);
+ public Page listIllegalBuildingSettings(Integer current, Integer size, String keyWord) {
+ Page<DataDictionary> dataDictionaryPage = new Page<>();
+ dataDictionaryPage.setSize(size);
+ dataDictionaryPage.setCurrent(current);
+ Page<DataDictionary> dataDictionaryPageList = dataDictionaryMapper.listDataDictionaryPage(dataDictionaryPage, keyWord);
return dataDictionaryPageList;
}
@Override
- public Page listViolations(Page<DataDictionary> dataDictionaryPage, String keyWord) {
- Page<DataDictionary> dataDictionaryPageList = dataDictionaryMapper.listViolationPage(dataDictionaryPage,keyWord);
+ public Page listViolations(Integer current, Integer size, String keyWord) {
+ Page<ViolationSettingVO> dataDictionaryPage = new Page<>();
+ dataDictionaryPage.setSize(size);
+ dataDictionaryPage.setCurrent(current);
+ 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);
+ }
+
+ @Override
+ public List<DataDictionary> queryByRemark(String remark) {
+ LambdaQueryWrapper<DataDictionary> queryWrapper = new LambdaQueryWrapper<DataDictionary>()
+ .eq(DataDictionary::getRemark, remark);
+
+ List<DataDictionary> dataDictionary = dataDictionaryMapper.selectList(queryWrapper);
+ return dataDictionary;
+ }
}
--
Gitblit v1.8.0