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-14 05:42:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

未排单，排单管理Sonar代码检查问题修改

Browse Source
This commit is contained in:
liuzhaotian
2024-10-22 17:09:10 +08:00
parent f191dc5759
commit 603bd88469
22 changed files with 619 additions and 585 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/service/machine/MachineServiceImpl.java
+20 -17
View File
@@ -93,6 +93,10 @@ public class MachineServiceImpl implements MachineService {
@Resource
private OrganMapper organMapper;
private static final String FIELD_ADVANCED_CONFIGS_REF = "advancedConfigsRef";
private static final String FIELD_AUTO_LABEL_MODEL = "autoLabelModel";
private static final String FIELD_CUTTING_MODULE_REF = "cuttingModuleRef";
private static final String FIELD_DRILL_MODEL = "drillModel";
@Override
@Transactional(rollbackFor = Exception.class)
@@ -180,18 +184,18 @@ public class MachineServiceImpl implements MachineService {
JsonNode cuttingSetting = JsonUtils.parseTree(unzipMachineSetting);
JsonNode advancedConfigsRef = cuttingSetting.get("advancedConfigsRef");
JsonNode advancedConfigsRef = cuttingSetting.get(FIELD_ADVANCED_CONFIGS_REF);
boolean isAutoLabelEnabled = advancedConfigsRef.get("isAutoLabelEnabled") != null && advancedConfigsRef.get("isAutoLabelEnabled").asBoolean();
if (isAutoLabelEnabled && advancedConfigsRef.has("autoLabelModel")) {
Integer autoLabelModelId = advancedConfigsRef.get("autoLabelModel").asInt();
if (isAutoLabelEnabled && advancedConfigsRef.has(FIELD_AUTO_LABEL_MODEL)) {
Integer autoLabelModelId = advancedConfigsRef.get(FIELD_AUTO_LABEL_MODEL).asInt();
MachineDO newMachine;
if (isMachine) {
if (Boolean.TRUE.equals(isMachine)) {
MachineDO machine = machineMapper.selectById(autoLabelModelId);
if (machine != null) {
@@ -212,8 +216,8 @@ public class MachineServiceImpl implements MachineService {
Map map = mapper.readValue(unzipMachineSetting, Map.class);
// 修改值
Map<String, Object> advancedConfigs = (Map<String, Object>) map.get("advancedConfigsRef");
advancedConfigs.put("autoLabelModel", newMachine.getId());
Map<String, Object> advancedConfigs = (Map<String, Object>) map.get(FIELD_ADVANCED_CONFIGS_REF);
advancedConfigs.put(FIELD_AUTO_LABEL_MODEL, newMachine.getId());
// 将 Map 转换为 JSON 字符串
return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map);
@@ -241,8 +245,8 @@ public class MachineServiceImpl implements MachineService {
Map map = mapper.readValue(unzipMachineSetting, Map.class);
// 修改值
Map<String, Object> advancedConfigs = (Map<String, Object>) map.get("advancedConfigsRef");
advancedConfigs.put("autoLabelModel", newMachine.getId());
Map<String, Object> advancedConfigs = (Map<String, Object>) map.get(FIELD_ADVANCED_CONFIGS_REF);
advancedConfigs.put(FIELD_AUTO_LABEL_MODEL, newMachine.getId());
// 将 Map 转换为 JSON 字符串
return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map);
@@ -261,17 +265,17 @@ public class MachineServiceImpl implements MachineService {
JsonNode drillSetting = JsonUtils.parseTree(unzipMachineSetting);
JsonNode cuttingModuleRef = drillSetting.get("cuttingModuleRef");
JsonNode cuttingModuleRef = drillSetting.get(FIELD_CUTTING_MODULE_REF);
boolean isDrillEnabled = cuttingModuleRef.get("isDrillEnabled") != null && cuttingModuleRef.get("isDrillEnabled").asBoolean();
if (isDrillEnabled && cuttingModuleRef.has("drillModel")) {
Integer drillModelId = cuttingModuleRef.get("drillModel").asInt();
if (isDrillEnabled && cuttingModuleRef.has(FIELD_DRILL_MODEL)) {
Integer drillModelId = cuttingModuleRef.get(FIELD_DRILL_MODEL).asInt();
MachineDO newMachine;
if (isMachine) {
if (Boolean.TRUE.equals(isMachine)) {
MachineDO machine = machineMapper.selectById(drillModelId);
if (machine != null) {
@@ -292,8 +296,8 @@ public class MachineServiceImpl implements MachineService {
Map map = mapper.readValue(unzipMachineSetting, Map.class);
// 修改值
Map<String, Object> advancedConfigs = (Map<String, Object>) map.get("cuttingModuleRef");
advancedConfigs.put("drillModel", newMachine.getId());
Map<String, Object> advancedConfigs = (Map<String, Object>) map.get(FIELD_CUTTING_MODULE_REF);
advancedConfigs.put(FIELD_DRILL_MODEL, newMachine.getId());
// 将 Map 转换为 JSON 字符串并打印输出
return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map);
@@ -322,8 +326,8 @@ public class MachineServiceImpl implements MachineService {
Map map = mapper.readValue(unzipMachineSetting, Map.class);
// 修改值
Map<String, Object> advancedConfigs = (Map<String, Object>) map.get("cuttingModuleRef");
advancedConfigs.put("drillModel", newMachine.getId());
Map<String, Object> advancedConfigs = (Map<String, Object>) map.get(FIELD_CUTTING_MODULE_REF);
advancedConfigs.put(FIELD_DRILL_MODEL, newMachine.getId());
// 将 Map 转换为 JSON 字符串并打印输出
return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map);
@@ -341,7 +345,6 @@ public class MachineServiceImpl implements MachineService {
validateExists(updateReqVO.getId(), updateReqVO.getName(), updateReqVO.getMachineType(), updateReqVO.getId());
// 更新
MachineDO updateObj = MachineConvert.convert(updateReqVO);
//MachineDO updateObj = BeanUtils.toBean(updateReqVO, MachineDO.class);
// 判断传入的机台配置是否存在，如果存在，压缩数据后更新
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java
+8 -6
View File
@@ -68,6 +68,8 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
@Resource
private OrganMapper organMapper;
private static final String FIELD_AUTO_LABEL_MODEL = "autoLabelModel";
private static final String FIELD_DRILL_MODEL = "drillModel";
@Override
@Transactional(rollbackFor = Exception.class)
@@ -514,9 +516,9 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
boolean isAutoLabelEnabled = advancedConfigsRef.get("isAutoLabelEnabled") != null && advancedConfigsRef.get("isAutoLabelEnabled").asBoolean();
if (isAutoLabelEnabled && advancedConfigsRef.get("autoLabelBrand") != null && advancedConfigsRef.get("autoLabelModel") != null) {
if (isAutoLabelEnabled && advancedConfigsRef.get("autoLabelBrand") != null && advancedConfigsRef.get(FIELD_AUTO_LABEL_MODEL) != null) {
Integer autoLabelModelId = advancedConfigsRef.get("autoLabelModel").asInt();
Integer autoLabelModelId = advancedConfigsRef.get(FIELD_AUTO_LABEL_MODEL).asInt();
try {
@@ -539,7 +541,7 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
// 修改值
Map<String, Object> advancedConfigs = (Map<String, Object>) map.get("advancedConfigsRef");
advancedConfigs.put("autoLabelModel", labelingMachineDO.getId());
advancedConfigs.put(FIELD_AUTO_LABEL_MODEL, labelingMachineDO.getId());
// 将 Map 转换为 JSON 字符串
return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map);
@@ -565,9 +567,9 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
boolean isDrillEnabled = cuttingModuleRef.get("isDrillEnabled") != null && cuttingModuleRef.get("isDrillEnabled").asBoolean();
if (isDrillEnabled && cuttingModuleRef.get("drillBrand") != null && cuttingModuleRef.get("drillModel") != null) {
if (isDrillEnabled && cuttingModuleRef.get("drillBrand") != null && cuttingModuleRef.get(FIELD_DRILL_MODEL) != null) {
Integer drillModelId = cuttingModuleRef.get("drillModel").asInt();
Integer drillModelId = cuttingModuleRef.get(FIELD_DRILL_MODEL).asInt();
try {
@@ -590,7 +592,7 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
// 修改值
Map<String, Object> advancedConfigs = (Map<String, Object>) map.get("cuttingModuleRef");
advancedConfigs.put("drillModel", drillMachineDO.getId());
advancedConfigs.put(FIELD_DRILL_MODEL, drillMachineDO.getId());
// 将 Map 转换为 JSON 字符串
return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map);