模板指标配置查询功能

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

@@ -37,9 +37,9 @@ public class MetricsTplDetailController extends BaseController {
 
     @ApiOperation("选择指标")
     @GetMapping("/select/{tplId}")
-    public TableDataInfo select(@ApiParam(value = "模板ID", required = true) @PathVariable("tplId") Long tplId) {
+    public TableDataInfo select(@ApiParam(value = "模板ID", required = true) @PathVariable("tplId") Long tplId,MetricsDef def) {
         startPage();
-        List<MetricsDef> list = metricsTplDetailService.selectMetricsDefList(tplId);
+        List<MetricsDef> list = metricsTplDetailService.selectMetricsDefList(tplId,def);
         return getDataTable(list);
     }
 

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

@@ -66,9 +66,10 @@ public interface MetricsTplDetailMapper extends BaseMapper<MetricsTplDetail> {
      * 选择指标，已选择的需要排除
      *
      * @param tplId 模板ID
+     * @param def   查询参数
      * @return 列表
      */
-    List<MetricsDef> selectMetricsDefList(Long tplId);
+    List<MetricsDef> selectMetricsDefList(@Param("tplId") Long tplId, @Param("def") MetricsDef def);
 
     /**
      * 添加指标

jjt-biz/src/main/java/com/jjt/biz/service/IMetricsTplDetailService.java

@@ -64,9 +64,10 @@ public interface IMetricsTplDetailService {
      * 选择指标，已选择的需要排除
      *
      * @param tplId 模板ID
+     * @param def   查询参数
      * @return 列表
      */
-    List<MetricsDef> selectMetricsDefList(Long tplId);
+    List<MetricsDef> selectMetricsDefList(Long tplId, MetricsDef def);
 
     /**
      * 添加指标

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

@@ -11,7 +11,6 @@ import com.jjt.biz.service.*;
 import com.jjt.common.exception.ServiceException;
 import com.jjt.common.utils.DateUtils;
 import com.jjt.common.utils.StringUtils;
-import com.jjt.common.utils.bean.BeanValidators;
 import com.jjt.hl.domain.HlEvent;
 import com.jjt.hl.mapper.HlEventMapper;
 import com.jjt.hl.service.IHlEventService;
@@ -755,18 +754,22 @@ public class BizObjMetricsServiceImpl implements IBizObjMetricsService {
             List<BizObjMetrics> list = metricsMap.get(code);
             list.forEach(om -> {
                 if (om.getMetricsCode().startsWith(vo.getApplicationName() + "/")) {
-                    updateMetric(om, "pp.1s", vo.getTime1s(), date);
-                    updateMetric(om, "pp.3s", vo.getTime3s(), date);
-                    updateMetric(om, "pp.5s", vo.getTime5s(), date);
-                    updateMetric(om, "pp.100ms", vo.getTime100ms(), date);
-                    updateMetric(om, "pp.300ms", vo.getTime300ms(), date);
-                    updateMetric(om, "pp.500ms", vo.getTime500ms(), date);
-                    updateMetric(om, "pp.tot", vo.getTot(), date);
-                    updateMetric(om, "pp.sum", vo.getSum(), date);
-                    updateMetric(om, "pp.max", vo.getMax(), date);
-                    updateMetric(om, "pp.avg", vo.getAvg(), date);
-                    updateMetric(om, "pp.slow", vo.getSlow(), date);
-                    updateMetric(om, "pp.error", vo.getError(), date);
+                    if (vo.getTot() != 0) {
+                        updateMetric(om, "pp.1s", vo.getTime1s(), date);
+                        updateMetric(om, "pp.3s", vo.getTime3s(), date);
+                        updateMetric(om, "pp.5s", vo.getTime5s(), date);
+                        updateMetric(om, "pp.100ms", vo.getTime100ms(), date);
+                        updateMetric(om, "pp.300ms", vo.getTime300ms(), date);
+                        updateMetric(om, "pp.500ms", vo.getTime500ms(), date);
+                        updateMetric(om, "pp.tot", vo.getTot(), date);
+                        updateMetric(om, "pp.sum", vo.getSum(), date);
+                        updateMetric(om, "pp.max", vo.getMax(), date);
+                        updateMetric(om, "pp.avg", vo.getAvg(), date);
+                        updateMetric(om, "pp.slow", vo.getSlow(), date);
+                        updateMetric(om, "pp.error", vo.getError(), date);
+                        BigDecimal rate = BigDecimal.valueOf(vo.getTime1s()).divide(BigDecimal.valueOf(vo.getTot()), 2, RoundingMode.HALF_UP);
+                        updateMetric(om, "pp.rate", rate, date);
+                    }
                 }
             });
         }

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

@@ -96,8 +96,8 @@ public class MetricsTplDetailServiceImpl implements IMetricsTplDetailService {
      * @return 列表
      */
     @Override
-    public List<MetricsDef> selectMetricsDefList(Long tplId) {
-        return metricsTplDetailMapper.selectMetricsDefList(tplId);
+    public List<MetricsDef> selectMetricsDefList(Long tplId, MetricsDef def) {
+        return metricsTplDetailMapper.selectMetricsDefList(tplId,def);
     }
 
     /**

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

@@ -81,7 +81,12 @@
     <select id="selectMetricsDefList" resultType="com.jjt.biz.domain.MetricsDef">
         select *
         from metrics_def
-        where METRICS_ID not in (select METRICS_ID from metrics_tpl_detail where tpl_id = #{tplId})
+        <where>
+            METRICS_ID not in (select METRICS_ID from metrics_tpl_detail where tpl_id = #{tplId})
+            <if test="def.metricsName != null  and def.metricsName != ''">
+                and METRICS_NAME like concat('%', #{def.metricsName}, '%')
+            </if>
+        </where>
     </select>
 
     <insert id="insertMetricsTplDetail" parameterType="MetricsTplDetail" useGeneratedKeys="true"