diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java index 0027344c..2cedb6b6 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java @@ -399,8 +399,13 @@ public class SysDatabaseServiceImpl extends ServiceImpl 0) { + if (!gardsNuclIdedDto.getNucl_ided_Nuclidename().isEmpty()) { String base_NuclideName = "nucl_ided_Nuclidename"; List gardsNuclIdeds = mapFields(gardsNuclIdedDto, gardsNuclIded, base_NuclideName, fieldMap); @@ -868,7 +868,7 @@ public class Sample_G_Analysis { String base_QC = String.valueOf(qcItems.size()); QcCheckDto qcCheckDto = new QcCheckDto(); BeanUtil.copyProperties(middleData,qcCheckDto); - if (qcItems.size() > 0) { + if (!qcItems.isEmpty()) { GardsQcCheck gardsQcCheck = new GardsQcCheck(); List gardsQcChecks = mapFields(qcCheckDto, gardsQcCheck,base_QC,fieldMap); for (GardsQcCheck qcCheck : gardsQcChecks) { @@ -1131,9 +1131,10 @@ public class Sample_G_Analysis { if (type == String.class) { tartgetField.set(tartget, value); } else if (type == Integer.class || type == int.class) { - tartgetField.set(tartget,Integer.valueOf(value)); + // 避免类似0.000的String值转Integer时NumberFormatException + tartgetField.set(tartget, Double.valueOf(value).intValue()); } else if (type == Double.class || type == double.class) { - tartgetField.set(tartget,Double.valueOf(value)); + tartgetField.set(tartget, Double.valueOf(value)); } else if (type == Boolean.class || type == boolean.class) { tartgetField.set(tartget, Boolean.valueOf(value)); } diff --git a/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/application.yml b/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/application.yml index 3deaf293..c5ee5723 100644 --- a/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/application.yml @@ -16,4 +16,5 @@ spring: import: - optional:nacos:armd.yaml - optional:nacos:armd-@profile.name@.yaml + - optional:nacos:IDC-Data.yaml - optional:nacos:armd-analysis-@profile.name@.yaml