gfwleak/nms-nmsweb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、修改进程监测 相同节点组节点条件 可以添加多个监测配置

Browse Source
This commit is contained in:
fangshunjian
2019-01-03 15:50:20 +06:00
parent df150d4dd7
commit 6914855e4b
5 changed files with 56 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
WebRoot/i18n/globalMessages_en_US.properties
View File

@@ -7404,3 +7404,4 @@ topoManage.cancel=Cancel
topoManage.TopoNameSetting=Topo Picture Name topoManage.TopoNameSetting=Topo Picture Name
xt_mk_jbxx.604.mkmc=Advanced xt_mk_jbxx.604.mkmc=Advanced
xt_mk_jbxx.604.mkms=Advanced configuration function menu xt_mk_jbxx.604.mkms=Advanced configuration function menu
pidFile.keyword.allblank=PID file and keyword can not all blank

1
WebRoot/i18n/globalMessages_ru_RU.properties
View File

@@ -6531,3 +6531,4 @@ topoManage.cancel=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c
topoManage.TopoNameSetting=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043d\u043e\u0432\u043e\u0439 \u0442\u043e\u043f\u043e\u043b\u043e\u0433\u0438\u0438 topoManage.TopoNameSetting=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043d\u043e\u0432\u043e\u0439 \u0442\u043e\u043f\u043e\u043b\u043e\u0433\u0438\u0438
xt_mk_jbxx.604.mkmc=\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u0430\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 xt_mk_jbxx.604.mkmc=\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u0430\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430
xt_mk_jbxx.604.mkms=\u041c\u0435\u043d\u044e \u0444\u0443\u043d\u043a\u0446\u0438\u0439 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u043e\u0439 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 xt_mk_jbxx.604.mkms=\u041c\u0435\u043d\u044e \u0444\u0443\u043d\u043a\u0446\u0438\u0439 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u043e\u0439 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
pidFile.keyword.allblank=Процесс файл PID и процесс поиска ключевых слов не могут быть пустыми одновременно

1
WebRoot/i18n/globalMessages_zh_CN.properties
View File

@@ -7416,3 +7416,4 @@ topoManage.cancel=\u53d6\u6d88
topoManage.TopoNameSetting=\u62d3\u6251\u56fe\u540d\u79f0 topoManage.TopoNameSetting=\u62d3\u6251\u56fe\u540d\u79f0
xt_mk_jbxx.604.mkmc=\u9ad8\u7ea7\u914d\u7f6e xt_mk_jbxx.604.mkmc=\u9ad8\u7ea7\u914d\u7f6e
xt_mk_jbxx.604.mkms=\u9ad8\u7ea7\u914d\u7f6e\u529f\u80fd\u83dc\u5355 xt_mk_jbxx.604.mkms=\u9ad8\u7ea7\u914d\u7f6e\u529f\u80fd\u83dc\u5355
pidFile.keyword.allblank=PID文件和进程关键字不能同时为空

21
WebRoot/page/detection/addDetecSetInfo.jsp
View File

