Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

executor 服务添加ES依赖，添加对小板造型数据入库处理

Browse Source
This commit is contained in:
yangsb
2024-04-11 16:49:13 +08:00
parent d540216721
commit 35fee5454d
13 changed files with 582 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java
+1 -1
View File
@@ -92,7 +92,7 @@ public class MachineController {
@Operation(summary = "获得默认机台模板")
@Parameter(name = "machineType", description = "机台类型", required = true, example = "1")
@PreAuthorize("@ss.hasPermission('machine::query')")
public CommonResult<CuttingRespVO> getDefaultCutting(@RequestParam Integer machineType) {
public CommonResult<CuttingTemplateRespVO> getDefaultCutting(@RequestParam Integer machineType) {
return success(machineTemplateService.getDefaultCutting(machineType));
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java
+1 -1
View File
@@ -39,7 +39,7 @@ public interface MachineTemplateService {
Boolean batchDeleteCuttingTemplate(List<Long> ids);
CuttingRespVO getDefaultCutting(Integer machineType);
CuttingTemplateRespVO getDefaultCutting(Integer machineType);
DrillTemplateRespVO getDefaultDrill();
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java
+2 -2
View File
@@ -197,7 +197,7 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
}
@Override
public CuttingRespVO getDefaultCutting(Integer machineType) {
public CuttingTemplateRespVO getDefaultCutting(Integer machineType) {
List<MachineTemplateDO> machineTemplateDOS = machineTemplateMapper.selectList(new LambdaQueryWrapperX<MachineTemplateDO>()
.eq(MachineTemplateDO::getIsDefault, Boolean.TRUE)
.eq(MachineTemplateDO::getMachineType, machineType)
@@ -207,7 +207,7 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
throw exception(DEFAULT_TEMPLATE_COUNT);
}
MachineTemplateDO templateDO = machineTemplateDOS.get(0);
return MachineTemplateConvert.convert(templateDO);
return MachineTemplateConvert.convert1(templateDO);
}
throw exception(DEFAULT_TEMPLATE_NOT_EXISTS);
}