Просмотр исходного кода

解决链路分析指标重复问题

wukai 7 месяцев назад
Родитель
Сommit
c6ba6e565f

+ 1 - 1
jjt-biz/src/main/java/com/jjt/biz/controller/AlarmRecordController.java

@@ -162,7 +162,7 @@ public class AlarmRecordController extends BaseController {
                 "    SELECT bom.obj_metrics_id, bom.obj_id,md.metrics_code" +
                 "    FROM biz_obj_metrics bom" +
                 "    JOIN metrics_def md ON bom.metrics_id = md.metrics_id" +
-                "    WHERE md.metrics_code = 'pp.error' OR md.metrics_code='pp.tot'" +
+                "    WHERE bom.metrics_name LIKE 'SPRING_BOOT/%' AND (md.metrics_code = 'pp.error' OR md.metrics_code='pp.tot')" +
                 ") subq ON bmd.obj_metrics_id = subq.obj_metrics_id" +
                 " JOIN biz_model_detail bmdetail ON subq.obj_id = bmdetail.obj_id" +
                 " WHERE bmd.CREATE_TIME BETWEEN ? AND ?" +

+ 1 - 0
jjt-biz/src/main/java/com/jjt/biz/controller/BizObjController.java

@@ -197,6 +197,7 @@ public class BizObjController extends BaseController {
     @Log(title = "业务对象", businessType = BusinessType.DELETE)
     @GetMapping("/del/{objIds}")
     public AjaxResult remove(@PathVariable Long[] objIds) {
+
         return toAjax(bizObjService.deleteBizObjByObjIds(objIds));
     }
 }

+ 1 - 1
jjt-biz/src/main/java/com/jjt/biz/controller/IndexController.java

@@ -273,7 +273,7 @@ public class IndexController extends BaseController {
                 "    SELECT bom.obj_metrics_id, bom.obj_id,md.metrics_code" +
                 "    FROM biz_obj_metrics bom" +
                 "    JOIN metrics_def md ON bom.metrics_id = md.metrics_id" +
-                "    WHERE md.metrics_code = 'pp.error' OR md.metrics_code='pp.tot'" +
+                "    WHERE bom.metrics_name LIKE 'SPRING_BOOT/%' AND (md.metrics_code = 'pp.error' OR md.metrics_code='pp.tot')" +
                 ") subq ON bmd.obj_metrics_id = subq.obj_metrics_id" +
                 " JOIN biz_model_detail bmdetail ON subq.obj_id = bmdetail.obj_id" +
                 " WHERE bmd.CREATE_TIME BETWEEN ? AND ?" +

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

@@ -6,6 +6,7 @@ import com.jjt.biz.mapper.BizObjMapper;
 import com.jjt.biz.service.IBizObjService;
 import com.jjt.biz.service.IBizObjTplService;
 import com.jjt.common.utils.DateUtils;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -23,6 +24,8 @@ public class BizObjServiceImpl implements IBizObjService {
     private BizObjMapper bizObjMapper;
     @Resource
     private IBizObjTplService objTplService;
+    @Resource
+    private JdbcTemplate jdbcTemplate;
 
     /**
      * 查询业务对象
@@ -88,7 +91,33 @@ public class BizObjServiceImpl implements IBizObjService {
      */
     @Override
     public int deleteBizObjByObjIds(Long[] objIds) {
-        return bizObjMapper.deleteBizObjByObjIds(objIds);
+        int i = 0;
+        for (Long objId : objIds) {
+            try {
+                // 开始事务
+                jdbcTemplate.execute("BEGIN");
+
+                // 执行删除语句
+                //1.删除指标数据
+                jdbcTemplate.update("DELETE FROM biz_obj_metrics_data WHERE obj_metrics_id IN(SELECT obj_metrics_id FROM biz_obj_metrics WHERE obj_id=?)", objId);
+                //2.删除指标
+                jdbcTemplate.update("DELETE FROM biz_obj_metrics WHERE obj_id=?", objId);
+                //3.删除模板
+                jdbcTemplate.update("DELETE FROM biz_obj_tpl WHERE obj_id=?", objId);
+                //3.删除对象
+                jdbcTemplate.update("DELETE FROM biz_obj WHERE obj_id=?", objId);
+
+                // 提交事务
+                jdbcTemplate.execute("COMMIT");
+                i = 1;
+            } catch (Exception e) {
+                e.printStackTrace();
+                // 回滚事务
+                jdbcTemplate.execute("ROLLBACK");
+                i = 0;
+            }
+        }
+        return i;
     }
 
     /**

+ 3 - 3
jjt-biz/src/main/java/com/jjt/biz/service/impl/BizObjTplServiceImpl.java

@@ -118,7 +118,7 @@ public class BizObjTplServiceImpl implements IBizObjTplService {
     @Override
     public List<BizObjTpl> selectTplList4objId(Long objId) {
         BizObjTpl objTpl = new BizObjTpl();
-        objTpl.setObjTplId(objId);
+        objTpl.setObjId(objId);
         return selectBizObjTplList(objTpl);
     }
 
@@ -181,11 +181,11 @@ public class BizObjTplServiceImpl implements IBizObjTplService {
 
             // 提交事务
             jdbcTemplate.execute("COMMIT");
-            return 0;
+            return 1;
         } catch (Exception e) {
             // 回滚事务
             jdbcTemplate.execute("ROLLBACK");
-            return 1;
+            return 0;
         }
     }
 }