diff --git a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java index 807a9526b..7e3e73fc6 100644 --- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java @@ -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); diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp index b18429fc2..ae86714d6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp @@ -298,7 +298,7 @@ ${cfg.cfgDesc } ${cfg.appName } - ${cfg.bytes } + ${fns:abbr(cfg.bytes,13)} diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp index 4467ebca5..8fc042bba 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp @@ -96,7 +96,7 @@
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp index cd8018f22..b69b36f39 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp @@ -481,7 +481,7 @@ - <<%-- td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}">
--%> + <%--
--%> ${indexCfg.creatorName } ${indexCfg.editorName }