增加metricsDef

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

@@ -104,4 +104,7 @@ public class BizObjMc extends BaseEntity {
     @ApiModelProperty("自动发现")
     @Excel(name = "自动发现")
     private String findFlag;
+
+    @ApiModelProperty("指标定义")
+    private MetricsDef metricsDef;
 }

jjt-biz/src/main/resources/mapper/biz/BizObjMcMapper.xml

@@ -23,28 +23,41 @@
         <result property="updateBy" column="UPDATE_BY"/>
         <result property="updateTime" column="UPDATE_TIME"/>
         <result property="remark" column="REMARK"/>
+        <association property="metricsDef" javaType="MetricsDef">
+            <result property="metricsId" column="METRICS_ID_b"/>
+            <result property="metricsName" column="METRICS_NAME_b"/>
+            <result property="metricsCode" column="METRICS_CODE_b"/>
+            <result property="metricsType" column="METRICS_TYPE"/>
+        </association>
     </resultMap>
 
     <sql id="selectBizObjMcVo">
-        select MC_ID,
-               OBJ_ID,
-               METRICS_ID,
-               METRICS_NAME,
-               METRICS_CODE,
-               ALARM_LOW,
-               ALARM_MID,
-               ALARM_HIGH,
-               EVENT,
-               DATA_EXP,
-               FIND_KEY,
-               FIND_RULE,
-               FIND_FLAG,
-               CREATE_BY,
-               CREATE_TIME,
-               UPDATE_BY,
-               UPDATE_TIME,
-               REMARK
-        from biz_obj_mc
+        select *
+        from (select a.MC_ID,
+                     a.OBJ_ID,
+                     a.METRICS_ID,
+                     a.METRICS_NAME,
+                     a.METRICS_CODE,
+                     a.ALARM_LOW,
+                     a.ALARM_MID,
+                     a.ALARM_HIGH,
+                     a.EVENT,
+                     a.DATA_EXP,
+                     a.FIND_KEY,
+                     a.FIND_RULE,
+                     a.FIND_FLAG,
+                     a.CREATE_BY,
+                     a.CREATE_TIME,
+                     a.UPDATE_BY,
+                     a.UPDATE_TIME,
+                     a.REMARK,
+                     b.METRICS_ID   as METRICS_ID_b,
+                     b.METRICS_CODE as METRICS_CODE_b,
+                     b.METRICS_NAME as METRICS_NAME_b,
+                     b.METRICS_TYPE,
+              from biz_obj_mc a,
+                   metrics_def b
+              where a.METRICS_ID = b.METRICS_ID) t
     </sql>
 
     <select id="selectBizObjMcList" parameterType="BizObjMc" resultMap="BizObjMcResult">