解决添加非模板指标BUG

jjt-biz/src/main/java/com/jjt/biz/mapper/BizObjMetricsMapper.java

@@ -77,7 +77,7 @@ public interface BizObjMetricsMapper extends BaseMapper<BizObjMetrics> {
      * @param metricsIds 指标IDS
      * @return 结果
      */
-    int insertMetricsDetails(@Param("objId") Long objId, @Param("metricsIds") Long[] metricsIds);
+    int insertMetricsDetails(@Param("objId") Long objId,@Param("suffix") String suffix, @Param("metricsIds") Long[] metricsIds);
 
     /**
      * 批量插入

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

@@ -136,7 +136,9 @@ public class BizObjMetricsServiceImpl implements IBizObjMetricsService {
      */
     @Override
     public int insertMetricsDetails(Long objId, Long[] metricsIds) {
-        return bizObjMetricsMapper.insertMetricsDetails(objId, metricsIds);
+        BizObj obj = objService.selectBizObjByObjId(objId);
+        String suffix = "/" + obj.getObjAddr() + ":" + obj.getObjPort();
+        return bizObjMetricsMapper.insertMetricsDetails(objId, suffix, metricsIds);
     }
 
     /**
@@ -188,7 +190,7 @@ public class BizObjMetricsServiceImpl implements IBizObjMetricsService {
                     ms.setObjId(objId);
                     ms.setTplId(tplId);
                     ms.setMetricsId(d.getMetricsId());
-                    ms.setMetricsName(pp.getPpType() + "/" + d.getMetricsDef().getMetricsName());
+                    ms.setMetricsName(pp.getPpName() + "/" + d.getMetricsDef().getMetricsName());
                     ms.setMetricsCode(pp.getPpName() + "/" + d.getMetricsCode());
                     ms.setAlarmLow(d.getAlarmLow());
                     ms.setAlarmMid(d.getAlarmMid());

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

@@ -32,7 +32,11 @@ public class BizObjServiceImpl implements IBizObjService {
      */
     @Override
     public BizObj selectBizObjByObjId(Long objId) {
-        return bizObjMapper.selectBizObjByObjId(objId);
+        BizObj bizObj = bizObjMapper.selectBizObjByObjId(objId);
+        BizObjTpl tpl = new BizObjTpl();
+        tpl.setObjId(objId);
+        bizObj.setTplList(objTplService.selectBizObjTplList(tpl));
+        return bizObj;
     }
 
     /**

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

@@ -121,7 +121,8 @@
         where METRICS_TYPE!='1' and METRICS_ID not in (select METRICS_ID from biz_obj_metrics where OBJ_ID = #{objId})
     </select>
     <insert id="insertMetricsDetails">
-        insert into biz_obj_metrics(OBJ_ID,METRICS_ID) select #{objId}, METRICS_ID
+        insert into biz_obj_metrics(OBJ_ID,METRICS_ID,TPL_ID,METRICS_NAME,METRICS_CODE) select #{objId},
+        METRICS_ID,-1,concat(METRICS_NAME,#{suffix}),METRICS_CODE
         from metrics_def where METRICS_ID in
         <foreach item="id" collection="metricsIds" open="(" separator="," close=")">
             #{id}