diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java index 648acce1f..8a691af48 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java @@ -156,7 +156,7 @@ public class FileTransferCfgController extends BaseController{ @RequiresPermissions(value={"fileTransfer:fileDigest:config"}) public String saveFileDigestCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids, FileDigestCfg entity,MultipartFile file,@ModelAttribute("areaCfgIds")String areaCfgIds) { - try { + try { Date fileTime=null; Date date=new Date(); if(!StringUtil.isEmpty(entity.getCfgId())){ diff --git a/src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml index d4d0f686d..2e5cc4590 100644 --- a/src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml @@ -233,7 +233,7 @@ delete from area_ip_cfg where compile_id=#{compileId} and function_id=#{functionId} - update area_ip_cfg + update area_ip_cfg is_valid = #{isValid,jdbcType=INTEGER}, 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 c983fb5ae..82a6a68fc 100644 --- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java @@ -373,7 +373,7 @@ public class AvContentCfgService extends BaseService{ strRegionList=accountMap.get("dstList"); } if(!StringUtil.isEmpty(areaIpCfgList)){ - //TODO DELETE后期删除 + //TODO DELETE后期删除 for (AreaIpCfg areaIpCfga : areaIpCfgList) { areaIpCfga.setCfgType("NTC_IP_RANGE"); } diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java index de454a183..8923ad4c6 100644 --- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java @@ -319,7 +319,7 @@ public class FileTransferCfgService extends CrudService { strRegionList=map.get("dstList"); } } - //保存区域IP信息 + //保存区域IP信息 if(entity.getAreaCfg()!=null && entity.getAreaCfg().size()>0){ AreaIpCfg cfg = new AreaIpCfg(); BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp index ef8af1639..8bdfb0a1f 100644 --- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp @@ -4,7 +4,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp index af1e98169..98b5802b7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp @@ -125,7 +125,7 @@ $(function(){
-