Merge remote-tracking branch 'origin/main'

This commit is contained in:
liuzhaotian
2024-05-29 14:09:47 +08:00
15 changed files with 403 additions and 42 deletions
@@ -46,4 +46,14 @@ public interface DictDataApi {
CommonResult<DictDataRespDTO> parseDictData(@RequestParam("dictType") String dictType,
@RequestParam("label") String label);
@GetMapping(PREFIX + "/add")
@Operation(summary = "新增字典数据")
@Parameters({
@Parameter(name = "dictType", description = "字典类型", example = "SEX", required = true),
@Parameter(name = "label", description = "字典标签", example = "", required = true),
@Parameter(name = "value", description = "字典键值", example = "1", required = true)
})
CommonResult<Long> addDictData(@RequestParam("dictType") String dictType,
@RequestParam("label") String label,
@RequestParam("value") String value);
}
@@ -3,6 +3,7 @@ package com.cf.imes.module.system.api.dict;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.common.util.object.BeanUtils;
import com.cf.imes.module.system.api.dict.dto.DictDataRespDTO;
import com.cf.imes.module.system.controller.admin.dict.vo.data.DictDataSaveReqVO;
import com.cf.imes.module.system.dal.dataobject.dict.DictDataDO;
import com.cf.imes.module.system.service.dict.DictDataService;
import org.springframework.validation.annotation.Validated;
@@ -38,4 +39,11 @@ public class DictDataApiImpl implements DictDataApi {
return success(BeanUtils.toBean(dictData, DictDataRespDTO.class));
}
@Override
public CommonResult<Long> addDictData(String dictType, String label, String value) {
DictDataSaveReqVO createReqVO = new DictDataSaveReqVO().setDictType(dictType).setLabel(label).setValue(value);
dictDataService.createDictData(createReqVO);
return success(dictDataService.createDictData(createReqVO));
}
}
@@ -35,6 +35,7 @@ public class ProcessGroupSaveReqVO {
@NotEmpty(message = "描述不能为空")
private String description;
@Schema(description = "工序集合", requiredMode = Schema.RequiredMode.REQUIRED, example = "{}{}")
private List<ProcessRespVO> processList;
}