|
@ -69,6 +69,7 @@ public class LogEndPoint {
|
|
|
@RequestParam(value = "spanname", required = false) String spanname,
|
|
|
@RequestParam(value = "time", required = false) Integer time, // GET POST DELETE PUT
|
|
|
@RequestParam(value = "eventname", required = false) String eventname,
|
|
|
@RequestParam(value = "method", required = false) String method,
|
|
|
@RequestParam(value = "uri", required = false) String uri
|
|
|
) {
|
|
|
if (!StringUtils.isEmpty(spanname)) {
|
|
@ -76,9 +77,9 @@ public class LogEndPoint {
|
|
|
}
|
|
|
List<LogModel> logs = new ArrayList<>();
|
|
|
StringBuffer sql = new StringBuffer("SELECT * FROM " + adminServerProperties.getDefaultIndexName());
|
|
|
StringBuffer whereSQL = initWhere(traceId, spanname, eventname, time, uri);
|
|
|
StringBuffer whereSQL = initWhere(traceId, spanname, eventname, time, uri, method);
|
|
|
|
|
|
StringBuffer groupBY = new StringBuffer("order by eventstarttime asc");
|
|
|
StringBuffer groupBY = new StringBuffer("order by eventstarttime desc");
|
|
|
|
|
|
String finalSQL = sql.append(whereSQL).append(groupBY).toString();
|
|
|
|
|
@ -139,7 +140,7 @@ public class LogEndPoint {
|
|
|
return logs;
|
|
|
}
|
|
|
|
|
|
private StringBuffer initWhere(String traceId, String spanname, String eventname, Integer time, String uri) {
|
|
|
private StringBuffer initWhere(String traceId, String spanname, String eventname, Integer time, String uri, String method) {
|
|
|
StringBuffer whereSQL = new StringBuffer();
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
if (!StringUtils.isEmpty(traceId)) {
|
|
@ -154,6 +155,9 @@ public class LogEndPoint {
|
|
|
if (!StringUtils.isEmpty(uri)) {
|
|
|
params.put("uri", uri);
|
|
|
}
|
|
|
if (!StringUtils.isEmpty(method)) {
|
|
|
params.put("method", method);
|
|
|
}
|
|
|
if (time != null && time > 0) {
|
|
|
params.put("time", time);
|
|
|
}
|