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

Merge remote-tracking branch 'origin/SelfStation' into SelfStation

Browse Source
This commit is contained in:
nieziyan 2024-08-01 10:41:40 +08:00
commit dc3375a5ab
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.cache.Cache;
import com.google.common.collect.Maps;
import org.apache.commons.io.FileUtils;
import org.apache.commons.math3.fitting.WeightedObservedPoints;
import org.jeecg.common.api.vo.Result;
@ -5000,7 +5001,25 @@ public class SelfStationServiceImpl implements ISelfStationService {
Map<String, Object> map = new HashMap<>();
//更新detial Information
List<String> detailedInfo = gammaFileUtil.DetailedInfo(sampleId.toString(), phd);
map.put("DetailedInformation", detailedInfo);
HashMap<String, String> detailedMap = Maps.newHashMap();
detailedMap.put("sampleId",detailedInfo.get(0));
detailedMap.put("stationCode",detailedInfo.get(1));
detailedMap.put("detectorCode",detailedInfo.get(2));
detailedMap.put("systemType",detailedInfo.get(3));
detailedMap.put("dataType",detailedInfo.get(4));
detailedMap.put("spectralQualifier",detailedInfo.get(5));
detailedMap.put("SRID",detailedInfo.get(6));
detailedMap.put("sampleStatus",detailedInfo.get(7));
detailedMap.put("collectStart",detailedInfo.get(8));
detailedMap.put("samplingTime",detailedInfo.get(9));
detailedMap.put("airVolume",detailedInfo.get(10));
detailedMap.put("flowRate",detailedInfo.get(11));
detailedMap.put("acquisitionStart",detailedInfo.get(12));
detailedMap.put("acquisitionRealTime",detailedInfo.get(13));
detailedMap.put("acquisitionLiveTime",detailedInfo.get(14));
detailedMap.put("acquisitionDecayTime",detailedInfo.get(15));
detailedMap.put("category",detailedInfo.get(16));
map.put("DetailedInformation", detailedMap);
//发送数据到redis
/*middleData.setSample_stationID(String.valueOf(stationId));
middleData.setSample_id(String.valueOf(phd.getId_sample()));