diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java index f064b2bb1..7ca05a731 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java @@ -183,10 +183,12 @@ public interface ErrorCodeConstants { ErrorCode MACHINE_NOT_EXISTS = new ErrorCode(1_002_029_000, "机台不存在"); ErrorCode MACHINE_TEMPLATE_NOT_EXISTS = new ErrorCode(1_002_029_001, "机台模板不存在"); ErrorCode DEFAULT_TEMPLATE_COUNT = new ErrorCode(1_002_029_002, "默认模板数量异常"); + ErrorCode DEFAULT_TEMPLATE_NOT_EXISTS = new ErrorCode(1_002_029_003, "该类型机台默认模板不存在"); // ========== 标签模板 1-002-300-000 ========== ErrorCode LABEL_TEMPLATE_NOT_EXISTS = new ErrorCode(1_002_300_000, "标签模板不存在"); ErrorCode LABEL_NOT_EXISTS = new ErrorCode(1_002_300_001, "标签不存在"); + ErrorCode DEFAULT_LABEL_NOT_EXISTS = new ErrorCode(1_002_300_002, "该类型标签默认模板不存在"); // ========== 系统数据源 1_002_301_000 ========== ErrorCode DATA_SOURCE_NOT_EXISTS = new ErrorCode(1_002_301_000, "系统数据源不存在"); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java index 2a27db9d0..5e3f7d514 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java @@ -85,6 +85,14 @@ public class LabelTemplateController { return success(labelTemplateService.getGroupList()); } + @GetMapping("/getDefault") + @Operation(summary = "获得默认标签模板") + @Parameter(name = "type", description = "标签类型", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('system:label-template:query')") + public CommonResult getDefaultLabelTemplate(@RequestParam("type") String type) { + return success(labelTemplateService.getDefaultLabelTemplate(type)); + } + @GetMapping("/export-excel") @Operation(summary = "导出标签模板 Excel") @PreAuthorize("@ss.hasPermission('system:label-template:export')") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java index 1f2f0bd34..5be11c265 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java @@ -87,7 +87,7 @@ public class MachineController { @GetMapping("getDefaultCutting") @Operation(summary = "获得默认机台模板") - @Parameter(name = "type", description = "机台类型", required = true, example = "1") + @Parameter(name = "machineType", description = "机台类型", required = true, example = "1") @PreAuthorize("@ss.hasPermission('machine::query')") public CommonResult getDefaultCutting(@RequestParam Integer machineType) { return success(machineTemplateService.getDefaultCutting(machineType)); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelTemplateDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelTemplateDO.java index b882c6588..bb1d14434 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelTemplateDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelTemplateDO.java @@ -47,5 +47,9 @@ public class LabelTemplateDO extends BaseDO { * 高度 */ private Integer height; + /** + * 是否默认 + */ + private Boolean isDefault; } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java index a7759ff84..0b7b697d1 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java @@ -65,4 +65,11 @@ public interface LabelTemplateService { List getLabelElementTemplateListByLabelTemplateId(Long labelTemplateId); Map> getGroupList(); + + /** + * 获得默认标签模板 + * @param type + * @return + */ + LabelTemplateRespVO getDefaultLabelTemplate(String type); } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java index 47a7504d9..a0e46f2e0 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java @@ -296,6 +296,26 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { return labelTemplateRespVOS.stream().collect(Collectors.groupingBy(e -> e.getType())); } + @Override + public LabelTemplateRespVO getDefaultLabelTemplate(String type) { + List labelTemplateDOS = labelTemplateMapper.selectList(new LambdaQueryWrapperX() + .eq(LabelTemplateDO::getIsDefault, Boolean.TRUE) + .eq(LabelTemplateDO::getType, type) + ); + if(CollectionUtil.isNotEmpty(labelTemplateDOS)) { + if (labelTemplateDOS.size() > 1) { + throw exception(DEFAULT_TEMPLATE_COUNT); + } + LabelTemplateDO labelTemplateDO = labelTemplateDOS.get(0); + List labelElementTemplateDOS = labelElementTemplateMapper.selectListByLabelTemplateId(labelTemplateDO.getId()); + LabelTemplateRespVO labelTemplateRespVO = BeanUtils.toBean(labelTemplateDO, LabelTemplateRespVO.class); + List labelElementTemplateRespVOS = labelTemplateConvert.convert1(labelElementTemplateDOS); + labelTemplateRespVO.setLabelElementTemplates(labelElementTemplateRespVOS); + return labelTemplateRespVO; + } + throw exception(DEFAULT_LABEL_NOT_EXISTS); + } + private void createLabelElementTemplateList(Long labelTemplateId, List list) { list.forEach(o -> o.setLabelTemplateId(labelTemplateId)); labelElementTemplateMapper.insertBatch(list); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java index 4fc648829..f8a40d5c2 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java @@ -47,8 +47,7 @@ import java.util.stream.Collectors; import static com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.cf.imes.module.system.enums.ErrorCodeConstants.DEFAULT_TEMPLATE_COUNT; -import static com.cf.imes.module.system.enums.ErrorCodeConstants.MACHINE_TEMPLATE_NOT_EXISTS; +import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; /** * @author there @@ -245,7 +244,7 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { /* Object o = buildResp(templateDO.getId(), CUTTING_MACHINE_INX, CuttingTemplateMachineDO.class); respVO.setCuttingTemplateMachineDO((CuttingTemplateMachineDO) o);*/ } - throw exception(DEFAULT_TEMPLATE_COUNT); + throw exception(DEFAULT_TEMPLATE_NOT_EXISTS); } @Override