diff --git a/WebRoot/i18n/globalMessages_en_US.properties b/WebRoot/i18n/globalMessages_en_US.properties index bfd4379..bfbafa1 100644 --- a/WebRoot/i18n/globalMessages_en_US.properties +++ b/WebRoot/i18n/globalMessages_en_US.properties @@ -7404,3 +7404,4 @@ topoManage.cancel=Cancel topoManage.TopoNameSetting=Topo Picture Name xt_mk_jbxx.604.mkmc=Advanced xt_mk_jbxx.604.mkms=Advanced configuration function menu +pidFile.keyword.allblank=PID file and keyword can not all blank \ No newline at end of file diff --git a/WebRoot/i18n/globalMessages_ru_RU.properties b/WebRoot/i18n/globalMessages_ru_RU.properties index 5371f29..43367a7 100644 --- a/WebRoot/i18n/globalMessages_ru_RU.properties +++ b/WebRoot/i18n/globalMessages_ru_RU.properties @@ -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 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 +pidFile.keyword.allblank=Процесс файл PID и процесс поиска ключевых слов не могут быть пустыми одновременно \ No newline at end of file diff --git a/WebRoot/i18n/globalMessages_zh_CN.properties b/WebRoot/i18n/globalMessages_zh_CN.properties index 18d2773..1a060ce 100644 --- a/WebRoot/i18n/globalMessages_zh_CN.properties +++ b/WebRoot/i18n/globalMessages_zh_CN.properties @@ -7415,4 +7415,5 @@ topoManage.TopoCopy=\u62f7\u8d1d topoManage.cancel=\u53d6\u6d88 topoManage.TopoNameSetting=\u62d3\u6251\u56fe\u540d\u79f0 xt_mk_jbxx.604.mkmc=\u9ad8\u7ea7\u914d\u7f6e -xt_mk_jbxx.604.mkms=\u9ad8\u7ea7\u914d\u7f6e\u529f\u80fd\u83dc\u5355 \ No newline at end of file +xt_mk_jbxx.604.mkms=\u9ad8\u7ea7\u914d\u7f6e\u529f\u80fd\u83dc\u5355 +pidFile.keyword.allblank=PID文件和进程关键字不能同时为空 \ No newline at end of file diff --git a/WebRoot/page/detection/addDetecSetInfo.jsp b/WebRoot/page/detection/addDetecSetInfo.jsp index a935941..9d1b77d 100644 --- a/WebRoot/page/detection/addDetecSetInfo.jsp +++ b/WebRoot/page/detection/addDetecSetInfo.jsp @@ -95,18 +95,23 @@ if(Number(type) > 7 && startType == 0){ // 手动启动 if(false ==( $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; } } if(Number(type) > 7 && startType == 1){ // 单次启动 if(false ==( $id("processFile","","i18n_adsi.message.processFile_n81i") - && $id("processSearchCode","","i18n_adsi.message.processSearchCodeTitle_n81i") - && $id("processPath","","i18n_adsi.message.processPathTitle_n81i") + || $id("processSearchCode","","i18n_adsi.message.processSearchCodeTitle_n81i") )){ + alert("i18n_pidFile.keyword.allblank_n81i"); return; + }else{ + if(! $id("processPath","","i18n_adsi.message.processPathTitle_n81i")){ + return; + } } } if(Number(type) > 7 && startType == 2){ // 周期启动 @@ -558,7 +563,7 @@ + id="uploadGap" value="5"/> *间隔必须大于或等于5分钟 --> @@ -566,14 +571,14 @@ i18n_adsi.text.checkOutTime_n81i - + * i18n_adsi.text.checkMaxTimes_n81i - + * @@ -616,7 +621,7 @@ - * + * i18n_pidFile.keyword.allblank_n81i @@ -627,7 +632,7 @@ - *i18n_adsi.message.processSearchCode_n81i + * i18n_adsi.message.processSearchCode_n81i diff --git a/src/nis/nms/web/actions/detection/DetectionSetAction.java b/src/nis/nms/web/actions/detection/DetectionSetAction.java index 85f6897..0b103c4 100644 --- a/src/nis/nms/web/actions/detection/DetectionSetAction.java +++ b/src/nis/nms/web/actions/detection/DetectionSetAction.java @@ -1211,45 +1211,48 @@ public class DetectionSetAction extends BaseAction { StringBuffer errBuffer = null; try { commonService.beginTransaction(); - //先判断设置的节点范围是否重复 - if (detectionSetInfo.getNodeIpsId() != null - && !"".equals(detectionSetInfo.getNodeIpsId())) {//节点组和节点都不为空 - // hqlBuffer.append(""); - hqlBuffer = new StringBuffer(); - hqlBuffer - .append("from DetectionSetInfo where nodeGroupsId = ? and nodeIpsId= ? and checkTypeInfo.id= ? "); - list = this.commonService.find(hqlBuffer.toString(), - detectionSetInfo.getNodeGroupsId(), detectionSetInfo - .getNodeIpsId(), detectionSetInfo.getCheckTypeInfo().getId()); - if (list != null && list.size() > 0) { - if (errBuffer == null) { - errBuffer = new StringBuffer(); + Long cti = detectionSetInfo.getCheckTypeInfo().getId(); + if(cti != null && cti != 8) {//进程监测不做重复判断 + //先判断设置的节点范围是否重复 + if (detectionSetInfo.getNodeIpsId() != null + && !"".equals(detectionSetInfo.getNodeIpsId())) {//节点组和节点都不为空 + // hqlBuffer.append(""); + hqlBuffer = new StringBuffer(); + hqlBuffer + .append("from DetectionSetInfo where nodeGroupsId = ? and nodeIpsId= ? and checkTypeInfo.id= ? "); + list = this.commonService.find(hqlBuffer.toString(), + detectionSetInfo.getNodeGroupsId(), detectionSetInfo + .getNodeIpsId(), detectionSetInfo.getCheckTypeInfo().getId()); + 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())) {//节点组不为空,节点为空 - hqlBuffer = new StringBuffer(); - hqlBuffer - .append("from DetectionSetInfo where nodeGroupsId = ? and checkTypeInfo.id= ? and (nodeIpsId='' or nodeIpsId is null) "); - list = this.commonService.find(hqlBuffer.toString(), - detectionSetInfo.getNodeGroupsId(), detectionSetInfo.getCheckTypeInfo().getId()); - if (list != null && list.size() > 0) { - if (errBuffer == null) { - errBuffer = new StringBuffer(); + } else if (detectionSetInfo.getNodeGroupsId() != null + && !"".equals(detectionSetInfo.getNodeGroupsId())) {//节点组不为空,节点为空 + hqlBuffer = new StringBuffer(); + hqlBuffer + .append("from DetectionSetInfo where nodeGroupsId = ? and checkTypeInfo.id= ? and (nodeIpsId='' or nodeIpsId is null) "); + list = this.commonService.find(hqlBuffer.toString(), + detectionSetInfo.getNodeGroupsId(), detectionSetInfo.getCheckTypeInfo().getId()); + if (list != null && list.size() > 0) { + 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(); - hqlBuffer - .append("from DetectionSetInfo where (nodeGroupsId ='' or nodeGroupsId is null) and checkTypeInfo.id= ? and (nodeIpsId='' or nodeIpsId is null) "); - list = this.commonService.find(hqlBuffer.toString(), detectionSetInfo.getCheckTypeInfo().getId()); - if (list != null && list.size() > 0) { - if (errBuffer == null) { - errBuffer = new StringBuffer(); + }else {//节点组、节点均为空 + hqlBuffer = new StringBuffer(); + hqlBuffer + .append("from DetectionSetInfo where (nodeGroupsId ='' or nodeGroupsId is null) and checkTypeInfo.id= ? and (nodeIpsId='' or nodeIpsId is null) "); + list = this.commonService.find(hqlBuffer.toString(), detectionSetInfo.getCheckTypeInfo().getId()); + if (list != null && list.size() > 0) { + if (errBuffer == null) { + errBuffer = new StringBuffer(); + } + errBuffer.append(getI18nText("i18n_DetectionSetAction.downloadExample.rangRepeat_n81i")); } - errBuffer.append(getI18nText("i18n_DetectionSetAction.downloadExample.rangRepeat_n81i")); } } // 判断数据是否存在