From 917a76da41117bca9221668e78f32422fd438a43 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Thu, 13 Jul 2023 10:26:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=9C=AA=E4=BD=BF=E7=94=A8=E9=A9=BC=E5=B3=B0?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E4=BF=AE=E6=94=B9=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8A=98=E7=BA=BF=E5=9B=BE=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/common/util/PHDFileUtil.java | 2 +- .../modules/controller/GammaController.java | 2 +- .../controller/SpectrumAnalysesController.java | 2 +- .../jeecg/modules/entity/vo/SpectrumData.java | 16 ++++++++-------- .../service/ISpectrumAnalysisService.java | 2 +- .../impl/SpectrumAnalysisServiceImpl.java | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java index 054e34e9..b26a0f44 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java @@ -41,7 +41,7 @@ public class PHDFileUtil { //Collection Stop Date CollectionStop = DateUtils.parseDate(struct.collection_stop_date.replace(StringPool.SLASH,StringPool.DASH) + StringPool.SPACE + struct.collection_stop_time.substring(0, struct.collection_stop_time.indexOf(StringPool.DOT)), "yyyy-MM-dd HH:mm:ss"); //Collection Time - String CollectionTime = String.format ("%.2f",Double.valueOf(CollectionStop.getTime() - CollectionStart.getTime()/ 1000)); + String CollectionTime = String.format ("%.2f",Double.valueOf(CollectionStop.getTime()/1000 - CollectionStart.getTime()/ 1000)); //Acquisition Start Date AcquisitionStart = DateUtils.parseDate(struct.acquisition_start_date.replace(StringPool.SLASH,StringPool.DASH) + StringPool.SPACE + struct.acquisition_start_time.substring(0, struct.acquisition_start_time.indexOf(StringPool.DOT)), "yyyy-MM-dd HH:mm:ss"); //Acq Real Time diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java index 101b815a..73086dde 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java @@ -32,7 +32,7 @@ public class GammaController { @GetMapping("gammaByFile") public Result gammaByFile(@RequestParam Integer sampleId, @RequestParam String dbName){ - return spectrumAnalysisService.getDBSpectrumPie(dbName, sampleId); + return spectrumAnalysisService.getDBSpectrumChart(dbName, sampleId); } public static void main(String[] args) { diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java index 00a4082c..d84350b2 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java @@ -38,7 +38,7 @@ public class SpectrumAnalysesController { @GetMapping("getDBSpectrumChart") @ApiOperation(value = "查询折线图相关信息接口", notes = "查询折线图相关信息接口") public Result getDBSpectrumPie(String dbName, Integer sampleId){ - return spectrumAnalysisService.getDBSpectrumPie(dbName, sampleId); + return spectrumAnalysisService.getDBSpectrumChart(dbName, sampleId); } } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/SpectrumData.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/SpectrumData.java index a1bddb50..cb882f2b 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/SpectrumData.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/SpectrumData.java @@ -18,24 +18,24 @@ public class SpectrumData implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date CollectionStart; + private Date collectionStart; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date CollectionStop; + private Date collectionStop; - private String CollectionTime; + private String collectionTime; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date AcquisitionStart; + private Date acquisitionStart; - private double AcquisitionRealTime; + private double acquisitionRealTime; - private double AcquisitionLiveTime; + private double acquisitionLiveTime; - private double AirVolume; + private double airVolume; - private double XeVolume; + private double xeVolume; } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java index 800fd422..127dc97c 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java @@ -12,6 +12,6 @@ public interface ISpectrumAnalysisService { Result getDBSpectrumList(QueryRequest queryRequest, GardsSampleData gardsSampleData, String dbName, String[] menuTypes, boolean CollectStop, boolean AcqStart, Date startDate, Date endDate); - Result getDBSpectrumPie(String dbName, Integer sampleId); + Result getDBSpectrumChart(String dbName, Integer sampleId); } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java index 0437a173..927795ae 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java @@ -134,7 +134,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { } @Override - public Result getDBSpectrumPie(String dbName, Integer sampleId) { + public Result getDBSpectrumChart(String dbName, Integer sampleId) { Result result = new Result(); Map> resultMap = new HashMap<>(); if (redisUtil.hasKey("Spectrum_"+sampleId)){