gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

组长度超过20省略号展示，导出doLog调整

Browse Source
This commit is contained in:
wangxin
2019-06-15 18:20:24 +08:00
parent 1d0835a563
commit 55e2272333
3 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/util/excel/ExportExcel.java
View File

@@ -2725,6 +2725,10 @@ public class ExportExcel {
} }
} }
if(ef.title().equals("do_log")
&& (Reflections.invokeGetter(e, "serviceId").toString().equals("512"))) {
val = "";
}
if(ef.title().equals("whether_area_block")&&!StringUtil.isEmpty(val)){ if(ef.title().equals("whether_area_block")&&!StringUtil.isEmpty(val)){
Integer whetherAreaBlock=Integer.parseInt(valStr); Integer whetherAreaBlock=Integer.parseInt(valStr);
if(whetherAreaBlock.equals(0)){ if(whetherAreaBlock.equals(0)){

2
src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java
View File

@@ -407,7 +407,7 @@ public class ObjectGroupController extends BaseController {
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), ObjGroupCfg.class); classMap.put(entity.getMenuNameCode(), ObjGroupCfg.class);
String cfgIndexInfoNoExport=",block_type,do_log,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,&action:block_type-"; String cfgIndexInfoNoExport=",block_type,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,&action:block_type-";
// 时间过滤 // 时间过滤
if (entity.getSearch_create_time_start() == null) { if (entity.getSearch_create_time_start() == null) {

30
src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp
View File

@@ -76,27 +76,47 @@
$("td[commonGroupIds]").each(function(){ $("td[commonGroupIds]").each(function(){
for(var key in data.ipGroup){ for(var key in data.ipGroup){
if($(this).text().trim()==key){ if($(this).text().trim()==key){
$(this).text(data.ipGroup[key]); if(data.ipGroup[key].length<20){
$(this).text(data.ipGroup[key]);
}else{
$(this).text(data.ipGroup[key].substring(0,20)+"...");
}
$(this).attr("title",data.ipGroup[key]);
} }
} }
}); });
$("td[urlGroup]").each(function(){ $("td[urlGroup]").each(function(){
for(var key in data.urlGroup){ for(var key in data.urlGroup){
if($(this).text().trim()==key){ if($(this).text().trim()==key){
$(this).text(data.urlGroup[key]); if(data.urlGroup[key].length<20){
$(this).text(data.urlGroup[key]);
}else{
$(this).text(data.urlGroup[key].substring(0,20)+"...");
}
$(this).attr("title",data.urlGroup[key]);
} }
} }
}); });
$("td[domainGroup]").each(function(){ $("td[domainGroup]").each(function(){
for(var key in data.domainGroup){ for(var key in data.domainGroup){
if($(this).text().trim()==key){ if($(this).text().trim()==key){
$(this).text(data.domainGroup[key]); if(data.domainGroup[key].length<20){
$(this).text(data.domainGroup[key]);
}else{
$(this).text(data.domainGroup[key].substring(0,20)+"...");
}
$(this).attr("title",data.domainGroup[key]);
} }
} }
});$("td[subscribeIdGroup]").each(function(){ });$("td[subscribeIdGroup]").each(function(){
for(var key in data.subscribeIdGroup){ for(var key in data.subscribeIdGroup){
if($(this).text().trim()==key){ if($(this).text().trim()==key){
$(this).text(data.subscribeIdGroup[key]); if(data.subscribeIdGroup[key].length<20){
$(this).text(data.subscribeIdGroup[key]);
}else{
$(this).text(data.subscribeIdGroup[key].substring(0,20)+"...");
}
$(this).attr("title",data.subscribeIdGroup[key]);
} }
} }
}); });
@@ -463,7 +483,7 @@
</td> </td>
<td> <td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict"> <c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq cfg.doLog and cfg.action!=64}"> <c:if test="${dict.itemCode eq cfg.doLog and cfg.serviceId!=512}">
<spring:message code="${dict.itemValue }"/> <spring:message code="${dict.itemValue }"/>
</c:if> </c:if>
</c:forEach> </c:forEach>