diff --git a/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordAlarmRule.java b/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordAlarmRule.java
index 93f3986..442958f 100644
--- a/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordAlarmRule.java
+++ b/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordAlarmRule.java
@@ -1,5 +1,6 @@
 package com.os.ems.record.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -47,17 +48,17 @@ public class EmsRecordAlarmRule extends BaseEntity
     @Excel(name = "触发规则", readConverterExp = "0=超过阈值,1=设备报警")
     private Long triggerRule;
 
-    /** 触发阈值次数 */
-    @Excel(name = "触发阈值次数")
-    private Long triggerNumber;
+    /** 监测字段 */
+    @Excel(name = "监测字段")
+    private Long monitorField;
 
     /** 时间范围(分) */
     @Excel(name = "时间范围(分)")
     private Long timeRange;
 
-    /** 设备离线时间(分) */
-    @Excel(name = "设备离线时间(分)")
-    private Long deviceOfflineTime;
+    /** 触发阈值量 */
+    @Excel(name = "触发阈值量")
+    private BigDecimal triggerValue;
 
     /** 通知用户 */
     @Excel(name = "通知用户")
@@ -156,15 +157,16 @@ public class EmsRecordAlarmRule extends BaseEntity
     {
         return triggerRule;
     }
-    public void setTriggerNumber(Long triggerNumber)
+    public void setMonitorField(Long monitorField)
     {
-        this.triggerNumber = triggerNumber;
+        this.monitorField = monitorField;
     }
 
-    public Long getTriggerNumber()
+    public Long getMonitorField()
     {
-        return triggerNumber;
+        return monitorField;
     }
