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

Compare commits

base: xiaoguangbin:c6ea38f2d32c38f3a7019664c72926470970049f
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:b19f5087eddd4b1fd1c2720bece95cbeaa7331e3
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

2 Commits
c6ea38f2d3 ... b19f5087ed

Author SHA1 Message Date
nieziyan
b19f5087ed Merge remote-tracking branch 'origin/SelfStation' into SelfStation 2024-07-30 13:58:33 +08:00
nieziyan
6bb4cb67a1 fix：自建台站分析参数 2024-07-30 13:58:16 +08:00
1 changed files with 4 additions and 6 deletions
Show Stats Expand all files Collapse all files

10
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
View File

@ -446,12 +446,10 @@ public class SelfStationServiceImpl implements ISelfStationService {
roiThreePHDFile.getSetting().setRefTime_act(refTimeAct); roiThreePHDFile.getSetting().setRefTime_act(refTimeAct);
roiFourPHDFile.getSetting().setRefTime_act(refTimeAct); roiFourPHDFile.getSetting().setRefTime_act(refTimeAct);
} }
SpecSetup usedSetting = new SpecSetup(); BeanUtils.copyProperties(roiOnePHDFile.getSetting(), roiOnePHDFile.getUsedSetting());
BeanUtils.copyProperties(roiOnePHDFile.getSetting(), usedSetting); BeanUtils.copyProperties(roiTwoPHDFile.getSetting(), roiTwoPHDFile.getUsedSetting());
roiOnePHDFile.setUsedSetting(usedSetting); BeanUtils.copyProperties(roiThreePHDFile.getSetting(), roiThreePHDFile.getUsedSetting());
roiTwoPHDFile.setUsedSetting(usedSetting); BeanUtils.copyProperties(roiFourPHDFile.getSetting(), roiFourPHDFile.getUsedSetting());
roiThreePHDFile.setUsedSetting(usedSetting);
roiFourPHDFile.setUsedSetting(usedSetting);
} }
@DS("ora") @DS("ora")