zhouz/huachuang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:1.增加空辊信息管理。2.增加烘箱点位管理。3.增加生箔工序单下满卷、单上空辊、单下空辊、允许进入功能。4.优化生箔工序.5.增加烘箱工序工功能。6.手持接口等。

Browse Source
This commit is contained in:
liejiu946
2026-08-24 16:26:32 +08:00
parent 8c34cdde22
commit 20837434c4
100 changed files with 6765 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nl-module-system/nl-module-system-server/src/main/java/cn/code/nl/module/system/api/dict/DictDataApiImpl.java
View File

@@ -35,4 +35,10 @@ public class DictDataApiImpl implements DictDataApi {
return success(BeanUtils.toBean(list, DictDataRespDTO.class));
}
@Override
public CommonResult<DictDataRespDTO> parseDictData(String dictType, String label) {
DictDataDO dictDataDO = dictDataService.parseDictData(dictType,label);
return success(BeanUtils.toBean(dictDataDO, DictDataRespDTO.class));
}
}

9
nl-module-system/nl-module-system-server/src/main/java/cn/code/nl/module/system/controller/admin/dict/DictDataController.java
View File

@@ -118,4 +118,13 @@ public class DictDataController {
BeanUtils.toBean(list, DictDataRespVO.class));
}
@GetMapping(value = "/type")
@Operation(summary = "获得指定数据类型的字典数据列表")
@Parameter(name = "type", description = "字典类型", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('system:dict:query')")
public CommonResult<List<DictDataSimpleRespVO>> getDictDataListByDictType(@RequestParam("type") String type) {
List<DictDataDO> list = dictDataService.getDictDataListByDictType(type);
return success(BeanUtils.toBean(list, DictDataSimpleRespVO.class));
}
}

18
nl-module-system/nl-module-system-server/src/main/java/cn/code/nl/module/system/service/dict/DictDataServiceImpl.java
View File

@@ -69,8 +69,8 @@ public class DictDataServiceImpl implements DictDataService {
public Long createDictData(DictDataSaveReqVO createReqVO) {
// 校验字典类型有效
validateDictTypeExists(createReqVO.getDictType());
// 校验字典数据的值的唯一性
validateDictDataValueUnique(null, createReqVO.getDictType(), createReqVO.getValue());
// // 校验字典数据的值的唯一性
// validateDictDataValueUnique(null, createReqVO.getDictType(), createReqVO.getValue());
// 插入字典类型
DictDataDO dictData = BeanUtils.toBean(createReqVO, DictDataDO.class);
@@ -81,16 +81,16 @@ public class DictDataServiceImpl implements DictDataService {
@Override
@Transactional(rollbackFor = Exception.class)
public List<Long> createDictDataList(List<DictDataSaveReqVO> createReqVOList) {
Set<String> valueSet = new HashSet<>();
// Set<String> valueSet = new HashSet<>();
createReqVOList.forEach(createReqVO -> {
// 校验字典类型有效
validateDictTypeExists(createReqVO.getDictType());
String valueKey = createReqVO.getDictType() + ":" + createReqVO.getValue();
if (!valueSet.add(valueKey)) {
throw exception(DICT_DATA_VALUE_DUPLICATE);
}
// 校验字典数据的值的唯一性
validateDictDataValueUnique(null, createReqVO.getDictType(), createReqVO.getValue());
// String valueKey = createReqVO.getDictType() + ":" + createReqVO.getValue();
// if (!valueSet.add(valueKey)) {
// throw exception(DICT_DATA_VALUE_DUPLICATE);
// }
// // 校验字典数据的值的唯一性
// validateDictDataValueUnique(null, createReqVO.getDictType(), createReqVO.getValue());
});
// 批量插入字典数据