存储修改

jay-monitor-data-server/src/main/java/com/jay/monitor/data/server/store/mysql/AbstractMysqlSearchProcess.java

@@ -14,8 +14,22 @@ public abstract class AbstractMysqlSearchProcess<E, Q, R> extends TraceSearchPro
     @Autowired
     private StoreDataManager storeDataManager;
 
+    /**
+     * 构建返回结果，可以根据自定义的实体进行转换
+     *
+     * @param query
+     * @return
+     * @throws Exception
+     */
     public abstract List<R> builderResponse(List<E> query) throws Exception;
 
+    /**
+     * 构建查询参数，可以根据自定义的实体进行转换
+     *
+     * @param query
+     * @return
+     * @throws Exception
+     */
     public abstract E builderQuery(Q query) throws Exception;
 
     @Override

jay-monitor-data-server/src/main/java/com/jay/monitor/data/server/store/mysql/MysqlMQSearchProcess.java

@@ -23,6 +23,10 @@ public class MysqlMQSearchProcess extends AbstractMysqlSearchProcess<JayMonitorM
             JayMonitorMq jayMonitorMq = query.get(i);
             MQTraceResponse mqTraceResponse = new MQTraceResponse();
             BeanUtils.copyProperties(jayMonitorMq, mqTraceResponse);
+            mqTraceResponse.setCreateDate(jayMonitorMq.getCreatedTime());
+            mqTraceResponse.setIp(jayMonitorMq.getApplicationIp());
+            mqTraceResponse.setGroupKeyName(jayMonitorMq.getDataGroupKey());
+            mqTraceResponse.setGroupName(jayMonitorMq.getDataGroupName());
             responseList.add(mqTraceResponse);
         }
         return responseList;
@@ -32,6 +36,9 @@ public class MysqlMQSearchProcess extends AbstractMysqlSearchProcess<JayMonitorM
     public JayMonitorMq builderQuery(MQRequest query) throws Exception {
         JayMonitorMq jayMonitorMq = new JayMonitorMq();
         BeanUtils.copyProperties(query, jayMonitorMq);
+        jayMonitorMq.setDataGroupKey(query.getGroupKeyName());
+        jayMonitorMq.setDataGroupName(query.getGroupName());
+        jayMonitorMq.setApplicationIp(query.getApplicationIp());
         return jayMonitorMq;
     }
 

jay-monitor-data-server/src/main/java/com/jay/monitor/data/server/store/mysql/MysqlSQLSearchProcess.java

@@ -16,7 +16,12 @@ public class MysqlSQLSearchProcess extends AbstractMysqlSearchProcess<JayMonitor
         List<SQLTraceResponse> responseList = new ArrayList<>();
         for (int i = 0; i < resultList.size(); i++) {
             SQLTraceResponse sqlTraceResponse = new SQLTraceResponse();
+            JayMonitorSql jayMonitorSql = resultList.get(i);
             BeanUtils.copyProperties(resultList.get(i), sqlTraceResponse);
+            sqlTraceResponse.setCreateDate(jayMonitorSql.getCreatedTime());
+            sqlTraceResponse.setIp(jayMonitorSql.getApplicationIp());
+            sqlTraceResponse.setGroupKeyName(jayMonitorSql.getDataGroupKey());
+            sqlTraceResponse.setGroupName(jayMonitorSql.getDataGroupName());
             responseList.add(sqlTraceResponse);
         }
         return responseList;
@@ -26,6 +31,9 @@ public class MysqlSQLSearchProcess extends AbstractMysqlSearchProcess<JayMonitor
     public JayMonitorSql builderQuery(SQLRequest query) throws Exception {
         JayMonitorSql jayMonitorSql = new JayMonitorSql();
         BeanUtils.copyProperties(query, jayMonitorSql);
+        jayMonitorSql.setDataGroupKey(query.getGroupKeyName());
+        jayMonitorSql.setDataGroupName(query.getGroupName());
+        jayMonitorSql.setApplicationIp(query.getIp());
         return jayMonitorSql;
     }
 

jay-monitor-data-server/src/main/java/com/jay/monitor/data/server/store/mysql/MysqlURLSearchProcess.java

@@ -1,31 +1,39 @@
 package com.jay.monitor.data.server.store.mysql;
 
 import com.jay.monitor.data.core.enums.MsgTypeEnums;
-import com.jay.monitor.data.core.model.serializable.URLDataDTO;
 import com.jay.monitor.data.server.models.entity.JayMonitorUrl;
