调整接口，增加告警级别设置

jjt-biz/src/main/java/com/jjt/biz/controller/MetricsDefController.java

@@ -47,7 +47,7 @@ public class MetricsDefController extends BaseController {
      */
     @ApiOperation("导出指标定义列表")
     @PreAuthorize("@ss.hasPermi('metrics:def:export')")
-    @Log(title = "指标定义" , businessType = BusinessType.EXPORT)
+    @Log(title = "指标定义", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, MetricsDef metricsDef) {
         List<MetricsDef> list = metricsDefService.selectMetricsDefList(metricsDef);
@@ -71,7 +71,7 @@ public class MetricsDefController extends BaseController {
      */
     @ApiOperation("新增指标定义")
     @PreAuthorize("@ss.hasPermi('metrics:def:add')")
-    @Log(title = "指标定义" , businessType = BusinessType.INSERT)
+    @Log(title = "指标定义", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody MetricsDef metricsDef) {
         return toAjax(metricsDefService.insertMetricsDef(metricsDef));
@@ -82,7 +82,7 @@ public class MetricsDefController extends BaseController {
      */
     @ApiOperation("修改指标定义")
     @PreAuthorize("@ss.hasPermi('metrics:def:edit')")
-    @Log(title = "指标定义" , businessType = BusinessType.UPDATE)
+    @Log(title = "指标定义", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody MetricsDef metricsDef) {
         return toAjax(metricsDefService.updateMetricsDef(metricsDef));
@@ -93,7 +93,7 @@ public class MetricsDefController extends BaseController {
      */
     @ApiOperation("删除指标定义")
     @PreAuthorize("@ss.hasPermi('metrics:def:remove')")
-    @Log(title = "指标定义" , businessType = BusinessType.DELETE)
+    @Log(title = "指标定义", businessType = BusinessType.DELETE)
     @DeleteMapping("/{metricsIds}")
     public AjaxResult remove(@PathVariable Long[] metricsIds) {
         return toAjax(metricsDefService.deleteMetricsDefByMetricsIds(metricsIds));

jjt-biz/src/main/java/com/jjt/biz/domain/BizObjMetrics.java

@@ -13,7 +13,7 @@ import lombok.Data;
  * @author jjt
  * @date 2024-08-09
  */
-@ApiModel(value = "BizObjMetrics" , description = "业务对象指标")
+@ApiModel(value = "BizObjMetrics", description = "业务对象指标")
 @Data
 public class BizObjMetrics extends BaseEntity {
     private static final long serialVersionUID = 1L;
@@ -60,12 +60,12 @@ public class BizObjMetrics extends BaseEntity {
     @Excel(name = "指标编码")
     private String metricsCode;
 
-    /**
-     * 告警规则
-     */
-    @ApiModelProperty("告警规则")
-    @Excel(name = "告警规则")
-    private String alarmRule;
+    @ApiModelProperty("告警-低")
+    private String alarmLow;
+    @ApiModelProperty("告警-中")
+    private String alarmMid;
+    @ApiModelProperty("告警-高")
+    private String alarmHigh;
 
     @ApiModelProperty("指标定义")
     private MetricsDef metricsDef;

jjt-biz/src/main/java/com/jjt/biz/domain/MetricsDef.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @author jjt
  * @date 2024-08-08
  */
-@ApiModel(value = "MetricsDef" , description = "指标定义")
+@ApiModel(value = "MetricsDef", description = "指标定义")
 @Data
 public class MetricsDef extends BaseEntity {
     private static final long serialVersionUID = 1L;
@@ -58,4 +58,10 @@ public class MetricsDef extends BaseEntity {
     @ApiModelProperty("指标分类")
     @Excel(name = "指标分类")
     private List<MetricsType> metricsTypes;
+    @ApiModelProperty("告警-低")
+    private String alarmLow;
+    @ApiModelProperty("告警-中")
+    private String alarmMid;
+    @ApiModelProperty("告警-高")
+    private String alarmHigh;
 }

jjt-biz/src/main/java/com/jjt/biz/domain/MetricsTpl.java

@@ -1,12 +1,11 @@
 package com.jjt.biz.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.jjt.common.annotation.Excel;
 import com.jjt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * 指标模板对象 metrics_tpl
@@ -15,64 +14,31 @@ import com.jjt.common.core.domain.BaseEntity;
  * @date 2024-08-08
  */
 @ApiModel(value = "MetricsTpl", description = "指标模板")
-public class MetricsTpl extends BaseEntity
-{
+@Data
+public class MetricsTpl extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 模板ID */
+    /**
+     * 模板ID
+     */
     @ApiModelProperty("模板ID")
     @TableId
     private Long tplId;
 
-    /** 模板名称 */
+    /**
+     * 模板名称
+     */
     @ApiModelProperty("模板名称")
     @Excel(name = "模板名称")
     private String tplName;
 
-    /** 模板编码 */
+    /**
+     * 模板编码
+     */
     @ApiModelProperty("模板编码")
     @Excel(name = "模板编码")
     private String tplCode;
+    @ApiModelProperty("指标数量")
+    private Integer num;
 
-    public void setTplId(Long tplId)
-    {
-        this.tplId = tplId;
-    }
-
-    public Long getTplId()
-    {
-        return tplId;
-    }
-    public void setTplName(String tplName)
-    {
-        this.tplName = tplName;
-    }
-
-    public String getTplName()
-    {
-        return tplName;
-    }
-    public void setTplCode(String tplCode)
-    {
-        this.tplCode = tplCode;
-    }
-
-    public String getTplCode()
-    {
-        return tplCode;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("tplId", getTplId())
-            .append("tplName", getTplName())
-            .append("tplCode", getTplCode())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

jjt-biz/src/main/java/com/jjt/biz/domain/MetricsTplDetail.java

@@ -13,7 +13,7 @@ import lombok.Data;
  * @author jjt
  * @date 2024-08-08
  */
-@ApiModel(value = "MetricsTplDetail" , description = "模板指标明细")
+@ApiModel(value = "MetricsTplDetail", description = "模板指标明细")
 @Data
 public class MetricsTplDetail extends BaseEntity {
     private static final long serialVersionUID = 1L;
@@ -46,12 +46,12 @@ public class MetricsTplDetail extends BaseEntity {
     @Excel(name = "指标编码")
     private String metricsCode;
 
-    /**
-     * 告警规则
-     */
-    @ApiModelProperty("告警规则")
-    @Excel(name = "告警规则")
-    private String alarmRule;
+    @ApiModelProperty("告警-低")
+    private String alarmLow;
+    @ApiModelProperty("告警-中")
+    private String alarmMid;
+    @ApiModelProperty("告警-高")
+    private String alarmHigh;
 
     @ApiModelProperty("指标定义")
     private MetricsDef metricsDef;

jjt-biz/src/main/java/com/jjt/biz/service/impl/BizObjMetricsServiceImpl.java

@@ -175,7 +175,10 @@ public class BizObjMetricsServiceImpl implements IBizObjMetricsService {
                     ms.setMetricsId(d.getMetricsId());
                     ms.setMetricsName(pp.getPpType() + "/" + d.getMetricsDef().getMetricsName() + "/" + pp.getPpAddr());
                     ms.setMetricsCode(pp.getPpName() + "/" + d.getMetricsCode());
-                    ms.setAlarmRule(d.getAlarmRule());
+                    ms.setAlarmLow(d.getAlarmLow());
+                    ms.setAlarmMid(d.getAlarmMid());
+                    ms.setAlarmHigh(d.getAlarmHigh());
+//                    ms.setAlarmRule(d.getAlarmRule());
                     objMetrics.add(ms);
                 }
             } else {
@@ -185,7 +188,9 @@ public class BizObjMetricsServiceImpl implements IBizObjMetricsService {
                 ms.setMetricsId(d.getMetricsId());
                 ms.setMetricsName(d.getMetricsDef().getMetricsName() + "/" + obj.getObjAddr() + ":" + obj.getObjPort());
                 ms.setMetricsCode(d.getMetricsCode());
-                ms.setAlarmRule(d.getAlarmRule());
+                  ms.setAlarmLow(d.getAlarmLow());
+                ms.setAlarmMid(d.getAlarmMid());
+                ms.setAlarmHigh(d.getAlarmHigh());
                 objMetrics.add(ms);
             }
         });
@@ -208,10 +213,14 @@ public class BizObjMetricsServiceImpl implements IBizObjMetricsService {
         if (list.size() > 0) {
             //如果有则更新，没有则插入
             UpdateWrapper<BizObjMetrics> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.set("alarm_rule" , detail.getAlarmRule());
+            updateWrapper.set("alarm_low" , detail.getAlarmLow());
+            updateWrapper.set("alarm_mid" , detail.getAlarmMid());
+            updateWrapper.set("alarm_high" , detail.getAlarmHigh());
             bizObjMetricsMapper.update(om, updateWrapper);
         } else {
-            om.setAlarmRule(detail.getAlarmRule());
+            om.setAlarmLow(detail.getAlarmLow());
+            om.setAlarmMid(detail.getAlarmMid());
+            om.setAlarmHigh(detail.getAlarmHigh());
             insertBizObjMetrics(om);
         }
 

jjt-biz/src/main/resources/mapper/metrics/MetricsDefMapper.xml

@@ -10,6 +10,9 @@
         <result property="metricsCode" column="METRICS_CODE"/>
         <result property="metricsExp" column="METRICS_EXP"/>
         <result property="metricsType" column="METRICS_TYPE"/>
+        <result property="alarmLow" column="ALARM_LOW"/>
+        <result property="alarmMid" column="ALARM_MID"/>
+        <result property="alarmHigh" column="ALARM_HIGH"/>
         <result property="createBy" column="CREATE_BY"/>
         <result property="createTime" column="CREATE_TIME"/>
         <result property="updateBy" column="UPDATE_BY"/>
@@ -23,6 +26,9 @@
                METRICS_CODE,
                METRICS_EXP,
                METRICS_TYPE,
+               ALARM_LOW,
+               ALARM_MID,
+               ALARM_HIGH,
                CREATE_BY,
                CREATE_TIME,
                UPDATE_BY,
@@ -79,6 +85,12 @@
             </if>
             <if test="metricsType != null">METRICS_TYPE,
             </if>
+            <if test="alarmLow != null">ALARM_LOW,
+            </if>
+            <if test="alarmMid != null">ALARM_MID,
+            </if>
+            <if test="alarmHigh != null">ALARM_HIGH,
+            </if>
             <if test="createBy != null">CREATE_BY,
             </if>
             <if test="createTime != null">CREATE_TIME,
@@ -99,6 +111,12 @@
             </if>
             <if test="metricsType != null">#{metricsType},
             </if>
+            <if test="alarmLow != null">#{alarmLow},
+            </if>
+            <if test="alarmMid != null">#{alarmMid},
+            </if>
+            <if test="alarmHigh != null">#{alarmHigh},
+            </if>
             <if test="createBy != null">#{createBy},
             </if>
             <if test="createTime != null">#{createTime},
@@ -127,6 +145,15 @@
             <if test="metricsType != null">METRICS_TYPE =
                 #{metricsType},
             </if>
+            <if test="alarmLow != null">ALARM_LOW =
+                #{alarmLow},
+            </if>
+            <if test="alarmMid != null">ALARM_MID =
+                #{alarmMid},
+            </if>
+            <if test="alarmHigh != null">ALARM_HIGH =
+                #{alarmHigh},
+            </if>
             <if test="createBy != null">CREATE_BY =
                 #{createBy},
             </if>

jjt-biz/src/main/resources/mapper/metrics/MetricsTplDetailMapper.xml

@@ -9,7 +9,9 @@
         <result property="tplId" column="TPL_ID"/>
         <result property="metricsId" column="METRICS_ID"/>
         <result property="metricsCode" column="METRICS_CODE"/>
-        <result property="alarmRule" column="ALARM_RULE"/>
+        <result property="alarmLow" column="ALARM_LOW"/>
+        <result property="alarmMid" column="ALARM_MID"/>
+        <result property="alarmHigh" column="ALARM_HIGH"/>
         <result property="createBy" column="CREATE_BY"/>
         <result property="createTime" column="CREATE_TIME"/>
         <result property="updateBy" column="UPDATE_BY"/>
@@ -21,6 +23,9 @@
             <result property="metricsCode" column="METRICS_CODE_b"/>
             <result property="metricsExp" column="METRICS_EXP"/>
             <result property="metricsType" column="METRICS_TYPE"/>
+            <result property="alarmLow" column="ALARM_LOW_b"/>
+            <result property="alarmMid" column="ALARM_MID_b"/>
+            <result property="alarmHigh" column="ALARM_HIGH_b"/>
         </association>
     </resultMap>
 
@@ -30,7 +35,9 @@
                      a.TPL_ID,
                      a.METRICS_ID,
                      a.METRICS_CODE,
-                     a.ALARM_RULE,
+                     a.ALARM_LOW,
+                     a.ALARM_MID,
+                     a.ALARM_HIGH,
                      a.CREATE_BY,
                      a.CREATE_TIME,
                      a.UPDATE_BY,
@@ -40,7 +47,10 @@
                      b.METRICS_NAME,
                      b.METRICS_CODE as METRICS_CODE_b,
                      b.METRICS_EXP,
-                     b.METRICS_TYPE
+                     b.METRICS_TYPE,
+                     b.ALARM_LOW    as ALARM_LOW_b,
+                     b.ALARM_MID    as ALARM_MID_b,
+                     b.ALARM_HIGH   as ALARM_HIGH_b
               from metrics_tpl_detail a,
                    metrics_def b
               where a.METRICS_ID = b.METRICS_ID) t
@@ -58,9 +68,6 @@
             <if test="metricsCode != null  and metricsCode != ''">
                 and METRICS_CODE = #{metricsCode}
             </if>
-            <if test="alarmRule != null  and alarmRule != ''">
-                and ALARM_RULE = #{alarmRule}
-            </if>
         </where>
     </select>
 
@@ -85,7 +92,11 @@
             </if>
             <if test="metricsCode != null">METRICS_CODE,
             </if>
-            <if test="alarmRule != null">ALARM_RULE,
+            <if test="alarmLow != null">ALARM_LOW,
+            </if>
+            <if test="alarmMid != null">ALARM_MID,
+            </if>
+            <if test="alarmHigh != null">ALARM_HIGH,
             </if>
             <if test="createBy != null">CREATE_BY,
             </if>
@@ -105,7 +116,11 @@
             </if>
             <if test="metricsCode != null">#{metricsCode},
             </if>
-            <if test="alarmRule != null">#{alarmRule},
+            <if test="alarmLow != null">#{alarmLow},
+            </if>
+            <if test="alarmMid != null">#{alarmMid},
+            </if>
+            <if test="alarmHigh != null">#{alarmHigh},
             </if>
             <if test="createBy != null">#{createBy},
             </if>
@@ -120,8 +135,9 @@
         </trim>
     </insert>
     <insert id="insertMetricsTplDetails">
-        insert into metrics_tpl_detail(TPL_ID,METRICS_ID,METRICS_CODE) select #{tplId}, METRICS_ID,
-        METRICS_CODE from metrics_def where METRICS_ID in
+        insert into metrics_tpl_detail(TPL_ID,METRICS_ID,METRICS_CODE,ALARM_LOW,ALARM_MID,ALARM_HIGH) select #{tplId},
+        METRICS_ID,
+        METRICS_CODE,ALARM_LOW,ALARM_MID,ALARM_HIGH from metrics_def where METRICS_ID in
         <foreach item="id" collection="metricsIds" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -139,8 +155,14 @@
             <if test="metricsCode != null">METRICS_CODE =
                 #{metricsCode},
             </if>
-            <if test="alarmRule != null">ALARM_RULE =
-                #{alarmRule},
+            <if test="alarmLow != null">ALARM_LOW =
+                #{alarmLow},
+            </if>
+            <if test="alarmMid != null">ALARM_MID =
+                #{alarmMid},
+            </if>
+            <if test="alarmHigh != null">ALARM_HIGH =
+                #{alarmHigh},
             </if>
             <if test="createBy != null">CREATE_BY =
                 #{createBy},

jjt-biz/src/main/resources/mapper/metrics/MetricsTplMapper.xml

@@ -5,110 +5,120 @@
 <mapper namespace="com.jjt.biz.mapper.MetricsTplMapper">
 
     <resultMap type="MetricsTpl" id="MetricsTplResult">
-            <result property="tplId" column="TPL_ID"/>
-            <result property="tplName" column="TPL_NAME"/>
-            <result property="tplCode" column="TPL_CODE"/>
-            <result property="createBy" column="CREATE_BY"/>
-            <result property="createTime" column="CREATE_TIME"/>
-            <result property="updateBy" column="UPDATE_BY"/>
-            <result property="updateTime" column="UPDATE_TIME"/>
-            <result property="remark" column="REMARK"/>
+        <result property="tplId" column="TPL_ID"/>
+        <result property="tplName" column="TPL_NAME"/>
+        <result property="tplCode" column="TPL_CODE"/>
+        <result property="num" column="NUM"/>
+        <result property="createBy" column="CREATE_BY"/>
+        <result property="createTime" column="CREATE_TIME"/>
+        <result property="updateBy" column="UPDATE_BY"/>
+        <result property="updateTime" column="UPDATE_TIME"/>
+        <result property="remark" column="REMARK"/>
     </resultMap>
 
     <sql id="selectMetricsTplVo">
-        select TPL_ID, TPL_NAME, TPL_CODE, CREATE_BY, CREATE_TIME, UPDATE_BY, UPDATE_TIME, REMARK
-        from metrics_tpl
+        select TPL_ID,
+               TPL_NAME,
+               TPL_CODE,
+               (select count(*) from METRICS_TPL_DETAIL where tpl_id = a.tpl_id) num,
+               CREATE_BY,
+               CREATE_TIME,
+               UPDATE_BY,
+               UPDATE_TIME,
+               REMARK
+        from metrics_tpl a
     </sql>
 
     <select id="selectMetricsTplList" parameterType="MetricsTpl" resultMap="MetricsTplResult">
         <include refid="selectMetricsTplVo"/>
         <where>
-                        <if test="tplName != null  and tplName != ''">
-                            and TPL_NAME like concat('%', #{tplName}, '%')
-                        </if>
-                        <if test="tplCode != null  and tplCode != ''">
-                            and TPL_CODE = #{tplCode}
-                        </if>
-                        <if test="remark != null  and remark != ''">
-                            and REMARK = #{remark}
-                        </if>
+            <if test="tplName != null  and tplName != ''">
+                and TPL_NAME like concat('%', #{tplName}, '%')
+            </if>
+            <if test="tplCode != null  and tplCode != ''">
+                and TPL_CODE = #{tplCode}
+            </if>
+            <if test="remark != null  and remark != ''">
+                and REMARK = #{remark}
+            </if>
         </where>
     </select>
 
     <select id="selectMetricsTplByTplId" parameterType="Long"
             resultMap="MetricsTplResult">
-            <include refid="selectMetricsTplVo"/>
-            where TPL_ID = #{tplId}
+        <include refid="selectMetricsTplVo"/>
+        where TPL_ID = #{tplId}
     </select>
 
     <insert id="insertMetricsTpl" parameterType="MetricsTpl" useGeneratedKeys="true"
             keyProperty="tplId">
         insert into metrics_tpl
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="tplName != null">TPL_NAME,
-                    </if>
-                    <if test="tplCode != null">TPL_CODE,
-                    </if>
-                    <if test="createBy != null">CREATE_BY,
-                    </if>
-                    <if test="createTime != null">CREATE_TIME,
-                    </if>
-                    <if test="updateBy != null">UPDATE_BY,
-                    </if>
-                    <if test="updateTime != null">UPDATE_TIME,
-                    </if>
-                    <if test="remark != null">REMARK,
-                    </if>
+            <if test="tplName != null">TPL_NAME,
+            </if>
+            <if test="tplCode != null">TPL_CODE,
+            </if>
+            <if test="createBy != null">CREATE_BY,
+            </if>
+            <if test="createTime != null">CREATE_TIME,
+            </if>
+            <if test="updateBy != null">UPDATE_BY,
+            </if>
+            <if test="updateTime != null">UPDATE_TIME,
+            </if>
+            <if test="remark != null">REMARK,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="tplName != null">#{tplName},
-                    </if>
-                    <if test="tplCode != null">#{tplCode},
-                    </if>
-                    <if test="createBy != null">#{createBy},
-                    </if>
-                    <if test="createTime != null">#{createTime},
-                    </if>
-                    <if test="updateBy != null">#{updateBy},
-                    </if>
-                    <if test="updateTime != null">#{updateTime},
-                    </if>
-                    <if test="remark != null">#{remark},
-                    </if>
+            <if test="tplName != null">#{tplName},
+            </if>
+            <if test="tplCode != null">#{tplCode},
+            </if>
+            <if test="createBy != null">#{createBy},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+            <if test="remark != null">#{remark},
+            </if>
         </trim>
     </insert>
 
     <update id="updateMetricsTpl" parameterType="MetricsTpl">
         update metrics_tpl
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="tplName != null">TPL_NAME =
-                        #{tplName},
-                    </if>
-                    <if test="tplCode != null">TPL_CODE =
-                        #{tplCode},
-                    </if>
-                    <if test="createBy != null">CREATE_BY =
-                        #{createBy},
-                    </if>
-                    <if test="createTime != null">CREATE_TIME =
-                        #{createTime},
-                    </if>
-                    <if test="updateBy != null">UPDATE_BY =
-                        #{updateBy},
-                    </if>
-                    <if test="updateTime != null">UPDATE_TIME =
-                        #{updateTime},
-                    </if>
-                    <if test="remark != null">REMARK =
-                        #{remark},
-                    </if>
+            <if test="tplName != null">TPL_NAME =
+                #{tplName},
+            </if>
+            <if test="tplCode != null">TPL_CODE =
+                #{tplCode},
+            </if>
+            <if test="createBy != null">CREATE_BY =
+                #{createBy},
+            </if>
+            <if test="createTime != null">CREATE_TIME =
+                #{createTime},
+            </if>
+            <if test="updateBy != null">UPDATE_BY =
+                #{updateBy},
+            </if>
+            <if test="updateTime != null">UPDATE_TIME =
+                #{updateTime},
+            </if>
+            <if test="remark != null">REMARK =
+                #{remark},
+            </if>
         </trim>
         where TPL_ID = #{tplId}
     </update>
 
     <delete id="deleteMetricsTplByTplId" parameterType="Long">
         delete
-        from metrics_tpl where TPL_ID = #{tplId}
+        from metrics_tpl
+        where TPL_ID = #{tplId}
     </delete>
 
     <delete id="deleteMetricsTplByTplIds" parameterType="String">

jjt-biz/src/main/resources/mapper/obj/BizObjMetricsMapper.xml

@@ -11,7 +11,9 @@
         <result property="metricsId" column="METRICS_ID"/>
         <result property="metricsName" column="METRICS_NAME"/>
         <result property="metricsCode" column="METRICS_CODE"/>
-        <result property="alarmRule" column="ALARM_RULE"/>
+        <result property="alarmLow" column="ALARM_LOW"/>
+        <result property="alarmMid" column="ALARM_MID"/>
+        <result property="alarmHigh" column="ALARM_HIGH"/>
         <result property="createBy" column="CREATE_BY"/>
         <result property="createTime" column="CREATE_TIME"/>
         <result property="updateBy" column="UPDATE_BY"/>
@@ -23,6 +25,9 @@
             <result property="metricsCode" column="METRICS_CODE_b"/>
             <result property="metricsExp" column="METRICS_EXP"/>
             <result property="metricsType" column="METRICS_TYPE"/>
+            <result property="alarmLow" column="ALARM_LOW_b"/>
+            <result property="alarmMid" column="ALARM_MID_b"/>
+            <result property="alarmHigh" column="ALARM_HIGH_b"/>
         </association>
     </resultMap>
 
@@ -33,7 +38,9 @@
                      a.TPL_ID,
                      a.METRICS_ID,
                      a.METRICS_CODE,
-                     a.ALARM_RULE,
+                     a.ALARM_LOW,
+                     a.ALARM_MID,
+                     a.ALARM_HIGH,
                      a.CREATE_BY,
                      a.CREATE_TIME,
                      a.UPDATE_BY,
@@ -42,7 +49,10 @@
                      b.METRICS_ID   as METRICS_ID_b,
                      b.METRICS_CODE as METRICS_CODE_b,
                      b.METRICS_EXP,
-                     b.METRICS_TYPE
+                     b.METRICS_TYPE,
+                     b.ALARM_LOW    as ALARM_LOW_b,
+                     b.ALARM_MID    as ALARM_MID_b,
+                     b.ALARM_HIGH   as ALARM_HIGH_b
               from biz_obj_metrics a,
                    metrics_def b
               where a.METRICS_ID = b.METRICS_ID) t
@@ -66,9 +76,6 @@
             <if test="metricsCode != null  and metricsCode != ''">
                 and METRICS_CODE = #{metricsCode}
             </if>
-            <if test="alarmRule != null  and alarmRule != ''">
-                and ALARM_RULE = #{alarmRule}
-            </if>
             <if test="createBy != null  and createBy != ''">
                 and CREATE_BY = #{createBy}
             </if>
@@ -118,7 +125,11 @@
             </if>
             <if test="metricsCode != null">METRICS_CODE,
             </if>
-            <if test="alarmRule != null">ALARM_RULE,
+            <if test="alarmLow != null">ALARM_LOW,
+            </if>
+            <if test="alarmMid != null">ALARM_MID,
+            </if>
+            <if test="alarmHigh != null">ALARM_HIGH,
             </if>
             <if test="createBy != null">CREATE_BY,
             </if>
@@ -142,7 +153,11 @@
             </if>
             <if test="metricsCode != null">#{metricsCode},
             </if>
-            <if test="alarmRule != null">#{alarmRule},
+            <if test="alarmLow != null">#{alarmLow},
+            </if>
+            <if test="alarmMid != null">#{alarmMid},
+            </if>
+            <if test="alarmHigh != null">#{alarmHigh},
             </if>
             <if test="createBy != null">#{createBy},
             </if>
@@ -169,7 +184,11 @@
             </if>
             <if test="metricsCode != null">METRICS_CODE,
             </if>
-            <if test="alarmRule != null">ALARM_RULE,
+            <if test="alarmLow != null">ALARM_LOW,
+            </if>
+            <if test="alarmMid != null">ALARM_MID,
+            </if>
+            <if test="alarmHigh != null">ALARM_HIGH,
             </if>
         </trim>
         values
@@ -185,7 +204,11 @@
                 </if>
                 <if test="item.metricsCode != null">#{item.metricsCode},
                 </if>
-                <if test="item.alarmRule != null">#{item.alarmRule},
+                <if test="alarmLow != null">#{alarmLow},
+                </if>
+                <if test="alarmMid != null">#{alarmMid},
+                </if>
+                <if test="alarmHigh != null">#{alarmHigh},
                 </if>
             </trim>
         </foreach>
@@ -209,8 +232,14 @@
             <if test="metricsCode != null">METRICS_CODE =
                 #{metricsCode},
             </if>
-            <if test="alarmRule != null">ALARM_RULE =
-                #{alarmRule},
+            <if test="alarmLow != null">ALARM_LOW =
+                #{alarmLow},
+            </if>
+            <if test="alarmMid != null">ALARM_MID =
+                #{alarmMid},
+            </if>
+            <if test="alarmHigh != null">ALARM_HIGH =
+                #{alarmHigh},
             </if>
             <if test="createBy != null">CREATE_BY =
                 #{createBy},