szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pre Merge pull request !33 from lhy/fix-dict

This commit is contained in:
lhy 2021-05-13 17:59:14 +08:00 committed by Gitee
parent d0a7c0593f 69e0b4f560
commit 703f9fca27
5 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/dict/vo/type/SysDictTypeBaseVO.java
View File

@ -23,6 +23,11 @@ public class SysDictTypeBaseVO {
@NotNull(message = "状态不能为空")
private Integer status;
@ApiModelProperty(value = "字典类型", required = true)
@NotNull(message = "字典类型不能为空")
@Size(max = 100, message = "字典类型长度不能超过100个字符")
private String type;
@ApiModelProperty(value = "备注", example = "快乐的备注")
private String remark;

13
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/dict/SysDictDataService.java
View File

@ -37,6 +37,19 @@ public interface SysDictDataService extends DictDataFrameworkService {
*/
void updateDictData(SysDictDataUpdateReqVO reqVO);
/**
* 手动更新字典数据
*/
void refreshDictData();
/**
* 更新字典类型
*
* @param oldType 旧字典类型
* @param newType 新字典类型
*/
void updateDictDataType(String oldType, String newType);
/**
* 删除字典数据
*

16
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/dict/impl/SysDictDataServiceImpl.java
View File

@ -16,6 +16,7 @@ import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.dict.SysDictDataMap
import cn.iocoder.yudao.adminserver.modules.system.mq.producer.dict.SysDictDataProducer;
import cn.iocoder.yudao.adminserver.modules.system.service.dict.SysDictDataService;
import cn.iocoder.yudao.adminserver.modules.system.service.dict.SysDictTypeService;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableTable;
import lombok.extern.slf4j.Slf4j;
@ -177,6 +178,21 @@ public class SysDictDataServiceImpl implements SysDictDataService {
dictDataProducer.sendDictDataRefreshMessage();
}
@Override
public void refreshDictData() {
initLocalCache();
}
@Override
public void updateDictDataType(String oldType, String newType) {
if (oldType == null || newType == null) {
return;
}
dictDataMapper.update(new SysDictDataDO(), new LambdaUpdateWrapper<SysDictDataDO>()
.set(SysDictDataDO::getDictType, newType)
.eq(SysDictDataDO::getDictType, oldType));
}
@Override
public void deleteDictData(Long id) {
// 校验是否存在

18
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/dict/impl/SysDictTypeServiceImpl.java
View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.adminserver.modules.system.service.dict.impl;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.adminserver.modules.system.controller.dict.vo.type.SysDictTypeCreateReqVO;
import cn.iocoder.yudao.adminserver.modules.system.controller.dict.vo.type.SysDictTypeExportReqVO;
import cn.iocoder.yudao.adminserver.modules.system.controller.dict.vo.type.SysDictTypePageReqVO;
@ -10,14 +9,15 @@ import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dict.SysDictTy
import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.dict.SysDictTypeMapper;
import cn.iocoder.yudao.adminserver.modules.system.service.dict.SysDictDataService;
import cn.iocoder.yudao.adminserver.modules.system.service.dict.SysDictTypeService;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import com.google.common.annotations.VisibleForTesting;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.adminserver.modules.system.enums.SysErrorCodeConstants.*;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
/**
* 字典类型 Service 实现类
@ -66,10 +66,13 @@ public class SysDictTypeServiceImpl implements SysDictTypeService {
@Override
public void updateDictType(SysDictTypeUpdateReqVO reqVO) {
// 校验正确性
this.checkCreateOrUpdate(reqVO.getId(), reqVO.getName(), null);
SysDictTypeDO sysDictTypeDO = this.checkCreateOrUpdate(reqVO.getId(), reqVO.getName(), null);
// 更新字典类型
SysDictTypeDO updateObj = SysDictTypeConvert.INSTANCE.convert(reqVO);
dictTypeMapper.updateById(updateObj);
// 更新字典数据,并更新缓存中的字典值
dictDataService.updateDictDataType(sysDictTypeDO.getType(), reqVO.getType());
dictDataService.refreshDictData();
}
@Override
@ -89,13 +92,14 @@ public class SysDictTypeServiceImpl implements SysDictTypeService {
return dictTypeMapper.selectList();
}
private void checkCreateOrUpdate(Long id, String name, String type) {
private SysDictTypeDO checkCreateOrUpdate(Long id, String name, String type) {
// 校验自己存在
checkDictTypeExists(id);
SysDictTypeDO sysDictTypeDO = checkDictTypeExists(id);
// 校验字典类型的名字的唯一性
checkDictTypeNameUnique(id, name);
// 校验字典类型的类型的唯一性
checkDictTypeUnique(id, type);
return sysDictTypeDO;
}
@VisibleForTesting
@ -115,6 +119,10 @@ public class SysDictTypeServiceImpl implements SysDictTypeService {
@VisibleForTesting
public void checkDictTypeUnique(Long id, String type) {
// 判断type是否为空，减少一次查询数据库的操作
if (type == null) {
return;
}
SysDictTypeDO dictType = dictTypeMapper.selectByType(type);
if (dictType == null) {
return;

2
yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/resources/META-INF/spring.factories
View File

@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
cn.iocoder.yudao.framework.operatelog.config.YudaoOperateLogAutoConfiguration
cn.iocoder.yudao.framework.dict.config.YudaoDictAutoConfiguration