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

Compare commits

base: xiaoguangbin:8768a2b566cbd41d82e3f33ce1c3c760ec0c285f
Branches Tags
xiaoguangbin:mdc
xiaoguangbin:SelfStation
xiaoguangbin:SelfStation-pgsql
xiaoguangbin:SelfStation-testdll
xiaoguangbin:mdc-merge
xiaoguangbin:sleepDownload
xiaoguangbin:noFtp-seflStation
xiaoguangbin:noFtp
xiaoguangbin:noFtp-F
xiaoguangbin:onlyDownload
xiaoguangbin:master
..
compare: xiaoguangbin:6d0531894d60f40e6ebbd33bde95cdba0dfb6386
Branches Tags
xiaoguangbin:SelfStation
xiaoguangbin:mdc
xiaoguangbin:SelfStation-pgsql
xiaoguangbin:SelfStation-testdll
xiaoguangbin:mdc-merge
xiaoguangbin:sleepDownload
xiaoguangbin:noFtp-seflStation
xiaoguangbin:noFtp
xiaoguangbin:noFtp-F
xiaoguangbin:onlyDownload
xiaoguangbin:master

No commits in common. "8768a2b566cbd41d82e3f33ce1c3c760ec0c285f" and "6d0531894d60f40e6ebbd33bde95cdba0dfb6386" have entirely different histories.
8768a2b566 ... 6d0531894d

1 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

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

@ -201,13 +201,13 @@ public class AlarmAnalysisRuleServiceImpl extends ServiceImpl<AlarmAnalysisRuleM
if (null != analysisRule.getAcqTime()) { if (null != analysisRule.getAcqTime()) {
List<String> acqTimes = ListUtil List<String> acqTimes = ListUtil
.toList(analysisRule.getAcqTime().split(comma)); .toList(analysisRule.getAcqTime().split(comma));
analysisRuleInfo.setAcqTime(acqTimes); analysisRuleInfo.setColTime(acqTimes);
} }
if (null != analysisRule.getXe133MDC()) { if (null != analysisRule.getXe133MDC()) {
List<String> xe133MDC = ListUtil List<String> xe133MDC = ListUtil
.toList(analysisRule.getXe133MDC().split(comma)); .toList(analysisRule.getXe133MDC().split(comma));
analysisRuleInfo.setXe133MDC(xe133MDC); analysisRuleInfo.setColTime(xe133MDC);
} }
if (null != analysisRule.getIdentifyNuclides()) { if (null != analysisRule.getIdentifyNuclides()) {