+
     public void setTimeRange(Long timeRange)
     {
         this.timeRange = timeRange;
@@ -174,15 +176,7 @@ public class EmsRecordAlarmRule extends BaseEntity
     {
         return timeRange;
     }
-    public void setDeviceOfflineTime(Long deviceOfflineTime)
-    {
-        this.deviceOfflineTime = deviceOfflineTime;
-    }
 
-    public Long getDeviceOfflineTime()
-    {
-        return deviceOfflineTime;
-    }
     public void setNotifyUser(String notifyUser)
     {
         this.notifyUser = notifyUser;
@@ -202,6 +196,14 @@ public class EmsRecordAlarmRule extends BaseEntity
         return cause;
     }
 
+    public BigDecimal getTriggerValue() {
+        return triggerValue;
+    }
+
+    public void setTriggerValue(BigDecimal triggerValue) {
+        this.triggerValue = triggerValue;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -212,9 +214,9 @@ public class EmsRecordAlarmRule extends BaseEntity
             .append("collectTime", getCollectTime())
             .append("energyType", getEnergyType())
             .append("triggerRule", getTriggerRule())
-            .append("triggerNumber", getTriggerNumber())
+            .append("monitorField", getMonitorField())
             .append("timeRange", getTimeRange())
-            .append("deviceOfflineTime", getDeviceOfflineTime())
+            .append("triggerValue", getTriggerValue())
             .append("notifyUser", getNotifyUser())
             .append("cause", getCause())
             .append("createBy", getCreateBy())
diff --git a/os-ems/src/main/java/com/os/ems/record/domain/RecordIotenvInstant.java b/os-ems/src/main/java/com/os/ems/record/domain/RecordIotenvInstant.java
index fd42577..0cfb0ef 100644
--- a/os-ems/src/main/java/com/os/ems/record/domain/RecordIotenvInstant.java
+++ b/os-ems/src/main/java/com/os/ems/record/domain/RecordIotenvInstant.java
@@ -82,6 +82,10 @@ public class RecordIotenvInstant extends BaseEntity
     //关联查询设备名称
     private String monitorName;
 
+    /** 计量设备编号 */
+    @Excel(name = "计量设备编号")
+    private String monitorCode;
+
 
 //
 //    public void setObjid(Long objid)
diff --git a/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmRuleMapper.xml b/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmRuleMapper.xml
index 304dca7..5f3fde8 100644
--- a/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmRuleMapper.xml
+++ b/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmRuleMapper.xml
@@ -14,9 +14,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="collectTime"    column="collect_time"    />
         <result property="energyType"    column="energy_type"    />
         <result property="triggerRule"    column="trigger_rule"    />
-        <result property="triggerNumber"    column="trigger_number"    />
+        <result property="monitorField"    column="monitor_field"    />
         <result property="timeRange"    column="time_range"    />
-        <result property="deviceOfflineTime"    column="device_offline_time"    />
+        <result property="triggerValue"    column="trigger_value"    />
         <result property="notifyUser"    column="notify_user"    />
         <result property="cause"    column="cause"    />
         <result property="createBy"    column="create_by"    />
@@ -35,9 +35,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	        RAL.collect_time,
 	        RAL.energy_type,
 	        RAL.trigger_rule,
-	        RAL.trigger_number,
+	        RAL.monitor_field,
 	        RAL.time_range,
-	        RAL.device_offline_time,
+	        RAL.trigger_value,
 	        RAL.notify_user,
 	        RAL.cause,
 	        RAL.create_by,
@@ -45,12 +45,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	        RAL.update_by,
 	        RAL.update_time,
 	        BMI.monitor_code,
-	        BMI.monitor_name,
-	        SUSER.nick_name
+	        BMI.monitor_name
     FROM
 	ems_record_alarm_rule as RAL
-	left join ems_base_monitor_info as BMI on RAL.monitor_id = BMI.obj_id
-	left join sys_user as SUSER on RAL.notify_user = SUSER.user_id
+	left join ems_base_monitor_info as BMI on RAL.monitor_id = BMI.monitor_code
 	</sql>
 
     <select id="selectEmsRecordAlarmRuleList" parameterType="EmsRecordAlarmRule" resultMap="EmsRecordAlarmRuleResult">
@@ -62,9 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="collectTime != null "> and RAL.collect_time = #{collectTime}</if>
             <if test="energyType != null "> and RAL.energy_type = #{energyType}</if>
             <if test="triggerRule != null "> and RAL.trigger_rule = #{triggerRule}</if>
-            <if test="triggerNumber != null "> and RAL.trigger_number = #{triggerNumber}</if>
+            <if test="monitorField != null "> and RAL.monitor_field = #{monitorField}</if>
             <if test="timeRange != null "> and RAL.time_range = #{timeRange}</if>
-            <if test="deviceOfflineTime != null "> and RAL.device_offline_time = #{deviceOfflineTime}</if>
+            <if test="triggerValue != null "> and RAL.trigger_value = #{triggerValue}</if>
             <if test="notifyUser != null  and notifyUser != ''"> and RAL.notify_user = #{notifyUser}</if>
             <if test="cause != null  and cause != ''"> and RAL.cause = #{cause}</if>
         </where>
@@ -84,9 +82,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="collectTime != null">collect_time,</if>
             <if test="energyType != null">energy_type,</if>
             <if test="triggerRule != null">trigger_rule,</if>
-            <if test="triggerNumber != null">trigger_number,</if>
+            <if test="monitorField != null">monitor_field,</if>
             <if test="timeRange != null">time_range,</if>
-            <if test="deviceOfflineTime != null">device_offline_time,</if>
+            <if test="triggerValue != null">trigger_value,</if>
             <if test="notifyUser != null">notify_user,</if>
             <if test="cause != null">cause,</if>
             <if test="createBy != null">create_by,</if>
@@ -101,9 +99,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="collectTime != null">#{collectTime},</if>
             <if test="energyType != null">#{energyType},</if>
             <if test="triggerRule != null">#{triggerRule},</if>
-            <if test="triggerNumber != null">#{triggerNumber},</if>
+            <if test="monitorField != null">#{monitorField},</if>
             <if test="timeRange != null">#{timeRange},</if>
-            <if test="deviceOfflineTime != null">#{deviceOfflineTime},</if>
+            <if test="triggerValue != null">#{triggerValue},</if>
             <if test="notifyUser != null">#{notifyUser},</if>
             <if test="cause != null">#{cause},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -122,9 +120,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="collectTime != null">collect_time = #{collectTime},</if>
             <if test="energyType != null">energy_type = #{energyType},</if>
             <if test="triggerRule != null">trigger_rule = #{triggerRule},</if>
-            <if test="triggerNumber != null">trigger_number = #{triggerNumber},</if>
+            <if test="monitorField != null">monitor_field = #{monitorField},</if>
             <if test="timeRange != null">time_range = #{timeRange},</if>
-            <if test="deviceOfflineTime != null">device_offline_time = #{deviceOfflineTime},</if>
+            <if test="triggerValue != null">trigger_value = #{triggerValue},</if>
             <if test="notifyUser != null">notify_user = #{notifyUser},</if>
             <if test="cause != null">cause = #{cause},</if>
             <if test="createBy != null">create_by = #{createBy},</if>