提交 fdc133be 编写于 作者: Y youyong205

fix bug

......@@ -5,10 +5,8 @@ import java.util.Set;
import com.dianping.cat.consumer.storage.model.entity.Domain;
import com.dianping.cat.consumer.storage.model.entity.Operation;
import com.dianping.cat.consumer.storage.model.entity.Segment;
import com.dianping.cat.consumer.storage.model.entity.Sql;
import com.dianping.cat.consumer.storage.model.entity.StorageReport;
import com.dianping.cat.message.Transaction;
import com.site.lookup.util.StringUtils;
public class StorageReportUpdater {
......@@ -58,21 +56,21 @@ public class StorageReportUpdater {
}
}
protected void updateSqlInfo(StorageUpdateParam param, Domain d) {
String sqlName = param.getSqlName();
if (StringUtils.isNotEmpty(sqlName)) {
Sql sql = d.findOrCreateSql(sqlName);
String sqlStatement = sql.getStatement();
if (StringUtils.isEmpty(sqlStatement)) {
sqlStatement = sqlStatement.replaceAll("<", "&lt;").replaceAll(">", "&gt;");
sql.setStatement(sqlStatement);
}
sql.incCount();
}
}
// private void updateSqlInfo(StorageUpdateParam param, Domain d) {
// String sqlName = param.getSqlName();
//
// if (StringUtils.isNotEmpty(sqlName)) {
// Sql sql = d.findOrCreateSql(sqlName);
// String sqlStatement = sql.getStatement();
//
// if (StringUtils.isEmpty(sqlStatement)) {
// sqlStatement = sqlStatement.replaceAll("<", "&lt;").replaceAll(">", "&gt;");
//
// sql.setStatement(sqlStatement);
// }
// sql.incCount();
// }
// }
public static class StorageUpdateParam {
......
......@@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
......@@ -12,7 +11,6 @@ import org.unidal.lookup.ContainerLoader;
import org.unidal.web.mvc.ViewModel;
import com.dianping.cat.Cat;
import com.dianping.cat.Constants;
import com.dianping.cat.config.app.AppConfigManager;
import com.dianping.cat.configuration.app.entity.Code;
import com.dianping.cat.configuration.app.entity.Command;
......@@ -270,11 +268,7 @@ public class Model extends ViewModel<SystemPage, Action, Context> {
}
public String getDomain2CommandsJson() {
Map<String, List<Command>> results = new LinkedHashMap<String, List<Command>>();
results.put(Constants.ALL, m_appConfigManager.queryCommands());
results.putAll(m_appConfigManager.queryDomain2Commands());
return new JsonBuilder().toJson(results);
return new JsonBuilder().toJson(m_appConfigManager.queryDomain2Commands());
}
public DomainConfig getDomainConfig() {
......
......@@ -22,7 +22,7 @@
commandSelect.empty();
for(var cou in commands){
var command = commands[cou];
if(command['title'] != undefined && command['title'].length > 0){
if(command['title'] != undefined && command['title'].trim().length > 0){
commandSelect.append($("<option value='"+command['id']+"'>"+command['title']+"</option>"));
}else{
commandSelect.append($("<option value='"+command['id']+"'>"+command['name']+"</option>"));
......@@ -41,7 +41,7 @@
for(var cou in commands){
var command = commands[cou];
if(command['title'] != undefined){
if(command['title'] != undefined && command['title'].trim().length > 0){
commandSelect.append($("<option value='"+command['id']+"'>"+command['title']+"</option>"));
}else{
commandSelect.append($("<option value='"+command['id']+"'>"+command['name']+"</option>"));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册