tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip: 字典重构临时提交

Browse Source
This commit is contained in:
ray
2024-10-03 17:41:38 +08:00
parent 7dc8e61989
commit 3f2a5a28df
15 changed files with 82 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/youlai/boot/system/service/DictDataService.java
View File

@@ -6,6 +6,7 @@ import com.youlai.boot.common.model.Option;
import com.youlai.boot.system.model.entity.DictData;
import com.youlai.boot.system.model.form.DictDataForm;
import com.youlai.boot.system.model.form.DictForm;
import com.youlai.boot.system.model.query.DictDataPageQuery;
import com.youlai.boot.system.model.query.DictPageQuery;
import com.youlai.boot.system.model.vo.DictDataPageVO;
@@ -25,7 +26,7 @@ public interface DictDataService extends IService<DictData> {
* @param queryParams
* @return
*/
Page<DictDataPageVO> getDictDataPage(DictPageQuery queryParams);
Page<DictDataPageVO> getDictDataPage(DictDataPageQuery queryParams);
/**
* 获取字典数据表单

3
src/main/java/com/youlai/boot/system/service/impl/DictDataServiceImpl.java
View File

@@ -8,6 +8,7 @@ import com.youlai.boot.system.converter.DictDataConverter;
import com.youlai.boot.system.mapper.DictDataMapper;
import com.youlai.boot.system.model.entity.DictData;
import com.youlai.boot.system.model.form.DictDataForm;
import com.youlai.boot.system.model.query.DictDataPageQuery;
import com.youlai.boot.system.model.query.DictPageQuery;
import com.youlai.boot.system.model.vo.DictDataPageVO;
import com.youlai.boot.system.service.DictDataService;
@@ -36,7 +37,7 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
* @return
*/
@Override
public Page<DictDataPageVO> getDictDataPage(DictPageQuery queryParams) {
public Page<DictDataPageVO> getDictDataPage(DictDataPageQuery queryParams) {
int pageNum = queryParams.getPageNum();
int pageSize = queryParams.getPageSize();
Page<DictDataPageVO> page = new Page<>(pageNum, pageSize);

19
src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java
View File

@@ -23,7 +23,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.stream.Collectors;
/**
* 数据字典业务实现类
@@ -65,10 +64,10 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
Dict entity = dictConverter.toEntity(dictForm);
// 校验 code 是否唯一
String dictCode = entity.getCode();
String dictCode = entity.getDictCode();
long count = this.count(new LambdaQueryWrapper<Dict>()
.eq(Dict::getCode, dictCode)
.eq(Dict::getDictCode, dictCode)
);
Assert.isTrue(count == 0, "字典编码已存在");
@@ -103,9 +102,9 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
Dict entity = dictConverter.toEntity(dictForm);
// 校验 code 是否唯一
String dictCode = entity.getCode();
String dictCode = entity.getDictCode();
long count = this.count(new LambdaQueryWrapper<Dict>()
.eq(Dict::getCode, dictCode)
.eq(Dict::getDictCode, dictCode)
.ne(Dict::getId, id)
);
if(count>0){
@@ -137,7 +136,7 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
if (removeResult) {
dictDataService.remove(
new LambdaQueryWrapper<DictData>()
.eq(DictData::getDictCode, dict.getCode())
.eq(DictData::getDictCode, dict.getDictCode())
);
}
@@ -154,7 +153,7 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
public List<Option<Long>> listDictItemsByCode(String code) {
// 根据字典编码获取字典ID
Dict dict = this.getOne(new LambdaQueryWrapper<Dict>()
.eq(Dict::getCode, code)
.eq(Dict::getDictCode, code)
.select(Dict::getId)
.last("limit 1")
);
@@ -166,7 +165,7 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
// 获取字典项
List<DictData> dictData = dictDataService.list(
new LambdaQueryWrapper<DictData>()
.eq(DictData::getDictCode, dict.getCode())
.eq(DictData::getDictCode, dict.getDictCode())
);
// 转换为 Option
@@ -180,9 +179,9 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
public List<Option<String>> getDictList() {
return this.list(new LambdaQueryWrapper<Dict>()
.eq(Dict::getStatus, 1)
.select(Dict::getName, Dict::getCode)
.select(Dict::getName, Dict::getDictCode)
).stream()
.map(dict -> new Option<>(dict.getCode(), dict.getName()))
.map(dict -> new Option<>(dict.getDictCode(), dict.getName()))
.toList();
}
}