From 8b497a71ea406a68b1896527a4e66d9110a48eee Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Mon, 1 Dec 2025 13:55:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=92=B1=E5=A1=98=E6=B1=9F=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=97=A0?= =?UTF-8?q?=E4=BA=BA=E6=9C=BA=E6=9C=BA=E5=B7=A2=E6=95=B0=E6=8D=AE=E4=B8=8D?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metadata/montdata/domain/BasedataMontNestRunData.java | 4 ++++ .../metadata/montdata/domain/BasedataMontNestStaData.java | 4 ++++ .../metadata/montdata/domain/BasedataMontPatDevAlmAbn.java | 5 +++++ .../montdata/service/impl/BasedataMontQueryServiceImpl.java | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontNestRunData.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontNestRunData.java index 7a3ca03..8209211 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontNestRunData.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontNestRunData.java @@ -1,5 +1,6 @@ package com.inspect.metadata.montdata.domain; +import com.alibaba.fastjson.annotation.JSONField; import com.inspect.base.core.annotation.Excel; import com.inspect.base.core.web.domain.BaseEntity; @@ -40,6 +41,7 @@ public class BasedataMontNestRunData extends BaseEntity { @Excel( name = "类型名称" ) + @JSONField(name = "type_name") private String typeName; @Excel( name = "值" @@ -48,10 +50,12 @@ public class BasedataMontNestRunData extends BaseEntity { @Excel( name = "值对名称" ) + @JSONField(name = "value_name") private String valueName; @Excel( name = "值带单位" ) + @JSONField(name = "value_unit") private String valueUnit; @Excel( name = "单位" diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontNestStaData.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontNestStaData.java index 34e64c9..84c3811 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontNestStaData.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontNestStaData.java @@ -1,5 +1,6 @@ package com.inspect.metadata.montdata.domain; +import com.alibaba.fastjson.annotation.JSONField; import com.inspect.base.core.annotation.Excel; import com.inspect.base.core.web.domain.BaseEntity; @@ -38,6 +39,7 @@ public class BasedataMontNestStaData extends BaseEntity { @Excel( name = "类型名称" ) + @JSONField(name = "type_name") private String typeName; @Excel( name = "值" @@ -46,10 +48,12 @@ public class BasedataMontNestStaData extends BaseEntity { @Excel( name = "值对名称" ) + @JSONField(name = "value_name") private String valueName; @Excel( name = "值带单位" ) + @JSONField(name = "value_unit") private String valueUnit; @Excel( name = "单位" diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontPatDevAlmAbn.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontPatDevAlmAbn.java index a4ef0d9..024aebb 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontPatDevAlmAbn.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontPatDevAlmAbn.java @@ -1,5 +1,6 @@ package com.inspect.metadata.montdata.domain; +import com.alibaba.fastjson.annotation.JSONField; import com.inspect.base.core.annotation.Excel; import com.inspect.base.core.web.domain.BaseEntity; @@ -30,9 +31,13 @@ public class BasedataMontPatDevAlmAbn extends BaseEntity { ) private String time; private String type; + @JSONField(name = "type_name") private String typeName; private String value; + + @JSONField(name = "value_name") private String valueName; + @JSONField(name = "value_unit") private String valueUnit; private String unit; @Excel( diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdata/service/impl/BasedataMontQueryServiceImpl.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdata/service/impl/BasedataMontQueryServiceImpl.java index 26b6319..97f98d6 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdata/service/impl/BasedataMontQueryServiceImpl.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdata/service/impl/BasedataMontQueryServiceImpl.java @@ -72,7 +72,7 @@ public class BasedataMontQueryServiceImpl implements IBasedataMontQueryService { } public JSONObject getMontNestRunData(String nestCode) { - return this.redisService.getCacheObject("mont_nest_rundata:" + nestCode); + return this.redisService.getCacheObject("mont_nest_run_data:" + nestCode); } public JSONObject getMontNestStaData(String nestCode) {