From 714cda964f2af8047ab5d976ba05c3b39e80ad53 Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Thu, 22 Feb 2024 09:30:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A4=84=E7=90=86=E6=A8=A1?=
=?UTF-8?q?=E5=9D=97=E7=94=9F=E6=88=90=E9=94=99=E8=AF=AF=E8=B0=B1=E6=96=87?=
=?UTF-8?q?=E4=BB=B6=E5=90=8D=E7=A7=B0=E6=97=B6=EF=BC=8C=E9=94=99=E8=AF=AF?=
=?UTF-8?q?=E8=B0=B1=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E5=89=8D=E7=BC=80?=
=?UTF-8?q?=E9=83=A8=E5=88=86=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E7=94=9F?=
=?UTF-8?q?=E6=88=90=E6=97=B6=E6=96=B0=E5=8A=A0=E7=94=9F=E6=88=90=E9=80=BB?=
=?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../spectrum/AbstractS_D_Q_G_SpectrumHandler.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractS_D_Q_G_SpectrumHandler.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractS_D_Q_G_SpectrumHandler.java
index a11e7aab..866ee82c 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractS_D_Q_G_SpectrumHandler.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractS_D_Q_G_SpectrumHandler.java
@@ -182,7 +182,14 @@ public abstract class AbstractS_D_Q_G_SpectrumHandler extends AbstractSpectrumHa
protected void updateErrorSpectrumFileName() throws FileNotFoundException {
StringBuilder newFileName = new StringBuilder();
if (StringUtils.isNotBlank(this.sourceData.measurement_id)) {
- newFileName.append(super.spectrumServiceQuotes.getNameStandUtil().GetFileNameFromDateTime(this.sourceData.measurement_id, ""));
+ String newName = super.spectrumServiceQuotes.getNameStandUtil().GetFileNameFromDateTime(this.sourceData.measurement_id, "");
+ if (StringUtils.isNotBlank(newName)) {
+ newFileName.append(newName);
+ } else {
+ newFileName.append(this.sourceData.detector_code);
+ newFileName.append(StringConstant.DASH);
+ newFileName.append("");
+ }
} else {
newFileName.append(this.sourceData.detector_code);
newFileName.append(StringConstant.DASH);