From 83bacf8f4fc8e72fd6b2ad02996a17d0908d00a6 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Wed, 11 Sep 2024 17:42:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=BA=E5=8F=B0Bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/handler/GlobalExceptionHandler.java | 6 +- .../service/machine/MachineServiceImpl.java | 164 +++++++++--------- .../machine/MachineTemplateServiceImpl.java | 100 ++++++----- 3 files changed, 140 insertions(+), 130 deletions(-) diff --git a/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java b/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java index b8ea62895..70601c32c 100644 --- a/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java +++ b/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java @@ -236,9 +236,9 @@ public class GlobalExceptionHandler { return tableNotExistsResult; } - if(ex instanceof NullPointerException){ - return CommonResult.error(DATA_EXCEPTION_ERROR.getCode(), DATA_EXCEPTION_ERROR.getMsg()); - } +// if(ex instanceof NullPointerException){ +// return CommonResult.error(DATA_EXCEPTION_ERROR.getCode(), DATA_EXCEPTION_ERROR.getMsg()); +// } // 情况二：部分特殊的库的处理 if (Objects.equals("io.github.resilience4j.ratelimiter.RequestNotPermitted", ex.getClass().getName())) { diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java index 0a0b27c0d..9ccb87a81 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java @@ -176,22 +176,53 @@ public class MachineServiceImpl implements MachineService { 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 (machine != null) { + if (isMachine) { + + 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 advancedConfigs = (Map) 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() - .labelId(machine.getLabelId()) - .machineType(machine.getMachineType()) - .brandId(machine.getBrandId()) - .setting(machine.getSetting()) + .labelId(machineDO.getLabelId()) + .machineType(machineTemplate.getMachineType()) + .brandId(machineTemplate.getBrandId()) + .setting(machineTemplate.getSetting()) .name("开料" + machineDO.getName() + "-贴标机") .build(); @@ -210,36 +241,8 @@ public class MachineServiceImpl implements MachineService { // 将 Map 转换为 JSON 字符串 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 advancedConfigs = (Map) map.get("advancedConfigsRef"); - advancedConfigs.put("autoLabelModel", newMachine.getId()); - - // 将 Map 转换为 JSON 字符串 - return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map); - - } } return null; } @@ -254,22 +257,54 @@ public class MachineServiceImpl implements MachineService { JsonNode cuttingModuleRef = drillSetting.get("cuttingModuleRef"); - boolean isDrillEnabled = cuttingModuleRef.get("isDrillEnabled").asBoolean(); + if(cuttingModuleRef.get("isDrillEnabled") != null) { - if (isDrillEnabled && cuttingModuleRef.has("drillModel")) { - Integer drillModelId = cuttingModuleRef.get("drillModel").asInt(); + boolean isDrillEnabled = cuttingModuleRef.get("isDrillEnabled").asBoolean(); - MachineDO newMachine ; + if (isDrillEnabled && cuttingModuleRef.has("drillModel")) { + Integer drillModelId = cuttingModuleRef.get("drillModel").asInt(); - if(isMachine){ + MachineDO newMachine; - MachineDO machine = machineMapper.selectById(drillModelId); - if (machine != null) { + if (isMachine) { + + 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 advancedConfigs = (Map) 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() - .labelId(machine.getLabelId()) - .machineType(machine.getMachineType()) - .brandId(machine.getBrandId()) - .setting(machine.getSetting()) + .labelId(machineDO.getLabelId()) + .machineType(machineTemplate.getMachineType()) + .brandId(machineTemplate.getBrandId()) + .setting(machineTemplate.getSetting()) .name("封边" + machineDO.getName() + "-钻孔机") .build(); @@ -287,37 +322,8 @@ public class MachineServiceImpl implements MachineService { // 将 Map 转换为 JSON 字符串并打印输出 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 advancedConfigs = (Map) map.get("cuttingModuleRef"); - advancedConfigs.put("drillModel", newMachine.getId()); - - // 将 Map 转换为 JSON 字符串并打印输出 - return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map); - } } return null; } 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 7a0369b3e..8f0500bce 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 @@ -503,43 +503,45 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { 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() - .machineType(labelingMachineTemplateDO.getMachineType()) - .brandId(labelingMachineTemplateDO.getBrandId()) - .setting(labelingMachineTemplateDO.getSetting()) - .name("开料" + machineName + "-贴标机") - .build(); + MachineTemplateDO labelingMachineDO = MachineTemplateDO.builder() + .machineType(labelingMachineTemplateDO.getMachineType()) + .brandId(labelingMachineTemplateDO.getBrandId()) + .setting(labelingMachineTemplateDO.getSetting()) + .name("开料" + machineName + "-贴标机") + .build(); - machineTemplateMapper.insert(labelingMachineDO); + machineTemplateMapper.insert(labelingMachineDO); - // 创建 ObjectMapper 对象 - ObjectMapper mapper = new ObjectMapper(); + // 创建 ObjectMapper 对象 + ObjectMapper mapper = new ObjectMapper(); - // 将 JSON 字符串解析为 Map - Map map = mapper.readValue(unzipString, Map.class); + // 将 JSON 字符串解析为 Map + Map map = mapper.readValue(unzipString, Map.class); - // 修改值 - Map advancedConfigs = (Map) map.get("advancedConfigsRef"); - advancedConfigs.put("autoLabelModel", labelingMachineDO.getId()); + // 修改值 + Map advancedConfigs = (Map) map.get("advancedConfigsRef"); + advancedConfigs.put("autoLabelModel", labelingMachineDO.getId()); - // 将 Map 转换为 JSON 字符串 - return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map); + // 将 Map 转换为 JSON 字符串 + 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; } @@ -552,43 +554,45 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { 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() - .machineType(drillMachineTemplateDO.getMachineType()) - .brandId(drillMachineTemplateDO.getBrandId()) - .setting(drillMachineTemplateDO.getSetting()) - .name("封边" + machineName + "-钻孔机") - .build(); + MachineTemplateDO drillMachineDO = MachineTemplateDO.builder() + .machineType(drillMachineTemplateDO.getMachineType()) + .brandId(drillMachineTemplateDO.getBrandId()) + .setting(drillMachineTemplateDO.getSetting()) + .name("封边" + machineName + "-钻孔机") + .build(); - machineTemplateMapper.insert(drillMachineDO); + machineTemplateMapper.insert(drillMachineDO); - // 创建 ObjectMapper 对象 - ObjectMapper mapper = new ObjectMapper(); + // 创建 ObjectMapper 对象 + ObjectMapper mapper = new ObjectMapper(); - // 将 JSON 字符串解析为 Map - Map map = mapper.readValue(unzipString, Map.class); + // 将 JSON 字符串解析为 Map + Map map = mapper.readValue(unzipString, Map.class); - // 修改值 - Map advancedConfigs = (Map) map.get("cuttingModuleRef"); - advancedConfigs.put("drillModel", drillMachineDO.getId()); + // 修改值 + Map advancedConfigs = (Map) map.get("cuttingModuleRef"); + advancedConfigs.put("drillModel", drillMachineDO.getId()); - // 将 Map 转换为 JSON 字符串 - return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map); + // 将 Map 转换为 JSON 字符串 + 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; }