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

1.Media Addr删除操作修改 2.App byte/header界面修改

Browse Source
This commit is contained in:
zhangwenqing
2018-09-04 11:42:48 +08:00
parent c41238a19c
commit a0d037be51
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/nis/web/service/configuration/AvContentCfgService.java
View File

@@ -747,8 +747,10 @@ public class AvContentCfgService extends BaseService{
String[] idArray = ids.split(",");
for(String id :idArray){
BaseIpCfg entity = new BaseIpCfg();
entity.setCfgId(Long.parseLong(id));
BaseIpCfg ipCfg = this.getContIpCfgById(entity);// 获取CompileId
entity.setCompileId(ipCfg.getCompileId());
entity.setTableName("av_cont_ip_cfg");
entity.setCompileId(Integer.parseInt(id));
entity.setFunctionId(functionId);
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
@@ -1027,8 +1029,10 @@ public class AvContentCfgService extends BaseService{
String[] idArray = ids.split(",");
for(String id :idArray){
BaseIpCfg entity = new BaseIpCfg();
entity.setCfgId(Long.parseLong(id));
BaseIpCfg picIpCfg = this.getPicIpCfgById(entity);// 获取CompileId
entity.setCompileId(picIpCfg.getCompileId());
entity.setTableName("av_pic_ip_cfg");
entity.setCompileId(Integer.parseInt(id));
entity.setFunctionId(functionId);
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
@@ -1283,8 +1287,10 @@ public class AvContentCfgService extends BaseService{
String[] idArray = ids.split(",");
for(String id :idArray){
BaseStringCfg entity = new BaseStringCfg();
entity.setCfgId(Long.parseLong(id));
BaseStringCfg urlCfg = this.getContUrlCfgById(entity);// 获取CompileId
entity.setCompileId(urlCfg.getCompileId());
entity.setTableName("av_cont_url_cfg");
entity.setCompileId(Integer.parseInt(id));
entity.setFunctionId(functionId);
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
@@ -1528,8 +1534,10 @@ public class AvContentCfgService extends BaseService{
String[] idArray = ids.split(",");
for(String id :idArray){
BaseStringCfg entity = new BaseStringCfg();
entity.setCfgId(Long.parseLong(id));
BaseStringCfg picUrlCfg = this.getPicUrlCfgById(entity);// 获取CompileId
entity.setCompileId(picUrlCfg.getCompileId());
entity.setTableName("av_pic_url_cfg");
entity.setCompileId(Integer.parseInt(id));
entity.setFunctionId(functionId);
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);

2
src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
View File

@@ -298,7 +298,7 @@
</td>
<td>${cfg.cfgDesc }</td>
<td>${cfg.appName }</td>
<td>${cfg.bytes }</td>
<td title="${cfg.bytes }">${fns:abbr(cfg.bytes,13)}</td>
<c:if test="${cfg.isHexbin==0 }">
<td><spring:message code="not_hex"/></td>
<td><spring:message code="case_insenstive"/></td>

2
src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
View File

@@ -96,7 +96,7 @@
<div class="input-group-btn">
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="cfgKeywords"><spring:message code="keywords"></spring:message></form:option>
<form:option value="cfgKeywords"><spring:message code="header"></spring:message></form:option>
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
</form:select>

2
src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
View File

@@ -481,7 +481,7 @@
<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
</c:choose>
</td>
<<%-- td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
<td>${indexCfg.creatorName }</td>
<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td>${indexCfg.editorName }</td>