+import com.jay.monitor.data.server.models.request.trace.URLRequest;
 import com.jay.monitor.data.server.models.response.trace.URLTraceResponse;
 import org.springframework.beans.BeanUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class MysqlURLSearchProcess extends AbstractMysqlSearchProcess<JayMonitorUrl, URLDataDTO, URLTraceResponse> {
+public class MysqlURLSearchProcess extends AbstractMysqlSearchProcess<JayMonitorUrl, URLRequest, URLTraceResponse> {
 
     @Override
     public List<URLTraceResponse> builderResponse(List<JayMonitorUrl> resultList) throws Exception {
         List<URLTraceResponse> responseList = new ArrayList<>();
         for (int i = 0; i < resultList.size(); i++) {
             URLTraceResponse traceResponse = new URLTraceResponse();
-            BeanUtils.copyProperties(resultList.get(i), traceResponse);
+            JayMonitorUrl jayMonitorUrl = resultList.get(i);
+            BeanUtils.copyProperties(jayMonitorUrl, traceResponse);
+            traceResponse.setCreateDate(jayMonitorUrl.getCreatedTime());
+            traceResponse.setIp(jayMonitorUrl.getApplicationIp());
+            traceResponse.setGroupKeyName(jayMonitorUrl.getDataGroupKey());
+            traceResponse.setGroupName(jayMonitorUrl.getDataGroupName());
             responseList.add(traceResponse);
         }
         return responseList;
     }
 
     @Override
-    public JayMonitorUrl builderQuery(URLDataDTO query) throws Exception {
+    public JayMonitorUrl builderQuery(URLRequest query) throws Exception {
         JayMonitorUrl jayMonitorUrl = new JayMonitorUrl();
         BeanUtils.copyProperties(query, jayMonitorUrl);
+        jayMonitorUrl.setDataGroupKey(query.getGroupKeyName());
+        jayMonitorUrl.setDataGroupName(query.getGroupName());
+        jayMonitorUrl.setApplicationIp(query.getApplicationIp());
         return jayMonitorUrl;
     }
 

jay-monitor-data-server/src/main/resources/mybatis/mapper/JayMonitorSqlMapperExt.xml

@@ -62,9 +62,6 @@
             <if test="record.affectedRows != null and record.affectedRows != ''">
                 AND affected_rows = #{record.affectedRows,jdbcType=INTEGER}
             </if>
-            <if test="record.msgId != null and record.msgId != ''">
-                AND msg_id = #{record.msgId,jdbcType=VARCHAR}
-            </if>
             <if test="record.dataGroupName != null and record.dataGroupName != ''">
                 AND data_group_name = #{record.dataGroupName,jdbcType=VARCHAR}
             </if>
@@ -74,21 +71,12 @@
             <if test="record.dataId != null and record.dataId != ''">
                 AND data_id = #{record.dataId,jdbcType=VARCHAR}
             </if>
-            <if test="record.rootLogId != null and record.rootLogId != ''">
-                AND root_log_id = #{record.rootLogId,jdbcType=VARCHAR}
-            </if>
-            <if test="record.parentLogId != null and record.parentLogId != ''">
-                AND parent_log_id = #{record.parentLogId,jdbcType=VARCHAR}
-            </if>
             <if test="record.logId != null and record.logId != ''">
                 AND log_id = #{record.logId,jdbcType=VARCHAR}
             </if>
             <if test="record.status != null and record.status != ''">
                 AND `status` = #{record.status,jdbcType=INTEGER}
             </if>
-            <if test="record.sourceTime != null and record.sourceTime != ''">
-                AND source_time = #{record.sourceTime,jdbcType=TIMESTAMP}
-            </if>
             <if test="record.createdTime != null and record.createdTime != ''">
                 AND created_time = #{record.createdTime,jdbcType=TIMESTAMP}
             </if>

jay-monitor-data-server/src/main/resources/templates/trace/mqList.html

@@ -40,7 +40,7 @@
                 <div class="layui-inline">
                     <label class="layui-form-label">应用IP</label>
                     <div class="layui-input-block">
-                        <input code="text" class="layui-input" name="ip" id="q_ip" value="">
+                        <input code="text" class="layui-input" name="applicationIp" id="q_ip" value="">
                     </div>
                 </div>
                 <div class="layui-inline">

jay-monitor-data-server/src/main/resources/templates/trace/sqlList.html

@@ -40,7 +40,7 @@
                 <div class="layui-inline">
                     <label class="layui-form-label">应用IP</label>
                     <div class="layui-input-block">
-                        <input code="text" class="layui-input" name="ip" id="q_ip" value="">
+                        <input code="text" class="layui-input" name="applicationIp" id="q_ip" value="">
                     </div>
                 </div>
                 <div class="layui-inline">