@@ -95,18 +95,23 @@
if(Number(type) > 7 && startType == 0){ // 手动启动 if(Number(type) > 7 && startType == 0){ // 手动启动
if(false ==( if(false ==(
$id("processFile","","i18n_adsi.message.processFile_n81i") $id("processFile","","i18n_adsi.message.processFile_n81i")
&& $id("processSearchCode","","i18n_adsi.message.processSearchCodeTitle_n81i") || $id("processSearchCode","","i18n_adsi.message.processSearchCodeTitle_n81i")
)){ )){
alert("i18n_pidFile.keyword.allblank_n81i");
return; return;
} }
} }
if(Number(type) > 7 && startType == 1){ // 单次启动 if(Number(type) > 7 && startType == 1){ // 单次启动
if(false ==( if(false ==(
$id("processFile","","i18n_adsi.message.processFile_n81i") $id("processFile","","i18n_adsi.message.processFile_n81i")
&& $id("processSearchCode","","i18n_adsi.message.processSearchCodeTitle_n81i") || $id("processSearchCode","","i18n_adsi.message.processSearchCodeTitle_n81i")
&& $id("processPath","","i18n_adsi.message.processPathTitle_n81i")
)){ )){
alert("i18n_pidFile.keyword.allblank_n81i");
return; return;
}else{
if(! $id("processPath","","i18n_adsi.message.processPathTitle_n81i")){
return;
}
} }
} }
if(Number(type) > 7 && startType == 2){ // 周期启动 if(Number(type) > 7 && startType == 2){ // 周期启动
@@ -558,7 +563,7 @@
</td> </td>
<td class="color_3" align="left"> <td class="color_3" align="left">
<input type="text" name="detectionSetInfo.uploadGap" <input type="text" name="detectionSetInfo.uploadGap"
id="uploadGap" value="15"/> id="uploadGap" value="5"/>
<font color="red">*间隔必须大于或等于5分钟</font> <font color="red">*间隔必须大于或等于5分钟</font>
</td> </td>
--> -->
@@ -566,14 +571,14 @@
i18n_adsi.text.checkOutTime_n81i i18n_adsi.text.checkOutTime_n81i
</td> </td>
<td class="color_3" align="left"> <td class="color_3" align="left">
<input type="text" name="detectionSetInfo.checkOutTime" id="checkOutTime" value="0"/> <input type="text" name="detectionSetInfo.checkOutTime" id="checkOutTime" value="5"/>
<font color="red"><span class="STYLE1">*</span> </font> <font color="red"><span class="STYLE1">*</span> </font>
</td> </td>
<td class="color_1" align="right"> <td class="color_1" align="right">
i18n_adsi.text.checkMaxTimes_n81i i18n_adsi.text.checkMaxTimes_n81i
</td> </td>
<td class="color_3" align="left"> <td class="color_3" align="left">
<input type="text" name="detectionSetInfo.checkMaxTimes" id="checkMaxTimes" value="3"/> <input type="text" name="detectionSetInfo.checkMaxTimes" id="checkMaxTimes" value="1"/>
<font color="red"><span class="STYLE1">*</span> </font> <font color="red"><span class="STYLE1">*</span> </font>
</td> </td>
</tr> </tr>
@@ -616,7 +621,7 @@
</td> </td>
<td class="color_3" colspan="3" align="left"> <td class="color_3" colspan="3" align="left">
<input type="text" name="detectionSetInfo.processFile" id="processFile" value=""/> <input type="text" name="detectionSetInfo.processFile" id="processFile" value=""/>
<font color="red">*</font> <font color="red">* i18n_pidFile.keyword.allblank_n81i</font>
<!-- <input type="file" id="processFile" value="" name="deteProcessFile" class="filebtn1"/> <!-- <input type="file" id="processFile" value="" name="deteProcessFile" class="filebtn1"/>
<input type="hidden" id="ppPath" name="detectionSetInfo.processFile"/> --> <input type="hidden" id="ppPath" name="detectionSetInfo.processFile"/> -->
</td> </td>
@@ -627,7 +632,7 @@
</td> </td>
<td class="color_3" colspan="3" align="left"> <td class="color_3" colspan="3" align="left">
<input type="text" name="detectionSetInfo.processSearchCode" id="processSearchCode" value=""/> <input type="text" name="detectionSetInfo.processSearchCode" id="processSearchCode" value=""/>
<font color="red">*i18n_adsi.message.processSearchCode_n81i</font> <font color="red">* i18n_adsi.message.processSearchCode_n81i</font>
</td> </td>
</tr> </tr>
<tr class="dsd"> <tr class="dsd">

75
src/nis/nms/web/actions/detection/DetectionSetAction.java
View File

@@ -1211,45 +1211,48 @@ public class DetectionSetAction extends BaseAction {
StringBuffer errBuffer = null; StringBuffer errBuffer = null;
try { try {
commonService.beginTransaction(); commonService.beginTransaction();
//先判断设置的节点范围是否重复 Long cti = detectionSetInfo.getCheckTypeInfo().getId();
if (detectionSetInfo.getNodeIpsId() != null if(cti != null && cti != 8) {//进程监测不做重复判断
&& !"".equals(detectionSetInfo.getNodeIpsId())) {//节点组和节点都不为空 //先判断设置的节点范围是否重复
// hqlBuffer.append(""); if (detectionSetInfo.getNodeIpsId() != null
hqlBuffer = new StringBuffer(); && !"".equals(detectionSetInfo.getNodeIpsId())) {//节点组和节点都不为空
hqlBuffer // hqlBuffer.append("");
.append("from DetectionSetInfo where nodeGroupsId = ? and nodeIpsId= ? and checkTypeInfo.id= ? "); hqlBuffer = new StringBuffer();
list = this.commonService.find(hqlBuffer.toString(), hqlBuffer
detectionSetInfo.getNodeGroupsId(), detectionSetInfo .append("from DetectionSetInfo where nodeGroupsId = ? and nodeIpsId= ? and checkTypeInfo.id= ? ");
.getNodeIpsId(), detectionSetInfo.getCheckTypeInfo().getId()); list = this.commonService.find(hqlBuffer.toString(),
if (list != null && list.size() > 0) { detectionSetInfo.getNodeGroupsId(), detectionSetInfo
if (errBuffer == null) { .getNodeIpsId(), detectionSetInfo.getCheckTypeInfo().getId());
errBuffer = new StringBuffer(); if (list != null && list.size() > 0) {
if (errBuffer == null) {
errBuffer = new StringBuffer();
}
errBuffer.append(getI18nText("i18n_DetectionSetAction.downloadExample.nodeRangRepeat2_n81i"));
} }
errBuffer.append(getI18nText("i18n_DetectionSetAction.downloadExample.nodeRangRepeat2_n81i")); } else if (detectionSetInfo.getNodeGroupsId() != null
} && !"".equals(detectionSetInfo.getNodeGroupsId())) {//节点组不为空，节点为空
} else if (detectionSetInfo.getNodeGroupsId() != null hqlBuffer = new StringBuffer();
&& !"".equals(detectionSetInfo.getNodeGroupsId())) {//节点组不为空，节点为空 hqlBuffer
hqlBuffer = new StringBuffer(); .append("from DetectionSetInfo where nodeGroupsId = ? and checkTypeInfo.id= ? and (nodeIpsId='' or nodeIpsId is null) ");
hqlBuffer list = this.commonService.find(hqlBuffer.toString(),
.append("from DetectionSetInfo where nodeGroupsId = ? and checkTypeInfo.id= ? and (nodeIpsId='' or nodeIpsId is null) "); detectionSetInfo.getNodeGroupsId(), detectionSetInfo.getCheckTypeInfo().getId());
list = this.commonService.find(hqlBuffer.toString(), if (list != null && list.size() > 0) {
detectionSetInfo.getNodeGroupsId(), detectionSetInfo.getCheckTypeInfo().getId()); if (errBuffer == null) {
if (list != null && list.size() > 0) { errBuffer = new StringBuffer();
if (errBuffer == null) { }
errBuffer = new StringBuffer(); errBuffer.append(getI18nText("i18n_DetectionSetAction.downloadExample.nodeGroupRangRepeat_n81i"));
} }
errBuffer.append(getI18nText("i18n_DetectionSetAction.downloadExample.nodeGroupRangRepeat_n81i")); }else {//节点组、节点均为空
} hqlBuffer = new StringBuffer();
}else {//节点组、节点均为空 hqlBuffer
hqlBuffer = new StringBuffer(); .append("from DetectionSetInfo where (nodeGroupsId ='' or nodeGroupsId is null) and checkTypeInfo.id= ? and (nodeIpsId='' or nodeIpsId is null) ");
hqlBuffer list = this.commonService.find(hqlBuffer.toString(), detectionSetInfo.getCheckTypeInfo().getId());
.append("from DetectionSetInfo where (nodeGroupsId ='' or nodeGroupsId is null) and checkTypeInfo.id= ? and (nodeIpsId='' or nodeIpsId is null) "); if (list != null && list.size() > 0) {
list = this.commonService.find(hqlBuffer.toString(), detectionSetInfo.getCheckTypeInfo().getId()); if (errBuffer == null) {
if (list != null && list.size() > 0) { errBuffer = new StringBuffer();
if (errBuffer == null) { }
errBuffer = new StringBuffer(); errBuffer.append(getI18nText("i18n_DetectionSetAction.downloadExample.rangRepeat_n81i"));
} }
errBuffer.append(getI18nText("i18n_DetectionSetAction.downloadExample.rangRepeat_n81i"));
} }
} }
// 判断数据是否存在 // 判断数据是否存在