From 645d189703559829471a23d7fc4f4142172e6f9f Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Thu, 7 Dec 2023 15:56:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A4=84=E7=90=86=E5=90=91re?= =?UTF-8?q?dis=E6=8E=A8=E9=80=81gamma=E7=BC=93=E5=AD=98=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=8F=B0=E7=AB=99id=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E4=BA=A4=E4=BA=92=E5=90=91redis=E6=8E=A8?= =?UTF-8?q?=E9=80=81gamma=E7=BC=93=E5=AD=98=E6=95=B0=E6=8D=AE=E5=8F=B0?= =?UTF-8?q?=E7=AB=99id=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java | 2 +- .../java/org/jeecg/modules/service/impl/GammaServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java index 49e08a68..c491aaf7 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java @@ -202,7 +202,7 @@ public class Sample_G_Analysis { private void pushToRedis(GStoreMiddleProcessData middleData){ try { Info info = new Info(); - info.setStationId(middleData.sample_stationID); + info.setStationId(this.sampleData.getStationId().toString()); info.setSampleId(middleData.sample_id); info.setSampleName(middleData.analyses_save_filePath.substring(middleData.analyses_save_filePath.lastIndexOf(StringPool.SLASH)+1)); final Instant instant = DateUtils.parseDate(middleData.sample_collection_start).toInstant(); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java index 56d57515..d07cfc7a 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java @@ -4592,6 +4592,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi List detailedInfo = gammaFileUtil.DetailedInfo(phd.getId_sample(), phd); map.put("DetailedInformation", detailedInfo); //发送数据到redis + middleData.setSample_stationID(String.valueOf(stationId)); middleData.setSample_id(String.valueOf(phd.getId_sample())); pushToRedis(middleData, phd); result.setSuccess(true);