From a0912fe376f382cf7056e9ff3bc87a607681c981 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 21 三月 2023 11:35:41 +0800
Subject: [PATCH] 驾驶舱接口优化
---
ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 1ac3334..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
@@ -12,6 +12,7 @@
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;
@@ -49,22 +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);
+ 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);
+ 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