ソースを参照

解决业务对象添加模板时,多添加指标的BUG./

wukai 11 ヶ月 前
コミット
7d41ab2a3b

+ 2 - 2
jjt-biz/src/main/java/com/jjt/biz/controller/BizObjDataController.java

@@ -65,12 +65,12 @@ public class BizObjDataController extends BaseController {
         //根据部门对用户列表进行分组
         Map<String, List<BizObjMetrics>> userMap = metricsList.stream().collect(Collectors.groupingBy(obj -> obj.getMetricsDef().getMetricsType()));
         for (String s : userMap.keySet()) {
-            if (!existsMap.containsKey(s)) {
+            //pinpoint不需要
+            if (!existsMap.containsKey(s) && !"1".equals(s)) {
                 BizObjData temp = new BizObjData();
                 temp.setObjId(objId);
                 temp.setMetricsType(s);
                 bizObjDataService.insertBizObjData(temp);
-
             }
         }
         startPage();

+ 8 - 2
jjt-biz/src/main/java/com/jjt/biz/service/IBizObjMetricsService.java

@@ -117,9 +117,15 @@ public interface IBizObjMetricsService {
     void del(MetricsTplDetail detail);
 
     /**
-     * 根据objId获取指标值
+     * 根据objId获取pinpoint指标值
      *
      * @param objId 对象ID
      */
-    void getMetricsValue(Long objId);
+    void pinpointMetricsValue(Long objId);
+    /**
+     * 根据objId获取prometheus指标值
+     *
+     * @param objId 对象ID
+     */
+    void prometheusMetricsValue(Long objId);
 }

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

@@ -178,6 +178,7 @@ public class BizObjMetricsServiceImpl implements IBizObjMetricsService {
     public void insertBatch(Long objId, Long tplId) {
         BizObj obj = objService.selectBizObjByObjId(objId);
         MetricsTplDetail query = new MetricsTplDetail();
+        query.setTplId(tplId);
         List<MetricsTplDetail> list = detailService.selectMetricsTplDetailList(query);
         List<BizObjMetrics> objMetrics = new ArrayList<>();
         list.forEach(d -> {
@@ -264,7 +265,7 @@ public class BizObjMetricsServiceImpl implements IBizObjMetricsService {
      * @param objId 对象ID
      */
     @Override
-    public void getMetricsValue(Long objId) {
+    public void pinpointMetricsValue(Long objId) {
         BizObj bizObj = objService.selectBizObjByObjId(objId);
 
         if ("1".equals(bizObj.getObjType())) {
@@ -310,6 +311,16 @@ public class BizObjMetricsServiceImpl implements IBizObjMetricsService {
     }
 
     /**
+     * 根据objId获取prometheus指标值
+     *
+     * @param objId 对象ID
+     */
+    @Override
+    public void prometheusMetricsValue(Long objId) {
+
+    }
+
+    /**
      * 更新BIZ_OBJ_PP
      *
      * @param objId          对象ID

+ 2 - 1
jjt-biz/src/main/java/com/jjt/task/AlarmTask.java

@@ -17,7 +17,8 @@ public class AlarmTask {
     private IBizObjMetricsService metricsService;
 
     public void metrics() {
-        metricsService.getMetricsValue(2L);
+        metricsService.pinpointMetricsValue(2L);
+        metricsService.prometheusMetricsValue(15L);
     }
 
     public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {