1、添加 ntc 流量统计

2、修改监测设置修改页面 进程监测 pid文件,进程搜索关键字的非空校验
3、修改i18n 专用设备 为 串联设备
4、增加代理类,解决前端ajax 跨域问题,之后可能会用
This commit is contained in:
fangshunjian
2019-01-12 11:07:45 +06:00
parent fb0627eb59
commit b3df3047b5
11 changed files with 380 additions and 26 deletions

View File

@@ -190,6 +190,8 @@ public class NodeManageAction extends BaseAction {
if (nodeGroupId != null) {// 指定组ID查找相应的节点
hql += " and groupId =" + nodeGroupId + "";
NodegroupTable nodegroupTable = (NodegroupTable) this.commonService.get(NodegroupTable.class, nodeGroupId);
this.getRequest().setAttribute("nodegroupTable", nodegroupTable);
}
hql += " order by nodeState asc,nodeCreatetime desc";
sqlCondition += " order by node_state asc,Node_createtime desc";
@@ -199,7 +201,7 @@ public class NodeManageAction extends BaseAction {
page = this.commonService.findByPage(hql, pageNo, pageSize);
nodeList = (List<NodeTable>) page.getResult();
for (NodeTable node : nodeList) {
List syslist = this.commonService
.find("from SystemTable where systemId = "