liukx 4 лет назад
Родитель
Сommit
a357037588

+ 18 - 18
jay-monitor-data-server/src/main/java/com/jay/monitor/data/server/models/request/trace/SQLRequest.java

@@ -54,12 +54,12 @@ public class SQLRequest extends PageRequest {
     /**
      * 应用监控组
      */
-    private String dataGroupName;
+    private String groupName;
 
     /**
      * 应用监控key
      */
-    private String dataGroupKey;
+    private String groupKey;
 
     /**
      * 数据编号
@@ -188,22 +188,6 @@ public class SQLRequest extends PageRequest {
         this.ip = ip;
     }
 
-    public String getDataGroupName() {
-        return dataGroupName;
-    }
-
-    public void setDataGroupName(String dataGroupName) {
-        this.dataGroupName = dataGroupName;
-    }
-
-    public String getDataGroupKey() {
-        return dataGroupKey;
-    }
-
-    public void setDataGroupKey(String dataGroupKey) {
-        this.dataGroupKey = dataGroupKey;
-    }
-
     public String getDataId() {
         return dataId;
     }
@@ -251,4 +235,20 @@ public class SQLRequest extends PageRequest {
     public void setCreatedTime(Date createdTime) {
         this.createdTime = createdTime;
     }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public String getGroupKey() {
+        return groupKey;
+    }
+
+    public void setGroupKey(String groupKey) {
+        this.groupKey = groupKey;
+    }
 }

+ 18 - 20
jay-monitor-data-server/src/main/java/com/jay/monitor/data/server/models/request/trace/URLRequest.java

@@ -47,12 +47,12 @@ public class URLRequest extends PageRequest {
     /**
      * 应用监控组
      */
-    private String dataGroupName;
+    private String groupName;
 
     /**
      * 应用监控key
      */
-    private String dataGroupKey;
+    private String groupKey;
 
     /**
      * 数据编号
@@ -142,22 +142,6 @@ public class URLRequest extends PageRequest {
         this.clientIp = clientIp;
     }
 
-    public String getDataGroupName() {
-        return dataGroupName;
-    }
-
-    public void setDataGroupName(String dataGroupName) {
-        this.dataGroupName = dataGroupName;
-    }
-
-    public String getDataGroupKey() {
-        return dataGroupKey;
-    }
-
-    public void setDataGroupKey(String dataGroupKey) {
-        this.dataGroupKey = dataGroupKey;
-    }
-
     public String getDataId() {
         return dataId;
     }
@@ -198,7 +182,21 @@ public class URLRequest extends PageRequest {
         this.createdTime = createdTime;
     }
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
+    public String getGroupName() {
+        return groupName;
     }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public String getGroupKey() {
+        return groupKey;
+    }
+
+    public void setGroupKey(String groupKey) {
+        this.groupKey = groupKey;
+    }
+
+
 }

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

@@ -72,7 +72,7 @@
                 <div class="layui-inline">
                     <label class="layui-form-label">索引组</label>
                     <div class="layui-input-block">
-                        <input code="text" class="layui-input" name="groupKeyNameName" id="data_group_name" value="">
+                        <input code="text" class="layui-input" name="groupName" id="data_group_name" value="">
                     </div>
                 </div>
                 <div class="layui-inline">

+ 2 - 2
jay-monitor-data-server/src/main/resources/templates/trace/urlList.html

@@ -54,13 +54,13 @@
                 <div class="layui-inline">
                     <label class="layui-form-label">集团编号</label>
                     <div class="layui-input-block">
-                        <input code="text" class="layui-input" name="dataGroupName" id="data_group_name" value="">
+                        <input code="text" class="layui-input" name="groupName" id="data_group_name" value="">
                     </div>
                 </div>
                 <div class="layui-inline">
                     <label class="layui-form-label">手机号</label>
                     <div class="layui-input-block">
-                        <input code="text" class="layui-input" name="dataGroupKey" id="data_group_key" value="">
+                        <input code="text" class="layui-input" name="groupKey" id="data_group_key" value="">
                     </div>
                 </div>
                 <div class="layui-inline">