From 9969bea2a8c1eab64c12a51a2d24d65e5b6c0dd0 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 24 十月 2022 18:12:41 +0800
Subject: [PATCH] 日志导出乱码 日志查询导出 代码重构
---
ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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..7672d25 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
@@ -11,6 +11,7 @@
import com.ycl.service.redis.RedisService;
import com.ycl.utils.common.LiveTimeMillisecond;
import com.ycl.utils.redis.RedisKey;
+import com.ycl.vo.ViolationSettingVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -48,21 +49,22 @@
}
@Override
- public DataDictionary queryByCode(String code) {
+ public List<DataDictionary> queryByCode(String code) {
LambdaQueryWrapper<DataDictionary> queryWrapper = new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getTypeCode, code);
- DataDictionary dataDictionary = dataDictionaryMapper.selectOne(queryWrapper);
+ 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<DataDictionary> dataDictionaryPage, String keyWord) {
- Page<DataDictionary> dataDictionaryPageList = dataDictionaryMapper.listViolationPage(dataDictionaryPage,keyWord);
+ public Page listViolations(Page<ViolationSettingVO> dataDictionaryPage, String keyWord) {
+ dataDictionaryPage.setOptimizeCountSql(false);
+ Page<ViolationSettingVO> dataDictionaryPageList = dataDictionaryMapper.listViolationPage(dataDictionaryPage, keyWord);
return dataDictionaryPageList;
}
}
--
Gitblit v1.8.0