From b8c7a68c135beba74425903db7e2063e7939c060 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Tue, 6 May 2025 11:25:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=9C=80=E9=AB=98?= =?UTF-8?q?=E6=B8=A9=E5=BA=A6=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/huatek/busi/entity/CwzzTemperature.java | 6 ++++++ .../main/java/com/huatek/busi/vo/CwzzTemperatureVo.java | 7 ++++++- .../com/huatek/busi/mapping/CwzzTemperatureMapping.xml | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/busi-back/busi-back-model/src/main/java/com/huatek/busi/entity/CwzzTemperature.java b/busi-back/busi-back-model/src/main/java/com/huatek/busi/entity/CwzzTemperature.java index 7754f5b..59e1d7e 100644 --- a/busi-back/busi-back-model/src/main/java/com/huatek/busi/entity/CwzzTemperature.java +++ b/busi-back/busi-back-model/src/main/java/com/huatek/busi/entity/CwzzTemperature.java @@ -107,6 +107,12 @@ public class CwzzTemperature extends Pojo implements Serializable { @FieldName("min_tmp") private String minTmp; + /** + * 最高温度位置 + */ + @FieldName("max_location") + private String maxLocation; + /** * 告警温度位置 */ diff --git a/busi-back/busi-back-model/src/main/java/com/huatek/busi/vo/CwzzTemperatureVo.java b/busi-back/busi-back-model/src/main/java/com/huatek/busi/vo/CwzzTemperatureVo.java index cf48cc5..fce7634 100644 --- a/busi-back/busi-back-model/src/main/java/com/huatek/busi/vo/CwzzTemperatureVo.java +++ b/busi-back/busi-back-model/src/main/java/com/huatek/busi/vo/CwzzTemperatureVo.java @@ -103,7 +103,6 @@ public class CwzzTemperatureVo implements Serializable { /** * 最低温度 */ - @ExcelAnnotation(exportName = "最低温度(℃)") private String minTmp; /** @@ -112,6 +111,12 @@ public class CwzzTemperatureVo implements Serializable { @ExcelAnnotation(exportName = "告警温度位置") private String alarmLocation; + /** + * 告警温度位置 + */ + @ExcelAnnotation(exportName = "最高温度位置") + private String maxLocation; + /** * CAC 的唯一标识(17 位码) */ diff --git a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/CwzzTemperatureMapping.xml b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/CwzzTemperatureMapping.xml index 91894a4..771382a 100644 --- a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/CwzzTemperatureMapping.xml +++ b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/CwzzTemperatureMapping.xml @@ -9,6 +9,7 @@ t.max_tmp as maxTmp, t.min_tmp as minTmp, t.alarm_location as alarmLocation, + t.max_location as maxLocation, t.sensor_id as sensorId, t.time_stamp as timeStamp, t.main_tree_id as mainTreeId,