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

新增机台Bug修改

Browse Source
This commit is contained in:
liuzhaotian
2024-09-11 17:42:24 +08:00
parent 9beaa203e0
commit 83bacf8f4f
3 changed files with 140 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java
+3 -3
View File
@@ -236,9 +236,9 @@ public class GlobalExceptionHandler {
return tableNotExistsResult; return tableNotExistsResult;
} }
if(ex instanceof NullPointerException){ // if(ex instanceof NullPointerException){
return CommonResult.error(DATA_EXCEPTION_ERROR.getCode(), DATA_EXCEPTION_ERROR.getMsg()); // return CommonResult.error(DATA_EXCEPTION_ERROR.getCode(), DATA_EXCEPTION_ERROR.getMsg());
} // }
// 情况二：部分特殊的库的处理 // 情况二：部分特殊的库的处理
if (Objects.equals("io.github.resilience4j.ratelimiter.RequestNotPermitted", ex.getClass().getName())) { if (Objects.equals("io.github.resilience4j.ratelimiter.RequestNotPermitted", ex.getClass().getName())) {
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
+85 -79
View File
@@ -176,22 +176,53 @@ public class MachineServiceImpl implements MachineService {
JsonNode advancedConfigsRef = cuttingSetting.get("advancedConfigsRef"); JsonNode advancedConfigsRef = cuttingSetting.get("advancedConfigsRef");
boolean isAutoLabelEnabled = advancedConfigsRef.get("isAutoLabelEnabled").asBoolean(); if(advancedConfigsRef.get("isAutoLabelEnabled") != null) {
boolean isAutoLabelEnabled = advancedConfigsRef.get("isAutoLabelEnabled").asBoolean();
if (isAutoLabelEnabled && advancedConfigsRef.has("autoLabelModel")) {
Integer autoLabelModelId = advancedConfigsRef.get("autoLabelModel").asInt();
MachineDO newMachine ; if (isAutoLabelEnabled && advancedConfigsRef.has("autoLabelModel")) {
Integer autoLabelModelId = advancedConfigsRef.get("autoLabelModel").asInt();
if(isMachine){ MachineDO newMachine;
MachineDO machine = machineMapper.selectById(autoLabelModelId); if (isMachine) {
if (machine != null) {
MachineDO machine = machineMapper.selectById(autoLabelModelId);
if (machine != null) {
newMachine = MachineDO.builder()
.labelId(machine.getLabelId())
.machineType(machine.getMachineType())
.brandId(machine.getBrandId())
.setting(machine.getSetting())
.name("开料" + machineDO.getName() + "-贴标机")
.build();
machineMapper.insert(newMachine);
// 创建 ObjectMapper 对象
ObjectMapper mapper = new ObjectMapper();
// 将 JSON 字符串解析为 Map
Map map = mapper.readValue(unzipMachineSetting, Map.class);
// 修改值
Map<String, Object> advancedConfigs = (Map<String, Object>) map.get("advancedConfigsRef");
advancedConfigs.put("autoLabelModel", newMachine.getId());
// 将 Map 转换为 JSON 字符串
return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map);
}
}
MachineTemplateDO machineTemplate = machineTemplateMapper.selectById(autoLabelModelId);
if (machineTemplate != null) {
newMachine = MachineDO.builder() newMachine = MachineDO.builder()
.labelId(machine.getLabelId()) .labelId(machineDO.getLabelId())
.machineType(machine.getMachineType()) .machineType(machineTemplate.getMachineType())
.brandId(machine.getBrandId()) .brandId(machineTemplate.getBrandId())
.setting(machine.getSetting()) .setting(machineTemplate.getSetting())
.name("开料" + machineDO.getName() + "-贴标机") .name("开料" + machineDO.getName() + "-贴标机")
.build(); .build();
@@ -210,36 +241,8 @@ public class MachineServiceImpl implements MachineService {
// 将 Map 转换为 JSON 字符串 // 将 Map 转换为 JSON 字符串
return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map); return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map);
} }
} }
MachineTemplateDO machineTemplate = machineTemplateMapper.selectById(autoLabelModelId);
if (machineTemplate != null) {
newMachine = MachineDO.builder()
.labelId(machineDO.getLabelId())
.machineType(machineTemplate.getMachineType())
.brandId(machineTemplate.getBrandId())
.setting(machineTemplate.getSetting())
.name("开料" + machineDO.getName() + "-贴标机")
.build();
machineMapper.insert(newMachine);
// 创建 ObjectMapper 对象
ObjectMapper mapper = new ObjectMapper();
// 将 JSON 字符串解析为 Map
Map map = mapper.readValue(unzipMachineSetting, Map.class);
// 修改值
Map<String, Object> advancedConfigs = (Map<String, Object>) map.get("advancedConfigsRef");
advancedConfigs.put("autoLabelModel", newMachine.getId());
// 将 Map 转换为 JSON 字符串
return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map);
}
} }
return null; return null;
} }
@@ -254,22 +257,54 @@ public class MachineServiceImpl implements MachineService {
JsonNode cuttingModuleRef = drillSetting.get("cuttingModuleRef"); JsonNode cuttingModuleRef = drillSetting.get("cuttingModuleRef");
boolean isDrillEnabled = cuttingModuleRef.get("isDrillEnabled").asBoolean(); if(cuttingModuleRef.get("isDrillEnabled") != null) {
if (isDrillEnabled && cuttingModuleRef.has("drillModel")) { boolean isDrillEnabled = cuttingModuleRef.get("isDrillEnabled").asBoolean();
Integer drillModelId = cuttingModuleRef.get("drillModel").asInt();
MachineDO newMachine ; if (isDrillEnabled && cuttingModuleRef.has("drillModel")) {
Integer drillModelId = cuttingModuleRef.get("drillModel").asInt();
if(isMachine){ MachineDO newMachine;
MachineDO machine = machineMapper.selectById(drillModelId); if (isMachine) {
if (machine != null) {
MachineDO machine = machineMapper.selectById(drillModelId);
if (machine != null) {
newMachine = MachineDO.builder()
.labelId(machine.getLabelId())
.machineType(machine.getMachineType())
.brandId(machine.getBrandId())
.setting(machine.getSetting())
.name("封边" + machineDO.getName() + "-钻孔机")
.build();
machineMapper.insert(newMachine);
// 创建 ObjectMapper 对象
ObjectMapper mapper = new ObjectMapper();
// 将 JSON 字符串解析为 Map
Map map = mapper.readValue(unzipMachineSetting, Map.class);
// 修改值
Map<String, Object> advancedConfigs = (Map<String, Object>) map.get("cuttingModuleRef");
advancedConfigs.put("drillModel", newMachine.getId());
// 将 Map 转换为 JSON 字符串并打印输出
return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map);
}
}
MachineTemplateDO machineTemplate = machineTemplateMapper.selectById(drillModelId);
if (machineTemplate != null) {
newMachine = MachineDO.builder() newMachine = MachineDO.builder()
.labelId(machine.getLabelId()) .labelId(machineDO.getLabelId())
.machineType(machine.getMachineType()) .machineType(machineTemplate.getMachineType())
.brandId(machine.getBrandId()) .brandId(machineTemplate.getBrandId())
.setting(machine.getSetting()) .setting(machineTemplate.getSetting())
.name("封边" + machineDO.getName() + "-钻孔机") .name("封边" + machineDO.getName() + "-钻孔机")
.build(); .build();
@@ -287,37 +322,8 @@ public class MachineServiceImpl implements MachineService {
// 将 Map 转换为 JSON 字符串并打印输出 // 将 Map 转换为 JSON 字符串并打印输出
return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map); return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map);
} }
} }
MachineTemplateDO machineTemplate = machineTemplateMapper.selectById(drillModelId);
if (machineTemplate != null) {
newMachine = MachineDO.builder()
.labelId(machineDO.getLabelId())
.machineType(machineTemplate.getMachineType())
.brandId(machineTemplate.getBrandId())
.setting(machineTemplate.getSetting())
.name("封边" + machineDO.getName() + "-钻孔机")
.build();
machineMapper.insert(newMachine);
// 创建 ObjectMapper 对象
ObjectMapper mapper = new ObjectMapper();
// 将 JSON 字符串解析为 Map
Map map = mapper.readValue(unzipMachineSetting, Map.class);
// 修改值
Map<String, Object> advancedConfigs = (Map<String, Object>) map.get("cuttingModuleRef");
advancedConfigs.put("drillModel", newMachine.getId());
// 将 Map 转换为 JSON 字符串并打印输出
return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map);
}
} }
return null; return null;
} }
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java
+52 -48
View File
@@ -503,43 +503,45 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
JsonNode advancedConfigsRef = cuttingSetting.get("advancedConfigsRef"); JsonNode advancedConfigsRef = cuttingSetting.get("advancedConfigsRef");
boolean isAutoLabelEnabled = advancedConfigsRef.get("isAutoLabelEnabled").asBoolean(); if(advancedConfigsRef.get("isAutoLabelEnabled") != null) {
boolean isAutoLabelEnabled = advancedConfigsRef.get("isAutoLabelEnabled").asBoolean();
if(isAutoLabelEnabled && advancedConfigsRef.get("autoLabelBrand") != null && advancedConfigsRef.get("autoLabelModel") != null){ if (isAutoLabelEnabled && advancedConfigsRef.get("autoLabelBrand") != null && advancedConfigsRef.get("autoLabelModel") != null) {
Integer autoLabelModelId = advancedConfigsRef.get("autoLabelModel").asInt(); Integer autoLabelModelId = advancedConfigsRef.get("autoLabelModel").asInt();
try { try {
MachineTemplateDO labelingMachineTemplateDO = machineTemplateMapper.selectById(autoLabelModelId); MachineTemplateDO labelingMachineTemplateDO = machineTemplateMapper.selectById(autoLabelModelId);
MachineTemplateDO labelingMachineDO = MachineTemplateDO.builder() MachineTemplateDO labelingMachineDO = MachineTemplateDO.builder()
.machineType(labelingMachineTemplateDO.getMachineType()) .machineType(labelingMachineTemplateDO.getMachineType())
.brandId(labelingMachineTemplateDO.getBrandId()) .brandId(labelingMachineTemplateDO.getBrandId())
.setting(labelingMachineTemplateDO.getSetting()) .setting(labelingMachineTemplateDO.getSetting())
.name("开料" + machineName + "-贴标机") .name("开料" + machineName + "-贴标机")
.build(); .build();
machineTemplateMapper.insert(labelingMachineDO); machineTemplateMapper.insert(labelingMachineDO);
// 创建 ObjectMapper 对象 // 创建 ObjectMapper 对象
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
// 将 JSON 字符串解析为 Map // 将 JSON 字符串解析为 Map
Map map = mapper.readValue(unzipString, Map.class); Map map = mapper.readValue(unzipString, Map.class);
// 修改值 // 修改值
Map<String, Object> advancedConfigs = (Map<String, Object>) map.get("advancedConfigsRef"); Map<String, Object> advancedConfigs = (Map<String, Object>) map.get("advancedConfigsRef");
advancedConfigs.put("autoLabelModel", labelingMachineDO.getId()); advancedConfigs.put("autoLabelModel", labelingMachineDO.getId());
// 将 Map 转换为 JSON 字符串 // 将 Map 转换为 JSON 字符串
return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map); return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map);
}catch (Exception e){ } catch (Exception e) {
throw exception(LABELINGMACHINE_RELATED_DATA_ERROR);
}
throw exception(LABELINGMACHINE_RELATED_DATA_ERROR);
} }
} }
return null; return null;
} }
@@ -552,43 +554,45 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
JsonNode cuttingModuleRef = drillSetting.get("cuttingModuleRef"); JsonNode cuttingModuleRef = drillSetting.get("cuttingModuleRef");
boolean isDrillEnabled = cuttingModuleRef.get("isDrillEnabled").asBoolean(); if(cuttingModuleRef.get("isDrillEnabled") != null) {
boolean isDrillEnabled = cuttingModuleRef.get("isDrillEnabled").asBoolean();
if(isDrillEnabled && cuttingModuleRef.get("drillBrand") != null && cuttingModuleRef.get("drillModel") != null){ if (isDrillEnabled && cuttingModuleRef.get("drillBrand") != null && cuttingModuleRef.get("drillModel") != null) {
Integer drillModelId = cuttingModuleRef.get("drillModel").asInt(); Integer drillModelId = cuttingModuleRef.get("drillModel").asInt();
try { try {
MachineTemplateDO drillMachineTemplateDO = machineTemplateMapper.selectById(drillModelId); MachineTemplateDO drillMachineTemplateDO = machineTemplateMapper.selectById(drillModelId);
MachineTemplateDO drillMachineDO = MachineTemplateDO.builder() MachineTemplateDO drillMachineDO = MachineTemplateDO.builder()
.machineType(drillMachineTemplateDO.getMachineType()) .machineType(drillMachineTemplateDO.getMachineType())
.brandId(drillMachineTemplateDO.getBrandId()) .brandId(drillMachineTemplateDO.getBrandId())
.setting(drillMachineTemplateDO.getSetting()) .setting(drillMachineTemplateDO.getSetting())
.name("封边" + machineName + "-钻孔机") .name("封边" + machineName + "-钻孔机")
.build(); .build();
machineTemplateMapper.insert(drillMachineDO); machineTemplateMapper.insert(drillMachineDO);
// 创建 ObjectMapper 对象 // 创建 ObjectMapper 对象
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
// 将 JSON 字符串解析为 Map // 将 JSON 字符串解析为 Map
Map map = mapper.readValue(unzipString, Map.class); Map map = mapper.readValue(unzipString, Map.class);
// 修改值 // 修改值
Map<String, Object> advancedConfigs = (Map<String, Object>) map.get("cuttingModuleRef"); Map<String, Object> advancedConfigs = (Map<String, Object>) map.get("cuttingModuleRef");
advancedConfigs.put("drillModel", drillMachineDO.getId()); advancedConfigs.put("drillModel", drillMachineDO.getId());
// 将 Map 转换为 JSON 字符串 // 将 Map 转换为 JSON 字符串
return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map); return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map);
}catch (Exception e){ } catch (Exception e) {
throw exception(DRILLMACHINE_RELATED_DATA_ERROR);
}
throw exception(DRILLMACHINE_RELATED_DATA_ERROR);
} }
} }
return null; return null;
} }