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

refactor: 字典模块重构

Browse Source
This commit is contained in:
Ray.Hao
2025-03-24 07:24:32 +08:00
parent b080d11853
commit 60f94fdf7f
24 changed files with 264 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/youlai/boot/system/service/DictDataService.java → src/main/java/com/youlai/boot/system/service/DictItemService.java
View File

@@ -3,22 +3,20 @@ package com.youlai.boot.system.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
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;
import com.youlai.boot.system.model.entity.DictItem;
import com.youlai.boot.system.model.form.DictItemForm;
import com.youlai.boot.system.model.query.DictItemPageQuery;
import com.youlai.boot.system.model.vo.DictItemPageVO;
import java.util.List;
/**
* 字典数据接口
* 字典项接口
*
* @author Ray Hao
* @since 2023/3/4
*/
public interface DictDataService extends IService<DictData> {
public interface DictItemService extends IService<DictItem> {
/**
* 字典数据分页列表
@@ -26,23 +24,24 @@ public interface DictDataService extends IService<DictData> {
* @param queryParams
* @return
*/
Page<DictDataPageVO> getDictDataPage(DictDataPageQuery queryParams);
Page<DictItemPageVO> getDictItemPage(DictItemPageQuery queryParams);
/**
* 获取字典数据表单
*
* @param id 字典数据ID
* @param dictCode 字典编码
* @param itemId 字典数据ID
* @return
*/
DictDataForm getDictDataForm(Long id);
DictItemForm getDictItemForm(String dictCode,Long itemId);
/**
* 保存字典数据
* 保存字典项
*
* @param formData
* @return
*/
boolean saveDictData(DictDataForm formData);
boolean saveDictItem(DictItemForm formData);
/**
* 更新字典数据
@@ -50,14 +49,14 @@ public interface DictDataService extends IService<DictData> {
* @param formData 字典数据表单
* @return
*/
boolean updateDictData(DictDataForm formData);
boolean updateDictItem(DictItemForm formData);
/**
* 删除字典数据
*
* @param ids 字典数据ID,多个逗号分隔
*/
void deleteDictDataByIds(String ids);
void deleteDictItemByIds(String ids);
/**
* 获取字典数据列表

10
src/main/java/com/youlai/boot/system/service/DictService.java
View File

@@ -2,10 +2,10 @@ package com.youlai.boot.system.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.youlai.boot.common.model.Option;
import com.youlai.boot.system.model.entity.Dict;
import com.youlai.boot.system.model.form.DictForm;
import com.youlai.boot.system.model.query.DictPageQuery;
import com.youlai.boot.system.model.vo.DictItemOptionVO;
import com.youlai.boot.system.model.vo.DictPageVO;
import com.youlai.boot.system.model.vo.DictVO;
@@ -59,11 +59,11 @@ public interface DictService extends IService<Dict> {
*/
void deleteDictByIds(List<String> ids);
/**
* 获取字典列表（包含字典数据）
* 获取字典项列表
*
* @return 字典列表
* @param dictCode 字典编码
* @return 字典项列表
*/
List<DictVO> getAllDictWithData();
List<DictItemOptionVO> getDictItems(String dictCode);
}

46
src/main/java/com/youlai/boot/system/service/impl/DictDataServiceImpl.java → src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java
View File

@@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.youlai.boot.common.model.Option;
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;
import com.youlai.boot.system.mapper.DictItemMapper;
import com.youlai.boot.system.model.entity.DictItem;
import com.youlai.boot.system.model.form.DictItemForm;
import com.youlai.boot.system.model.query.DictItemPageQuery;
import com.youlai.boot.system.model.vo.DictItemPageVO;
import com.youlai.boot.system.service.DictItemService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -26,7 +25,7 @@ import java.util.List;
*/
@Service
@RequiredArgsConstructor
public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> implements DictDataService {
public class DictItemServiceImpl extends ServiceImpl<DictItemMapper, DictItem> implements DictItemService {
private final DictDataConverter dictDataConverter;
@@ -37,23 +36,24 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
* @return
*/
@Override
public Page<DictDataPageVO> getDictDataPage(DictDataPageQuery queryParams) {
public Page<DictItemPageVO> getDictItemPage(DictItemPageQuery queryParams) {
int pageNum = queryParams.getPageNum();
int pageSize = queryParams.getPageSize();
Page<DictDataPageVO> page = new Page<>(pageNum, pageSize);
Page<DictItemPageVO> page = new Page<>(pageNum, pageSize);
return this.baseMapper.getDictDataPage(page, queryParams);
return this.baseMapper.getDictItemPage(page, queryParams);
}
/**
* 获取字典数据表单
* 获取字典项表单
*
* @param id 字典数据ID
* @param dictCode 字典编码
* @param itemId 字典数据ID
* @return
*/
@Override
public DictDataForm getDictDataForm(Long id) {
DictData entity = this.getById(id);
public DictItemForm getDictItemForm(String dictCode,Long itemId) {
DictItem entity = this.getById(itemId);
return dictDataConverter.toForm(entity);
}
@@ -64,8 +64,8 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
* @return
*/
@Override
public boolean saveDictData(DictDataForm formData) {
DictData entity = dictDataConverter.toEntity(formData);
public boolean saveDictItem(DictItemForm formData) {
DictItem entity = dictDataConverter.toEntity(formData);
return this.save(entity);
}
@@ -76,8 +76,8 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
* @return
*/
@Override
public boolean updateDictData(DictDataForm formData) {
DictData entity = dictDataConverter.toEntity(formData);
public boolean updateDictItem(DictItemForm formData) {
DictItem entity = dictDataConverter.toEntity(formData);
return this.updateById(entity);
}
@@ -87,7 +87,7 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
* @param ids 字典数据ID集合
*/
@Override
public void deleteDictDataByIds(String ids) {
public void deleteDictItemByIds(String ids) {
List<Long> idList = Arrays.stream(ids.split(",")).map(Long::parseLong).toList();
this.removeByIds(idList);
}
@@ -100,9 +100,9 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
*/
@Override
public List<Option<String>> getDictDataList(String dictCode) {
return this.list(new LambdaQueryWrapper<DictData>()
.eq(DictData::getDictCode, dictCode)
.eq(DictData::getStatus, 1)
return this.list(new LambdaQueryWrapper<DictItem>()
.eq(DictItem::getDictCode, dictCode)
.eq(DictItem::getStatus, 1)
).stream().map(item -> new Option<>(item.getValue(), item.getLabel(),item.getTagType()))
.toList();
}

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

@@ -6,15 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.youlai.boot.common.exception.BusinessException;
import com.youlai.boot.system.converter.DictConverter;
import com.youlai.boot.system.converter.DictDataConverter;
import com.youlai.boot.system.mapper.DictMapper;
import com.youlai.boot.system.model.entity.Dict;
import com.youlai.boot.system.model.entity.DictData;
import com.youlai.boot.system.model.entity.DictItem;
import com.youlai.boot.system.model.form.DictForm;
import com.youlai.boot.system.model.query.DictPageQuery;
import com.youlai.boot.system.model.vo.DictItemOptionVO;
import com.youlai.boot.system.model.vo.DictPageVO;
import com.youlai.boot.system.model.vo.DictVO;
import com.youlai.boot.system.service.DictDataService;
import com.youlai.boot.system.service.DictItemService;
import com.youlai.boot.system.service.DictService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -32,9 +31,8 @@ import java.util.List;
@RequiredArgsConstructor
public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements DictService {
private final DictDataService dictDataService;
private final DictItemService dictItemService;
private final DictConverter dictConverter;
private final DictDataConverter dictDataConverter;
/**
* 字典分页列表
@@ -65,7 +63,7 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
String dictCode = entity.getDictCode();
long count = this.count(new LambdaQueryWrapper<Dict>()
.eq(Dict::getDictCode, dictCode)
.eq(Dict::getDictCode, dictCode)
);
Assert.isTrue(count == 0, "字典编码已存在");
@@ -127,9 +125,9 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
boolean removeResult = this.removeById(id);
// 删除字典下的字典项
if (removeResult) {
dictDataService.remove(
new LambdaQueryWrapper<DictData>()
.eq(DictData::getDictCode, dict.getDictCode())
dictItemService.remove(
new LambdaQueryWrapper<DictItem>()
.eq(DictItem::getDictCode, dict.getDictCode())
);
}
@@ -137,13 +135,28 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
}
}
/**
* 获取字典列表（包含字典数据）
*/
@Override
public List<DictVO> getAllDictWithData() {
return this.baseMapper.getAllDictWithData();
}
/**
* 获取字典项列表
*
* @param dictCode 字典编码
*/
@Override
public List<DictItemOptionVO> getDictItems(String dictCode) {
return dictItemService.list(
new LambdaQueryWrapper<DictItem>()
.eq(DictItem::getDictCode, dictCode)
.eq(DictItem::getStatus, 1)
.orderByAsc(DictItem::getSort)
).stream()
.map(item -> {
DictItemOptionVO dictItemOptionVO = new DictItemOptionVO();
dictItemOptionVO.setLabel(item.getLabel());
dictItemOptionVO.setValue(item.getValue());
dictItemOptionVO.setTagType(item.getTagType());
return dictItemOptionVO;
}).toList();
}
}

10
src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
View File

@@ -24,7 +24,7 @@ import com.youlai.boot.system.mapper.UserMapper;
import com.youlai.boot.system.model.bo.UserBO;
import com.youlai.boot.system.model.dto.UserAuthInfo;
import com.youlai.boot.system.model.dto.UserExportDTO;
import com.youlai.boot.system.model.entity.DictData;
import com.youlai.boot.system.model.entity.DictItem;
import com.youlai.boot.system.model.entity.User;
import com.youlai.boot.system.model.entity.UserRole;
import com.youlai.boot.system.model.form.*;
@@ -69,7 +69,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
private final TokenManager tokenManager;
private final DictDataService dictDataService;
private final DictItemService dictItemService;
private final UserConverter userConverter;
@@ -287,11 +287,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
List<UserExportDTO> exportUsers = this.baseMapper.listExportUsers(queryParams);
if (CollectionUtil.isNotEmpty(exportUsers)) {
//获取角色的字典数据
Map<String, String> genderMap = dictDataService.list(
new LambdaQueryWrapper<DictData>().eq(DictData::getDictCode,
Map<String, String> genderMap = dictItemService.list(
new LambdaQueryWrapper<DictItem>().eq(DictItem::getDictCode,
DictCodeEnum.GENDER.getValue())
).stream()
.collect(Collectors.toMap(DictData::getValue, DictData::getLabel)
.collect(Collectors.toMap(DictItem::getValue, DictItem::getLabel)
);
exportUsers.forEach(item -> {