xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：saveQCCheck异常

Browse Source
This commit is contained in:
nieziyan 2023-12-29 19:33:29 +08:00
parent ed00d25f4d
commit 947f3be7cc
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java
View File

@ -399,8 +399,13 @@ public class SysDatabaseServiceImpl extends ServiceImpl<SysDatabaseMapper, SysDa
private String bias(String url){ private String bias(String url){
if (StrUtil.isBlank(url)) if (StrUtil.isBlank(url))
return null; return null;
String regex = "/([^/?]+)\\?"; String regex1 = "/([^/?]+)\\?";
return ReUtil.getGroup1(regex, url); String regex2 = ".*/(.*)";
String dbName = ReUtil.getGroup1(regex1, url);
if (StrUtil.isNotBlank(dbName))
return dbName;
dbName = ReUtil.getGroup1(regex2, url);
return dbName;
} }
/* /*

9
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
View File

@ -848,7 +848,7 @@ public class Sample_G_Analysis {
GardsNuclIdedDto gardsNuclIdedDto = new GardsNuclIdedDto(); GardsNuclIdedDto gardsNuclIdedDto = new GardsNuclIdedDto();
GardsNuclIded gardsNuclIded = new GardsNuclIded(); GardsNuclIded gardsNuclIded = new GardsNuclIded();
BeanUtil.copyProperties(middleData,gardsNuclIdedDto); BeanUtil.copyProperties(middleData,gardsNuclIdedDto);
if (gardsNuclIdedDto.getNucl_ided_Nuclidename().size() > 0) { if (!gardsNuclIdedDto.getNucl_ided_Nuclidename().isEmpty()) {
String base_NuclideName = "nucl_ided_Nuclidename"; String base_NuclideName = "nucl_ided_Nuclidename";
List<GardsNuclIded> gardsNuclIdeds = List<GardsNuclIded> gardsNuclIdeds =
mapFields(gardsNuclIdedDto, gardsNuclIded, base_NuclideName, fieldMap); mapFields(gardsNuclIdedDto, gardsNuclIded, base_NuclideName, fieldMap);
@ -868,7 +868,7 @@ public class Sample_G_Analysis {
String base_QC = String.valueOf(qcItems.size()); String base_QC = String.valueOf(qcItems.size());
QcCheckDto qcCheckDto = new QcCheckDto(); QcCheckDto qcCheckDto = new QcCheckDto();
BeanUtil.copyProperties(middleData,qcCheckDto); BeanUtil.copyProperties(middleData,qcCheckDto);
if (qcItems.size() > 0) { if (!qcItems.isEmpty()) {
GardsQcCheck gardsQcCheck = new GardsQcCheck(); GardsQcCheck gardsQcCheck = new GardsQcCheck();
List<GardsQcCheck> gardsQcChecks = mapFields(qcCheckDto, gardsQcCheck,base_QC,fieldMap); List<GardsQcCheck> gardsQcChecks = mapFields(qcCheckDto, gardsQcCheck,base_QC,fieldMap);
for (GardsQcCheck qcCheck : gardsQcChecks) { for (GardsQcCheck qcCheck : gardsQcChecks) {
@ -1131,9 +1131,10 @@ public class Sample_G_Analysis {
if (type == String.class) { if (type == String.class) {
tartgetField.set(tartget, value); tartgetField.set(tartget, value);
} else if (type == Integer.class || type == int.class) { } 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) { } 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) { } else if (type == Boolean.class || type == boolean.class) {
tartgetField.set(tartget, Boolean.valueOf(value)); tartgetField.set(tartget, Boolean.valueOf(value));
} }

1
jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/application.yml
View File

@ -16,4 +16,5 @@ spring:
import: import:
- optional:nacos:armd.yaml - optional:nacos:armd.yaml
- optional:nacos:armd-@profile.name@.yaml - optional:nacos:armd-@profile.name@.yaml
- optional:nacos:IDC-Data.yaml
- optional:nacos:armd-analysis-@profile.name@.yaml - optional:nacos:armd-analysis-@profile.name@.yaml