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

fix: 核素分析规则 解决null值无法入库的问题

Browse Source
This commit is contained in:
xiaoguangbin 2025-01-02 16:25:19 +08:00
parent decc80fadf
commit 5317fe2b56
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisRule.java
View File

@ -1,5 +1,6 @@
package org.jeecg.modules.base.entity.postgre;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
@ -43,38 +44,43 @@ public class AlarmAnalysisRule extends JeecgEntity {
private Integer coefficient;
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String colTime;
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String acqTime;
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Double airFlow;
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Double decayTime;
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Double sampVol;
@TableField("ba140_mdc")
@TableField(value = "ba140_mdc", updateStrategy = FieldStrategy.IGNORED)
private Double ba140MDC;
@TableField("be7_fwhm")
@TableField(value = "be7_fwhm", updateStrategy = FieldStrategy.IGNORED)
private Double be7FWHM;
@TableField("xe133_mdc")
@TableField(value = "xe133_mdc", updateStrategy = FieldStrategy.IGNORED)
private String xe133MDC;
@TableField("xe_vol")
@TableField(value = "xe_vol", updateStrategy = FieldStrategy.IGNORED)
private Double xeVol;
@TableField("xe131m_flag")
@TableField(value = "xe131m_flag", updateStrategy = FieldStrategy.IGNORED)
private Integer xe131mFlag;
@TableField("xe133m_flag")
@TableField(value = "xe133m_flag", updateStrategy = FieldStrategy.IGNORED)
private Integer xe133mFlag;
@TableField("xe133_flag")
@TableField(value = "xe133_flag", updateStrategy = FieldStrategy.IGNORED)
private Integer xe133Flag;
@TableField("xe135_flag")
@TableField(value = "xe135_flag", updateStrategy = FieldStrategy.IGNORED)
private Integer xe135Flag;
/** 备注 */
private String remark;

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

@ -184,17 +184,23 @@ public class AlarmAnalysisRuleServiceImpl extends ServiceImpl<AlarmAnalysisRuleM
.toList(analysisRule.getConditions().split(comma));
analysisRuleInfo.setConditionChecked(conditionChecked);
List<String> colTimes = ListUtil
.toList(analysisRule.getColTime().split(comma));
analysisRuleInfo.setColTime(colTimes);
if (null != analysisRule.getColTime()) {
List<String> colTimes = ListUtil
.toList(analysisRule.getColTime().split(comma));
analysisRuleInfo.setColTime(colTimes);
}
List<String> acqTimes = ListUtil
.toList(analysisRule.getAcqTime().split(comma));
analysisRuleInfo.setColTime(acqTimes);
if (null != analysisRule.getAcqTime()) {
List<String> acqTimes = ListUtil
.toList(analysisRule.getAcqTime().split(comma));
analysisRuleInfo.setColTime(acqTimes);
}
List<String> xe133MDC = ListUtil
.toList(analysisRule.getXe133MDC().split(comma));
analysisRuleInfo.setColTime(xe133MDC);
if (null != analysisRule.getXe133MDC()) {
List<String> xe133MDC = ListUtil
.toList(analysisRule.getXe133MDC().split(comma));
analysisRuleInfo.setColTime(xe133MDC);
}
return Result.OK(analysisRuleInfo);
}