diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java index 2e365471..b683ad51 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java @@ -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 map = new HashMap<>(); //更新detial Information List detailedInfo = gammaFileUtil.DetailedInfo(sampleId.toString(), phd); - map.put("DetailedInformation", detailedInfo); + HashMap 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()));