From ba2c99d27cd7eb2d809995fb68ed69c2b7a45edf Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Wed, 29 Oct 2025 19:41:50 +0800 Subject: [PATCH] =?UTF-8?q?feat(ems):=E7=94=B5=E8=A1=A8=E3=80=81=E8=92=B8?= =?UTF-8?q?=E6=B1=BD=20=E6=B7=BB=E5=8A=A0=E8=A1=A8=E3=80=81=E6=B0=B4?= =?UTF-8?q?=E8=A1=A8=E5=8F=8A=E6=8C=AF=E5=8A=A8=E6=B8=A9=E5=BA=A6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 为 EmsRecordDnbInstant 类添加字段注解，包括电压、电流、功率等 -为 EmsRecordSteamInstant 类补充缺失的字段注解，如流量、热量相关字段 - 为 EmsRecordWaterInstant 类增加流量及记录时间等字段注解- 为 EmsVibrationInstant 类补充传感器ID及相关时间字段注解 -为 TWTempertureData 类添加温度监测相关字段注解- 所有新增注解均使用 @TableField 明确数据库列名映射关系 --- .../ems/record/domain/EmsRecordDnbInstant.java | 14 ++++++++++++++ .../ems/record/domain/EmsRecordSteamInstant.java | 9 +++++++++ .../ems/record/domain/EmsRecordWaterInstant.java | 7 +++++++ .../ems/record/domain/EmsVibrationInstant.java | 4 ++++ .../ems/record/domain/TWTempertureData.java | 7 +++++++ 5 files changed, 41 insertions(+) diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordDnbInstant.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordDnbInstant.java index 8631d21f..b429098d 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordDnbInstant.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordDnbInstant.java @@ -32,10 +32,12 @@ public class EmsRecordDnbInstant extends EmsRecordEntity { /** * 主键标识 */ + @TableField("obj_id") private Long objId; /** 计量设备编号 */ //@ExcelProperty(value = "计量设备编号") + @TableField("monitor_code") private String monitorCode; /** 计量设备名称 */ @@ -46,35 +48,43 @@ public class EmsRecordDnbInstant extends EmsRecordEntity { /** 采集时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") //@ExcelProperty(value = "采集时间", format = "yyyy-MM-dd HH:mm:ss") + @TableField("collect_time") private Date collectTime; /** A相电压 */ //@ExcelProperty(value = "A相电压") + @TableField("v_a") private BigDecimal vA; /** B相电压 */ //@ExcelProperty(value = "B相电压") + @TableField("v_b") private BigDecimal vB; /** C相电压 */ //@ExcelProperty(value = "C相电压") + @TableField("v_c") private BigDecimal vC; /** A相电流 */ //@ExcelProperty(value = "A相电流") + @TableField("i_a") private BigDecimal iA; /** B相电流 */ //@ExcelProperty(value = "B相电流") + @TableField("i_b") private BigDecimal iB; /** C相电流 */ //@ExcelProperty(value = "C相电流") + @TableField("i_c") private BigDecimal iC; /** 记录时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") //@ExcelProperty(value = "记录时间", format = "yyyy-MM-dd HH:mm:ss") + @TableField("record_time") private Date recordTime; /** 功率因数 */ @@ -83,18 +93,22 @@ public class EmsRecordDnbInstant extends EmsRecordEntity { /** 正向有功 */ //@ExcelProperty(value = "正向有功") + @TableField("zxyg") private BigDecimal zxyg; /** 有功功率 */ //@ExcelProperty(value = "有功功率") + @TableField("active_power") private BigDecimal activePower; /** 无功功率 */ //@ExcelProperty(value = "无功功率") + @TableField("reactive_power") private BigDecimal reactivePower; /** 采集方式（0自动 1手动） */ //@ExcelProperty(value = "采集方式", readConverterExp = "0=自动,1=手动") + @TableField("collect_type") private Long collectType; public String getMonitorName() { diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordSteamInstant.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordSteamInstant.java index c475afc2..721a6b60 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordSteamInstant.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordSteamInstant.java @@ -32,12 +32,14 @@ public class EmsRecordSteamInstant extends EmsRecordEntity { /** * 自增标识 */ + @TableField("obj_id") private Long objId; /** * 计量设备编号 */ //@ExcelProperty(value = "计量设备编号") + @TableField("monitor_code") private String monitorCode; /** 计量设备编号 */ @@ -50,30 +52,35 @@ public class EmsRecordSteamInstant extends EmsRecordEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") //@ExcelProperty(value = "采集时间", format = "yyyy-MM-dd HH:mm:ss") + @TableField("collect_time") private Date collectTime; /** * 瞬时流量 */ //@ExcelProperty(value = "瞬时流量") + @TableField("flux_flow") private BigDecimal fluxFlow; /** * 累计流量 */ //@ExcelProperty(value = "累计流量") + @TableField("steam_flow") private BigDecimal steamFlow; /** * 瞬时热量 */ //@ExcelProperty(value = "瞬时热量") + @TableField("heat_instant_value") private BigDecimal heatInstantValue; /** * 累计热量 */ //@ExcelProperty(value = "累计热量") + @TableField("heat_total_value") private BigDecimal heatTotalValue; /** @@ -98,6 +105,7 @@ public class EmsRecordSteamInstant extends EmsRecordEntity { * 压力差值 */ //@ExcelProperty(value = "压力差值") + @TableField("difference_press") private BigDecimal differencePress; /** @@ -105,6 +113,7 @@ public class EmsRecordSteamInstant extends EmsRecordEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") //@ExcelProperty(value = "记录时间", format = "yyyy-MM-dd HH:mm:ss") + @TableField("record_time") private Date recordTime; /* *//** diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordWaterInstant.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordWaterInstant.java index 8d955b51..64509642 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordWaterInstant.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordWaterInstant.java @@ -32,10 +32,12 @@ public class EmsRecordWaterInstant extends EmsRecordEntity { /** * 主键标识 */ + @TableField("obj_id") private Long objId; /** 计量设备编号 */ //@ExcelProperty(value = "计量设备编号") + @TableField("monitor_code") private String monitorCode; /** 计量设备编号 */ @@ -46,23 +48,28 @@ public class EmsRecordWaterInstant extends EmsRecordEntity { /** 采集时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") //@ExcelProperty(value = "采集时间", format = "yyyy-MM-dd HH:mm:ss") + @TableField("collect_time") private Date collectTime; /** 瞬时流量 */ //@ExcelProperty(value = "瞬时流量") + @TableField("flux_flow") private BigDecimal fluxFlow; /** 累计流量 */ //@ExcelProperty(value = "累计流量") + @TableField("water_flow") private BigDecimal waterFlow; /** 记录时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") //@ExcelProperty(value = "记录时间", format = "yyyy-MM-dd HH:mm:ss") + @TableField("record_time") private Date recordTime; /** 采集方式（0自动 1手动） */ //@ExcelProperty(value = "采集方式", readConverterExp = "0=自动,1=手动") + @TableField("collect_type") private Long collectType; public String getMonitorCode() { diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsVibrationInstant.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsVibrationInstant.java index b5063ffe..eabb956f 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsVibrationInstant.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsVibrationInstant.java @@ -40,15 +40,18 @@ public class EmsVibrationInstant extends EmsRecordEntity } /** 主键标识 */ + @TableField("objId") private Long objId; /** 采集时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") //@ExcelProperty(value = "采集时间", format = "yyyy-MM-dd HH:mm:ss") + @TableField("collectTime") private Date collectTime; /** 振动传感器编号 */ //@ExcelProperty(value = "振动传感器编号") + @TableField("sensor_id") private String sensorId; /** 速度(mm/s) */ @@ -70,6 +73,7 @@ public class EmsVibrationInstant extends EmsRecordEntity /** 记录时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") //@ExcelProperty(value = "记录时间", format = "yyyy-MM-dd HH:mm:ss") + @TableField("recodeTime") private Date recodeTime; public void setObjId(Long objId) diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/TWTempertureData.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/TWTempertureData.java index 4a8e0129..04256443 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/TWTempertureData.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/TWTempertureData.java @@ -31,6 +31,7 @@ public class TWTempertureData extends EmsRecordEntity /** 计量设备编号 */ //@ExcelProperty(value = "计量设备编号") + @TableField("monitorId") private String monitorId; /**计量设备名称**/ @@ -41,6 +42,7 @@ public class TWTempertureData extends EmsRecordEntity /** 采集时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") //@ExcelProperty(value = "采集时间", format = "yyyy-MM-dd HH:mm:ss") + @TableField("collectTime") private Date collectTime; /** 温度 */ @@ -66,23 +68,28 @@ public class TWTempertureData extends EmsRecordEntity /** 记录时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") //@ExcelProperty(value = "记录时间", format = "yyyy-MM-dd HH:mm:ss") + @TableField("recodeTime") private Date recodeTime; /** 报警类型 */ //@ExcelProperty(value = "报警类型") + @TableField("alarmType") private Long alarmType; /** */ //@ExcelProperty(value = " ") + @TableField("confirmPersonID") private Long confirmPersonID; /** */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") //@ExcelProperty(value = " ", format = "yyyy-MM-dd HH:mm:ss") + @TableField("confirmTime") private Date confirmTime; /** */ //@ExcelProperty(value = " ") + @TableField("confirmFlag") private Long confirmFlag; public void setObjid(Long objid)