hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-23 23:45:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

完成部分 dict data 的单元测试

Browse Source
This commit is contained in:
YunaiV
2021-03-07 01:30:29 +08:00
parent 4120084cef
commit 92d3085b1f
8 changed files with 193 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java
View File

@ -32,7 +32,7 @@ public class SysDictDataController {
@GetMapping("/list-all-simple")
// 无需添加权限认证，因为前端全局都需要
public CommonResult<List<SysDictDataSimpleVO>> listSimpleDictDatas() {
List<SysDictDataDO> list = dictDataService.listDictDatas();
List<SysDictDataDO> list = dictDataService.getDictDataList();
return success(SysDictDataConvert.INSTANCE.convertList(list));
}
@ -40,7 +40,7 @@ public class SysDictDataController {
@GetMapping("/page")
// @PreAuthorize("@ss.hasPermi('system:dict:list')")
public CommonResult<PageResult<SysDictDataRespVO>> pageDictTypes(@Validated SysDictDataPageReqVO reqVO) {
return success(SysDictDataConvert.INSTANCE.convertPage(dictDataService.pageDictDatas(reqVO)));
return success(SysDictDataConvert.INSTANCE.convertPage(dictDataService.getDictDataPage(reqVO)));
}
@ApiOperation("/查询字典数据详细")
@ -83,7 +83,7 @@ public class SysDictDataController {
// @Log(title = "字典类型", businessType = BusinessType.EXPORT)
// @PreAuthorize("@ss.hasPermi('system:dict:export')")
public void export(HttpServletResponse response, @Validated SysDictDataExportReqVO reqVO) throws IOException {
List<SysDictDataDO> list = dictDataService.listDictDatas(reqVO);
List<SysDictDataDO> list = dictDataService.getDictDataList(reqVO);
List<SysDictDataExcelVO> excelDataList = SysDictDataConvert.INSTANCE.convertList02(list);
// 输出
ExcelUtils.write(response, "字典数据.xls", "数据列表",

2
src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataBaseVO.java
View File

@ -16,7 +16,7 @@ public class SysDictDataBaseVO {
@ApiModelProperty(value = "显示顺序不能为空", required = true, example = "1024")
@NotBlank(message = "显示顺序不能为空")
private String sort;
private Integer sort;
@ApiModelProperty(value = "字典标签", required = true, example = "芋道")
@NotBlank(message = "字典标签不能为空")

2
src/main/java/cn/iocoder/dashboard/modules/system/enums/SysErrorCodeConstants.java
View File

@ -65,7 +65,7 @@ public interface SysErrorCodeConstants {
ErrorCode DICT_TYPE_HAS_CHILDREN = new ErrorCode(1002006004, "无法删除，该字典类型还有字典数据");
// ========== 字典数据 1002007000 ==========
ErrorCode DICT_DATA_NOT_FOUND = new ErrorCode(1002007001, "当前字典数据不存在");
ErrorCode DICT_DATA_NOT_EXISTS = new ErrorCode(1002007001, "当前字典数据不存在");
ErrorCode DICT_DATA_NOT_ENABLE = new ErrorCode(1002007002, "字典数据不处于开启状态，不允许选择");
ErrorCode DICT_DATA_VALUE_DUPLICATE = new ErrorCode(1002007003, "已经存在该值的字典数据");

6
src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataService.java
View File

@ -27,7 +27,7 @@ public interface SysDictDataService extends DictDataFrameworkService {
*
* @return 字典数据全列表
*/
List<SysDictDataDO> listDictDatas();
List<SysDictDataDO> getDictDataList();
/**
* 获得字典数据分页列表
@ -35,7 +35,7 @@ public interface SysDictDataService extends DictDataFrameworkService {
* @param reqVO 分页请求
* @return 字典数据分页列表
*/
PageResult<SysDictDataDO> pageDictDatas(SysDictDataPageReqVO reqVO);
PageResult<SysDictDataDO> getDictDataPage(SysDictDataPageReqVO reqVO);
/**
* 获得字典数据列表
@ -43,7 +43,7 @@ public interface SysDictDataService extends DictDataFrameworkService {
* @param reqVO 列表请求
* @return 字典数据列表
*/
List<SysDictDataDO> listDictDatas(SysDictDataExportReqVO reqVO);
List<SysDictDataDO> getDictDataList(SysDictDataExportReqVO reqVO);
/**
* 获得字典数据详情

12
src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java
View File

@ -130,19 +130,19 @@ public class SysDictDataServiceImpl implements SysDictDataService {
}
@Override
public List<SysDictDataDO> listDictDatas() {
public List<SysDictDataDO> getDictDataList() {
List<SysDictDataDO> list = dictDataMapper.selectList();
list.sort(COMPARATOR_TYPE_AND_SORT);
return list;
}
@Override
public PageResult<SysDictDataDO> pageDictDatas(SysDictDataPageReqVO reqVO) {
public PageResult<SysDictDataDO> getDictDataPage(SysDictDataPageReqVO reqVO) {
return dictDataMapper.selectPage(reqVO);
}
@Override
public List<SysDictDataDO> listDictDatas(SysDictDataExportReqVO reqVO) {
public List<SysDictDataDO> getDictDataList(SysDictDataExportReqVO reqVO) {
List<SysDictDataDO> list = dictDataMapper.selectList(reqVO);
list.sort(COMPARATOR_TYPE_AND_SORT);
return list;
@ -194,10 +194,10 @@ public class SysDictDataServiceImpl implements SysDictDataService {
private void checkCreateOrUpdate(Long id, String label, String dictType) {
// 校验自己存在
checkDictDataExists(id);
// 校验字典数据的值的唯一性
checkDictDataValueUnique(id, dictType, label);
// 校验字典类型有效
checkDictTypeValid(dictType);
// 校验字典数据的值的唯一性
checkDictDataValueUnique(id, dictType, label);
}
private void checkDictDataValueUnique(Long id, String dictType, String label) {
@ -220,7 +220,7 @@ public class SysDictDataServiceImpl implements SysDictDataService {
}
SysDictDataDO dictData = dictDataMapper.selectById(id);
if (dictData == null) {
throw ServiceExceptionUtil.exception(DICT_DATA_NOT_FOUND);
throw ServiceExceptionUtil.exception(DICT_DATA_NOT_EXISTS);
}
}