diff --git a/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordAirInstant.java b/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordAirInstant.java
index 7a2719f..cc388f6 100644
--- a/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordAirInstant.java
+++ b/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordAirInstant.java
@@ -24,6 +24,10 @@ public class EmsRecordAirInstant extends BaseEntity
@Excel(name = "计量设备编号")
private String monitorCode;
+ /** 计量设备名称 */
+ @Excel(name = "计量设备名称")
+ private String monitorName;
+
/** 采集时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "采集时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -58,7 +62,15 @@ public class EmsRecordAirInstant extends BaseEntity
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date recordTime;
- public void setObjId(Long objId)
+ public String getMonitorName() {
+ return monitorName;
+ }
+
+ public void setMonitorName(String monitorName) {
+ this.monitorName = monitorName;
+ }
+
+ public void setObjId(Long objId)
{
this.objId = objId;
}
diff --git a/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordNitrogenInstant.java b/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordNitrogenInstant.java
index 8e3f401..f3467e5 100644
--- a/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordNitrogenInstant.java
+++ b/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordNitrogenInstant.java
@@ -24,6 +24,10 @@ public class EmsRecordNitrogenInstant extends BaseEntity
@Excel(name = "计量设备编号")
private String monitorCode;
+ /** 计量设备名称 */
+ @Excel(name = "计量设备名称")
+ private String monitorName;
+
/** 采集时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "采集时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -58,7 +62,15 @@ public class EmsRecordNitrogenInstant extends BaseEntity
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date recordTime;
- public void setObjId(Long objId)
+ public String getMonitorName() {
+ return monitorName;
+ }
+
+ public void setMonitorName(String monitorName) {
+ this.monitorName = monitorName;
+ }
+
+ public void setObjId(Long objId)
{
this.objId = objId;
}
diff --git a/os-ems/src/main/resources/mapper/ems/record/EmsRecordAirInstantMapper.xml b/os-ems/src/main/resources/mapper/ems/record/EmsRecordAirInstantMapper.xml
index 49f8d93..d6f0ca2 100644
--- a/os-ems/src/main/resources/mapper/ems/record/EmsRecordAirInstantMapper.xml
+++ b/os-ems/src/main/resources/mapper/ems/record/EmsRecordAirInstantMapper.xml
@@ -15,30 +15,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
- select obj_id, monitor_code, collect_time, flux_flow, steam_flow, temperature, press, density, difference_press, record_time from ems_record_air_instant
+ select rai.obj_id,
+ rai.monitor_code,
+ rai.collect_time,
+ rai.flux_flow,
+ rai.steam_flow,
+ rai.temperature,
+ rai.press,
+ rai.density,
+ rai.difference_press,
+ rai.record_time,
+ bmi.monitor_name
+ from ems_record_air_instant rai
+ left join ems_base_monitor_info bmi on rai.monitor_code = bmi.monitor_code
diff --git a/os-ems/src/main/resources/mapper/ems/record/EmsRecordNitrogenInstantMapper.xml b/os-ems/src/main/resources/mapper/ems/record/EmsRecordNitrogenInstantMapper.xml
index 0ec477e..2859268 100644
--- a/os-ems/src/main/resources/mapper/ems/record/EmsRecordNitrogenInstantMapper.xml
+++ b/os-ems/src/main/resources/mapper/ems/record/EmsRecordNitrogenInstantMapper.xml
@@ -1,47 +1,67 @@
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
- select obj_id, monitor_code, collect_time, flux_flow, steam_flow, temperature, press, purity, difference_press, record_time from ems_record_nitrogen_instant
+ select rni.obj_id,
+ rni.monitor_code,
+ rni.collect_time,
+ rni.flux_flow,
+ rni.steam_flow,
+ rni.temperature,
+ rni.press,
+ rni.purity,
+ rni.difference_press,
+ rni.record_time,
+ bmi.monitor_name
+ from ems_record_nitrogen_instant rni
+ left join ems_base_monitor_info bmi on rni.monitor_code = bmi.monitor_code
-