From 21d2c2b7a7161d7a67f2fb3e308be734b0ffecb5 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Wed, 19 Nov 2025 13:20:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/gather/report/pojo/enums/BaseReportKeyEnum.java | 5 ++++- .../gather/report/service/impl/PqReportServiceImpl.java | 9 ++++++++- license.key | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 license.key diff --git a/detection/src/main/java/com/njcn/gather/report/pojo/enums/BaseReportKeyEnum.java b/detection/src/main/java/com/njcn/gather/report/pojo/enums/BaseReportKeyEnum.java index 53d2a24e..2cc2f0c6 100644 --- a/detection/src/main/java/com/njcn/gather/report/pojo/enums/BaseReportKeyEnum.java +++ b/detection/src/main/java/com/njcn/gather/report/pojo/enums/BaseReportKeyEnum.java @@ -32,7 +32,10 @@ public enum BaseReportKeyEnum { YEAR_MONTH_DAY("year-month-day","年-月-日"), TEMPERATURE("temp","温度"), HUMIDITY("hum","相对湿度"), - DELEGATE("delegate","委托方"); + DELEGATE("delegate","委托方"), + CREATEDATE("createDate","出厂日期"), + HW_VERSION("hardwareVersion","硬件版本"), + SW_VERSION("softwareVersion","软件版本"); private String key; diff --git a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java index e9d646f4..881647b9 100644 --- a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java @@ -71,7 +71,6 @@ import com.njcn.gather.type.service.IDevTypeService; import com.njcn.http.util.RestTemplateUtil; import com.njcn.web.factory.PageFactory; import io.netty.channel.Channel; -import javafx.scene.input.DataFormat; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.net.ftp.FTPClient; @@ -1416,6 +1415,14 @@ public class PqReportServiceImpl extends ServiceImpl i datePattern = DatePattern.CHINESE_DATE_PATTERN; } + + // 出厂日期 + baseModelMap.put(prefix + BaseReportKeyEnum.CREATEDATE.getKey() + suffix, pqDevVO.getCreateDate().format(DateTimeFormatter.ofPattern(datePattern))); + // 硬件版本 + baseModelMap.put(prefix + BaseReportKeyEnum.HW_VERSION.getKey() + suffix, StrUtil.isNotBlank(pqDevVO.getHardwareVersion()) ? pqDevVO.getHardwareVersion() : StrUtil.EMPTY); + // 软件版本 + baseModelMap.put(prefix + BaseReportKeyEnum.SW_VERSION.getKey() + suffix, StrUtil.isNotBlank(pqDevVO.getSoftwareVersion()) ? pqDevVO.getSoftwareVersion() : StrUtil.EMPTY); + // 调试日期 if (pqDevVO.getCheckTime() != null) { baseModelMap.put(prefix + BaseReportKeyEnum.TEST_DATE.getKey() + suffix, DateUtil.format(pqDevVO.getCheckTime(), datePattern)); diff --git a/license.key b/license.key new file mode 100644 index 00000000..2770bedc --- /dev/null +++ b/license.key @@ -0,0 +1 @@ +AoNUHvLQag9nPPxWDsf5EwwBqifh5wnoFjrU01w+kIA7TPdRl0AQDBSA3IU7AY28Liubt6Rl8CsDtxEDrz8L5m0FqQrmZ1TmIJtZWbBR16NxXRgf8izM5JurYEY6ZbjU021yCu0fitxB0DJZ8LB8zfUDsV1MFGHl+yPjh4ZQrYDffID4rk/mRe/EE6F7bS19upStSOnQxVQVJSXwCVVHgsuFXqiuagM21OmxpYNjqaPnvAKoHRXTTxXn9BrSgZBocxuHB/IE+a0a+Q2eQo4RZa2IQpneEA/QIKEqezqsABxmM33duQ4eKt17hAttISV1J0R1cKpwZ4tYuSoHCuMONA== \ No newline at end of file