diff --git a/src/main/java/com/nis/util/FileUtils.java b/src/main/java/com/nis/util/FileUtils.java index 56a71120f..a7f78a319 100644 --- a/src/main/java/com/nis/util/FileUtils.java +++ b/src/main/java/com/nis/util/FileUtils.java @@ -682,7 +682,7 @@ public class FileUtils extends org.apache.commons.io.FileUtils { if (!isDot) { pos = pos - 1; } - prefix = filename.substring(0,pos); + prefix = filename.substring(0,pos+1); } return prefix; } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java index fa7389a9a..e2e570362 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java @@ -16,6 +16,7 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; import com.nis.domain.basics.SysDictInfo; @@ -24,6 +25,7 @@ import com.nis.domain.configuration.AreaIpCfg; import com.nis.domain.configuration.AvContIpCfg; import com.nis.domain.configuration.AvVoipAccountCfg; import com.nis.domain.configuration.CfgIndexInfo; +import com.nis.exceptions.MaatConvertException; import com.nis.domain.configuration.AvVoipIpCfg; import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.BaseStringCfg; @@ -99,22 +101,28 @@ public class AvContentController extends BaseController { } - //修改VOIP例配置状态 + //修改VOIP配置状态 @RequestMapping(value = {"/updateAvVoipValid"}) @RequiresPermissions(value={"avVoip:config"}) - public String updateVoipValid(Integer isAudit,Integer isValid,String ids,Integer functionId){ + public String updateVoipValid(Integer isAudit,Integer isValid,String ids,Integer functionId) { avContentCfgService.updateAvVoipValid(isAudit,isValid,ids,functionId); return "redirect:" + adminPath +"/ntc/av/voipList?functionId="+functionId; } //修改VOIP配置审核状态 @RequestMapping(value = {"/auditAvVoip"}) @RequiresPermissions(value={"avVoip:audit"}) - public String auditVoip(Integer isAudit,Integer isValid,String ids,Integer functionId){ + public String auditVoip(Integer isAudit,Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(ids)){ String[] idArray = ids.split(","); Date auditTime=new Date(); for(String id :idArray){ - avContentCfgService.auditAvVoip(isAudit,isValid,functionId,id,auditTime); + try { + avContentCfgService.auditAvVoip(isAudit,isValid,functionId,id,auditTime); + } catch (MaatConvertException e) { + e.printStackTrace(); + logger.info("VOIP配置下发失败:"+e.getMessage()); + addMessage(redirectAttributes, e.getMessage()); + } } } @@ -191,12 +199,19 @@ public class AvContentController extends BaseController { //修改CONTIP配置审核 @RequestMapping(value = {"/auditAvContIp"}) @RequiresPermissions(value={"avContIp:audit"}) - public String auditContIp(Integer isAudit,Integer isValid,String ids,Integer functionId){ + public String auditContIp(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(ids)){ String[] idArray = ids.split(","); Date auditTime=new Date(); for(String id :idArray){ - avContentCfgService.auditContIp(isAudit,isValid,functionId,id,auditTime); + try { + avContentCfgService.auditContIp(isAudit,isValid,functionId,id,auditTime); + } catch (MaatConvertException e) { + e.printStackTrace(); + logger.info("Cont Ip配置下发失败:"+e.getMessage()); + addMessage(redirectAttributes, e.getMessage()); + } + } } @@ -255,12 +270,18 @@ public class AvContentController extends BaseController { //修改CONTIP配置审核 @RequestMapping(value = {"/auditPicIp"}) @RequiresPermissions(value={"avPicIp:audit"}) - public String auditPicIp(Integer isAudit,Integer isValid,String ids,Integer functionId){ + public String auditPicIp(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(ids)){ String[] idArray = ids.split(","); Date auditTime=new Date(); for(String id :idArray){ - avContentCfgService.auditPicIp(isAudit,isValid,functionId,id,auditTime); + try { + avContentCfgService.auditPicIp(isAudit,isValid,functionId,id,auditTime); + } catch (MaatConvertException e) { + e.printStackTrace(); + logger.info("Pic Ip配置下发失败:"+e.getMessage()); + addMessage(redirectAttributes, e.getMessage()); + } } } @@ -320,12 +341,18 @@ public class AvContentController extends BaseController { //修改CONTUrl配置审核 @RequestMapping(value = {"/auditAvContUrl"}) @RequiresPermissions(value={"avContUrl:audit"}) - public String auditContUrl(Integer isAudit,Integer isValid,String ids,Integer functionId){ + public String auditContUrl(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(ids)){ String[] idArray = ids.split(","); Date auditTime=new Date(); for(String id :idArray){ - avContentCfgService.auditContUrl(isAudit,isValid,functionId,id,auditTime); + try { + avContentCfgService.auditContUrl(isAudit,isValid,functionId,id,auditTime); + } catch (MaatConvertException e) { + e.printStackTrace(); + logger.info("Cont Url配置下发失败:"+e.getMessage()); + addMessage(redirectAttributes, e.getMessage()); + } } } @@ -385,12 +412,18 @@ public class AvContentController extends BaseController { //修改CONTUrl配置审核 @RequestMapping(value = {"/auditAvPicUrl"}) @RequiresPermissions(value={"avPicUrl:audit"}) - public String auditPicUrl(Integer isAudit,Integer isValid,String ids,Integer functionId){ + public String auditPicUrl(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(ids)){ String[] idArray = ids.split(","); Date auditTime=new Date(); for(String id :idArray){ - avContentCfgService.auditPicUrl(isAudit,isValid,functionId,id,auditTime); + try { + avContentCfgService.auditPicUrl(isAudit,isValid,functionId,id,auditTime); + } catch (MaatConvertException e) { + e.printStackTrace(); + logger.info("Pic Url配置下发失败:"+e.getMessage()); + addMessage(redirectAttributes, e.getMessage()); + } } } 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 e89ef2334..f1d32b8e9 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 @@ -34,6 +34,7 @@ import com.nis.exceptions.MaatConvertException; import com.nis.util.ConfigServiceUtil; import com.nis.util.FileUtils; import com.nis.util.JsonMapper; +import com.nis.util.StringUtil; import com.nis.web.controller.BaseController; import com.nis.web.security.UserUtils; @@ -128,4 +129,95 @@ public class FileTransferCfgController extends BaseController{ } return "redirect:" + adminPath +"/ntc/fileTransfer/ftpList?functionId="+functionId; } + + @RequestMapping(value = {"fileDigestList"}) + @RequiresPermissions(value={"fileTransfer:fileDigest:config"}) + public String fileDigestList(Model model,@ModelAttribute("cfg")FileDigestCfg cfg,HttpServletRequest request,HttpServletResponse response) { + Page searchPage=new Page(request,response,"a"); + Page page = fileTransferCfgService.getFileDigestList(searchPage, cfg); + model.addAttribute("page", page); + initPageCondition(model,cfg); + return "/cfg/fileTransfer/fileDigestList"; + } + + @RequestMapping(value = {"fileDigestForm"}) + @RequiresPermissions(value={"fileTransfer:fileDigest:config"}) + public String fileDigestForm(Model model,String ids,FileDigestCfg entity) { + if(StringUtils.isNotBlank(ids)){ + entity = fileTransferCfgService.getFileDigestCfg(Long.parseLong(ids)); + initUpdateFormCondition(model,entity); + }else{ + initFormCondition(model,entity); + } + model.addAttribute("_cfg", entity); + return "/cfg/fileTransfer/fileDigestForm"; + } + @RequestMapping(value = {"saveFileDigestCfg"}) + @RequiresPermissions(value={"fileTransfer:fileDigest:config"}) + public String saveFileDigestCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids, + FileDigestCfg entity,MultipartFile file) { + try { + Date fileTime=null; + Date date=new Date(); + if(!StringUtil.isEmpty(entity.getCfgId())){ + entity.setEditTime(date); + fileTime=entity.getEditTime(); + }else{ + entity.setCreateTime(date); + fileTime=entity.getCreateTime(); + } + ToMaatResult result = null; + if(file!=null && file.getSize()>0 && entity!=null){ + String sep = System.getProperty("file.separator"); + String digestFilePath = request.getRealPath("/")+"digestFile"; + FileUtils.createDirectory(digestFilePath); + String fileName = UUID.randomUUID()+FileUtils.getSuffix(file.getOriginalFilename(), true); + File uploadFile = new File(digestFilePath+sep+fileName); + FileCopyUtils.copy(file.getBytes(), uploadFile); + Date creatTime = entity.getCreateTime(); + //获取文件摘要接口调用 + Map fileMap = new HashMap(); + fileMap.put("filetype", FileUtils.getSuffix(file.getOriginalFilename(), false)); + fileMap.put("datatype", "dbSystem");//源文件存入数据中心 + + fileMap.put("createTime",fileTime); + fileMap.put("key",FileUtils.getPrefix(file.getOriginalFilename(), false)); + fileMap.put("fileName", file.getOriginalFilename()); + String md5 = DigestUtils.md5Hex(file.getBytes()); + fileMap.put("checksum", md5); + result = ConfigServiceUtil.getFileDigest(null, uploadFile, JsonMapper.toJsonString(fileMap)); + logger.info("获取文件摘要响应信息:"+result); + } + fileTransferCfgService.saveOrUpdateFileDigestCfg(entity,result); + } catch (IOException e) { + e.printStackTrace(); + } + return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+entity.getFunctionId(); + } + @RequestMapping(value = {"updateFileDigestValid"}) + @RequiresPermissions(value={"fileTransfer:fileDigest:config"}) + public String updateFileDigestValid(Integer isValid,String ids,Integer functionId) { + fileTransferCfgService.updateFileDigestCfgValid(isValid,ids,functionId); + return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+functionId; + } + + @RequestMapping(value = {"auditFileDigestCfg"}) + @RequiresPermissions(value={"fileTransfer:fileDigest:audit"}) + public String auditFileDigestCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { + if(!StringUtil.isEmpty(ids)){ + String[] idArray = ids.split(","); + Date auditTime=new Date(); + for(String id :idArray){ + try { + fileTransferCfgService.auditFileDigestCfg(isAudit,isValid,functionId,id,auditTime); + } catch (MaatConvertException e) { + e.printStackTrace(); + logger.info("File Digest配置下发失败:"+e.getMessage()); + addMessage(redirectAttributes, e.getMessage()); + } + } + + } + return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+functionId; + } } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java index e08e73e65..bc257553d 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java @@ -82,12 +82,12 @@ public class MailCfgController extends BaseController{ Date creatTime = entity.getCreateTime(); //获取文件摘要接口调用 Map fileMap = new HashMap(); - fileMap.put("filetype", FileUtils.getSuffix(file.getName(), false)); + fileMap.put("filetype", FileUtils.getSuffix(file.getOriginalFilename(), false)); fileMap.put("datatype", "dbSystem");//源文件存入数据中心 fileMap.put("createTime",creatTime); - fileMap.put("key",FileUtils.getPrefix(file.getName(), false)); - fileMap.put("fileName", file.getName()); + fileMap.put("key",FileUtils.getPrefix(file.getOriginalFilename(), false)); + fileMap.put("fileName", file.getOriginalFilename()); String md5 = DigestUtils.md5Hex(file.getBytes()); fileMap.put("checksum", md5); result = ConfigServiceUtil.getFileDigest(null, uploadFile, JsonMapper.toJsonString(fileMap)); diff --git a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java index c9de37786..6c28c261b 100644 --- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java @@ -23,15 +23,16 @@ public interface FileTransferCfgDao extends CrudDao { public List getFtpList(CfgIndexInfo entity); public List getIpPortList(CfgIndexInfo entity); public List getFtpKeywordList(CfgIndexInfo entity); - public List getFtpFileDigestList(CfgIndexInfo entity); + public List getFileDigestList(FileDigestCfg entity); public void saveCfgIndex(CfgIndexInfo entity); public void saveIpPortCfg(IpPortCfg entity); public void saveFtpKeywordCfg(BaseStringCfg entity); - public void saveFtpFileDigestCfg(FileDigestCfg entity); public void deleteFtpIpCfg(CfgIndexInfo entity); public void deleteFtpKeywordCfg(CfgIndexInfo entity); public void deleteFtpFileDigestCfg(CfgIndexInfo entity); public void updateCfgIndex(CfgIndexInfo entity); public void updateCfgValid(BaseCfg entity); public void auditCfg(BaseCfg entity); + public FileDigestCfg getFileDigest(Long id); + public void updateFileDigestCfg(FileDigestCfg entity); } diff --git a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml index 8af1c5439..dd9b94751 100644 --- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml @@ -308,15 +308,6 @@ and a.cfg_type =#{cfgType,jdbcType=VARCHAR} - - - @@ -652,4 +643,178 @@ delete from file_digest_cfg where compile_id=#{compileId} and function_id=#{functionId} + + + + + + + + + + update file_digest_cfg + + + + cfg_desc = #{cfgDesc,jdbcType=VARCHAR}, + + + action = #{action,jdbcType=INTEGER}, + + + is_valid = #{isValid,jdbcType=INTEGER}, + + + is_audit = #{isAudit,jdbcType=INTEGER}, + + + creator_id = #{creatorId,jdbcType=INTEGER}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + editor_id = #{editorId,jdbcType=INTEGER}, + + + edit_time = #{editTime,jdbcType=TIMESTAMP}, + + + auditor_id = #{auditorId,jdbcType=INTEGER}, + + + audit_time = #{auditTime,jdbcType=TIMESTAMP}, + + + service_id = #{serviceId,jdbcType=INTEGER}, + + + request_id = #{requestId,jdbcType=INTEGER}, + + + is_area_effective = #{isAreaEffective,jdbcType=INTEGER}, + + + classify = #{classify,jdbcType=VARCHAR}, + + + attribute = #{attribute,jdbcType=VARCHAR}, + + + lable = #{lable,jdbcType=VARCHAR}, + + + area_effective_ids = #{areaEffectiveIds,jdbcType=VARCHAR}, + + + function_id = #{functionId,jdbcType=INTEGER}, + + + RAW_LEN = #{rawLen,jdbcType=INTEGER}, + + + digest = #{digest,jdbcType=VARCHAR}, + + + CFDS_LEVEL = #{cfdsLevel,jdbcType=INTEGER}, + + + CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, + + + CFG_TYPE =#{cfgType,jdbcType=VARCHAR}, + + + + where cfg_id = #{cfgId,jdbcType=BIGINT} + \ No newline at end of file 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 49911f966..df263d83e 100644 --- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java @@ -384,7 +384,7 @@ public class AvContentCfgService extends BaseService{ maatCfg.initDefaultValue(); BeanUtils.copyProperties(entity, maatCfg); maatCfg.setAction(entity.getAction()); - maatCfg.setAuditTime(entity.getAuditTime()); + maatCfg.setAuditTime(auditTime); maatCfg.setIpRegionList(ipRegionList); maatCfg.setStrRegionList(strRegionList); maatCfg.setNumRegionList(numRegionList); @@ -397,7 +397,7 @@ public class AvContentCfgService extends BaseService{ maatCfg.setIsValid(entity.getIsValid()); configCompileList.add(maatCfg); maatBean.setConfigCompileList(configCompileList); - maatBean.setAuditTime(entity.getAuditTime()); + maatBean.setAuditTime(auditTime); maatBean.setCreatorName(entity.getCurrentUser().getName()); maatBean.setVersion(Constants.MAAT_VERSION); maatBean.setOpAction(Constants.INSERT_ACTION); @@ -414,7 +414,7 @@ public class AvContentCfgService extends BaseService{ maatCfg.setIsValid(0);//无效 configCompileList.add(maatCfg); maatBean.setConfigCompileList(configCompileList); - maatBean.setAuditTime(entity.getAuditTime()); + maatBean.setAuditTime(auditTime); maatBean.setCreatorName(entity.getCurrentUser().getName()); maatBean.setVersion(Constants.MAAT_VERSION); maatBean.setOpAction(Constants.UPDATE_ACTION); @@ -674,7 +674,7 @@ public class AvContentCfgService extends BaseService{ maatCfg.initDefaultValue(); BeanUtils.copyProperties(entity, maatCfg); maatCfg.setAction(entity.getAction()); - maatCfg.setAuditTime(entity.getAuditTime()); + maatCfg.setAuditTime(auditTime); maatCfg.setIpRegionList(ipRegionList); maatCfg.setStrRegionList(strRegionList); maatCfg.setNumRegionList(numRegionList); @@ -687,7 +687,7 @@ public class AvContentCfgService extends BaseService{ maatCfg.setIsValid(entity.getIsValid()); configCompileList.add(maatCfg); maatBean.setConfigCompileList(configCompileList); - maatBean.setAuditTime(entity.getAuditTime()); + maatBean.setAuditTime(auditTime); maatBean.setCreatorName(entity.getCurrentUser().getName()); maatBean.setVersion(Constants.MAAT_VERSION); maatBean.setOpAction(Constants.INSERT_ACTION); @@ -704,7 +704,7 @@ public class AvContentCfgService extends BaseService{ maatCfg.setIsValid(0);//无效 configCompileList.add(maatCfg); maatBean.setConfigCompileList(configCompileList); - maatBean.setAuditTime(entity.getAuditTime()); + maatBean.setAuditTime(auditTime); maatBean.setCreatorName(entity.getCurrentUser().getName()); maatBean.setVersion(Constants.MAAT_VERSION); maatBean.setOpAction(Constants.UPDATE_ACTION); @@ -962,7 +962,7 @@ public class AvContentCfgService extends BaseService{ maatCfg.initDefaultValue(); BeanUtils.copyProperties(entity, maatCfg); maatCfg.setAction(entity.getAction()); - maatCfg.setAuditTime(entity.getAuditTime()); + maatCfg.setAuditTime(auditTime); maatCfg.setIpRegionList(ipRegionList); maatCfg.setStrRegionList(strRegionList); maatCfg.setNumRegionList(numRegionList); @@ -975,7 +975,7 @@ public class AvContentCfgService extends BaseService{ maatCfg.setIsValid(entity.getIsValid()); configCompileList.add(maatCfg); maatBean.setConfigCompileList(configCompileList); - maatBean.setAuditTime(entity.getAuditTime()); + maatBean.setAuditTime(auditTime); maatBean.setCreatorName(entity.getCurrentUser().getName()); maatBean.setVersion(Constants.MAAT_VERSION); maatBean.setOpAction(Constants.INSERT_ACTION); @@ -992,7 +992,7 @@ public class AvContentCfgService extends BaseService{ maatCfg.setIsValid(0);//无效 configCompileList.add(maatCfg); maatBean.setConfigCompileList(configCompileList); - maatBean.setAuditTime(entity.getAuditTime()); + maatBean.setAuditTime(auditTime); maatBean.setCreatorName(entity.getCurrentUser().getName()); maatBean.setVersion(Constants.MAAT_VERSION); maatBean.setOpAction(Constants.UPDATE_ACTION); @@ -1215,7 +1215,7 @@ public class AvContentCfgService extends BaseService{ maatCfg.initDefaultValue(); BeanUtils.copyProperties(entity, maatCfg); maatCfg.setAction(entity.getAction()); - maatCfg.setAuditTime(entity.getAuditTime()); + maatCfg.setAuditTime(auditTime); maatCfg.setIpRegionList(ipRegionList); maatCfg.setStrRegionList(strRegionList); maatCfg.setNumRegionList(numRegionList); @@ -1228,7 +1228,7 @@ public class AvContentCfgService extends BaseService{ maatCfg.setIsValid(entity.getIsValid()); configCompileList.add(maatCfg); maatBean.setConfigCompileList(configCompileList); - maatBean.setAuditTime(entity.getAuditTime()); + maatBean.setAuditTime(auditTime); maatBean.setCreatorName(entity.getCurrentUser().getName()); maatBean.setVersion(Constants.MAAT_VERSION); maatBean.setOpAction(Constants.INSERT_ACTION); @@ -1245,7 +1245,7 @@ public class AvContentCfgService extends BaseService{ maatCfg.setIsValid(0);//无效 configCompileList.add(maatCfg); maatBean.setConfigCompileList(configCompileList); - maatBean.setAuditTime(entity.getAuditTime()); + maatBean.setAuditTime(auditTime); maatBean.setCreatorName(entity.getCurrentUser().getName()); maatBean.setVersion(Constants.MAAT_VERSION); maatBean.setOpAction(Constants.UPDATE_ACTION); @@ -1467,7 +1467,7 @@ public class AvContentCfgService extends BaseService{ maatCfg.initDefaultValue(); BeanUtils.copyProperties(entity, maatCfg); maatCfg.setAction(entity.getAction()); - maatCfg.setAuditTime(entity.getAuditTime()); + maatCfg.setAuditTime(auditTime); maatCfg.setIpRegionList(ipRegionList); maatCfg.setStrRegionList(strRegionList); maatCfg.setNumRegionList(numRegionList); @@ -1480,7 +1480,7 @@ public class AvContentCfgService extends BaseService{ maatCfg.setIsValid(entity.getIsValid()); configCompileList.add(maatCfg); maatBean.setConfigCompileList(configCompileList); - maatBean.setAuditTime(entity.getAuditTime()); + maatBean.setAuditTime(auditTime); maatBean.setCreatorName(entity.getCurrentUser().getName()); maatBean.setVersion(Constants.MAAT_VERSION); maatBean.setOpAction(Constants.INSERT_ACTION); @@ -1497,7 +1497,7 @@ public class AvContentCfgService extends BaseService{ maatCfg.setIsValid(0);//无效 configCompileList.add(maatCfg); maatBean.setConfigCompileList(configCompileList); - maatBean.setAuditTime(entity.getAuditTime()); + maatBean.setAuditTime(auditTime); maatBean.setCreatorName(entity.getCurrentUser().getName()); maatBean.setVersion(Constants.MAAT_VERSION); maatBean.setOpAction(Constants.UPDATE_ACTION); 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 d446bf5d0..a0d9683c5 100644 --- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java @@ -18,6 +18,7 @@ import com.nis.domain.Page; import com.nis.domain.configuration.AreaIpCfg; import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.CfgIndexInfo; +import com.nis.domain.configuration.ComplexkeywordCfg; import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.FileDigestCfg; import com.nis.domain.configuration.IpPortCfg; @@ -35,8 +36,10 @@ import com.nis.util.ConfigServiceUtil; import com.nis.util.Constants; import com.nis.util.FileUtils; import com.nis.util.JsonMapper; +import com.nis.util.StringUtil; import com.nis.web.dao.configuration.AreaIpCfgDao; import com.nis.web.dao.configuration.FileTransferCfgDao; +import com.nis.web.dao.configuration.MailCfgDao; import com.nis.web.security.UserUtils; import com.nis.web.service.CrudService; @@ -51,6 +54,8 @@ public class FileTransferCfgService extends CrudService getFtpList(Page page, CfgIndexInfo entity){ // 生成数据权限过滤条件(dsf为dataScopeFilter的简写,在xml中使用 ${sqlMap.dsf}调用权限SQL) entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); @@ -298,4 +303,157 @@ public class FileTransferCfgService extends CrudService getFileDigestList(Page page, FileDigestCfg entity){ + // 生成数据权限过滤条件(dsf为dataScopeFilter的简写,在xml中使用 ${sqlMap.dsf}调用权限SQL) + entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); + entity.setPage(page); + List list = fileTransferCfgDao.getFileDigestList(entity); + page.setList(list); + return page; + } + + public FileDigestCfg getFileDigestCfg(Long cfgId){ + FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId); + return entity; + } + + public void saveOrUpdateFileDigestCfg(FileDigestCfg entity,ToMaatResult result){ + //设置区域运营商信息 + setAreaEffectiveIds(entity); + + entity.setIsValid(0); + entity.setIsAudit(0); + + if(entity.getCfgId()==null){ + Integer compileId = 0; + try { + List idList = ConfigServiceUtil.getId(1, 1); + if(idList!=null && idList.size()>0){ + compileId = idList.get(0); + } + } catch (Exception e) { + e.printStackTrace(); + logger.info("获取编译ID出错"); + throw new MaatConvertException(":"+e.getMessage()); + } + entity.setCompileId(compileId); + entity.setCreatorId(entity.getCurrentUser().getId()); + + if(result!=null && result.getData()!=null){ + entity.setRawLen(result.getData().getRawLen()); + entity.setDigest(result.getData().getDigest()); + } + mailCfgDao.saveMailFileDigestCfg(entity); + + }else{ + entity.setEditorId(entity.getCurrentUser().getId()); + entity.setEditTime(new Date()); + if(result!=null && result.getData()!=null){ + entity.setRawLen(result.getData().getRawLen()); + entity.setDigest(result.getData().getDigest()); + } + fileTransferCfgDao.updateFileDigestCfg(entity); + } + } + + public void updateFileDigestCfgValid(Integer isValid,String ids,Integer functionId){ + FileDigestCfg entity = new FileDigestCfg(); + String[] idArray = ids.split(","); + for(String id :idArray){ + entity.setCfgId(Long.parseLong(id)); + entity.setIsValid(isValid); + entity.setEditorId(UserUtils.getUser().getId()); + entity.setEditTime(new Date()); + entity.setFunctionId(functionId); + fileTransferCfgDao.updateFileDigestCfg(entity); + } + + } + + public void auditFileDigestCfg(Integer isAudit,Integer isValid,Integer functionId,String id,Date auditTime) throws MaatConvertException{ + FileDigestCfg entity = new FileDigestCfg(); + entity.setCfgId(Long.parseLong(id)); + entity.setIsAudit(isAudit); + entity.setIsValid(isValid); + entity.setAuditorId(UserUtils.getUser().getId()); + entity.setAuditTime(auditTime); + fileTransferCfgDao.updateFileDigestCfg(entity); + + entity = fileTransferCfgDao.getFileDigest(Long.parseLong(id)); + + List list=new ArrayList(); + list.add(entity); + + ToMaatBean maatBean = new ToMaatBean(); + MaatCfg maatCfg = new MaatCfg(); + List configCompileList = new ArrayList(); + List groupRelationList = new ArrayList(); + List ipRegionList = new ArrayList(); + List strRegionList = new ArrayList(); + List numRegionList = new ArrayList(); + List digestRegionList = new ArrayList(); + List areaIpRegionList = new ArrayList(); + + if(isAudit==1){ + //TODO DELETE后期删除 + entity.setAreaEffectiveIds(StringUtils.isEmpty(entity.getAreaEffectiveIds()) ? "0":entity.getAreaEffectiveIds()); + entity.setCfgType("NTC_FILE_DIGEST"); + + Map map = cfgConvert(digestRegionList,list,5,entity,groupRelationList); + groupRelationList=map.get("groupList"); + digestRegionList=map.get("dstList"); + if(map.get("numRegionList")!=null){ + numRegionList.addAll(map.get("numRegionList")); + } + } + + //构造提交综合服务参数格式,一条配置提交一次综合服务 + if(isAudit==1){ + maatCfg.initDefaultValue(); + BeanUtils.copyProperties(entity, maatCfg); + maatCfg.setAction(entity.getAction()); + maatCfg.setAuditTime(auditTime); + maatCfg.setIpRegionList(ipRegionList); + maatCfg.setStrRegionList(strRegionList); + maatCfg.setNumRegionList(numRegionList); + maatCfg.setDigestRegionList(digestRegionList); + maatCfg.setGroupRelationList(groupRelationList); + maatCfg.setGroupNum(groupRelationList.size()); + //TODO 后期修改 + maatCfg.setUserRegion(entity.getCompileId()+""); + maatCfg.setAreaIpRegionList(areaIpRegionList); + maatCfg.setIsValid(entity.getIsValid()); + configCompileList.add(maatCfg); + maatBean.setConfigCompileList(configCompileList); + maatBean.setAuditTime(auditTime); + maatBean.setCreatorName(entity.getCurrentUser().getName()); + maatBean.setVersion(Constants.MAAT_VERSION); + maatBean.setOpAction(Constants.INSERT_ACTION); + //调用服务接口下发配置数据 + String json=gsonToJson(maatBean); + logger.info("File Digest配置下发配置参数:"+json); + //调用服务接口下发配置 + ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); + logger.info("File Digest配置下发响应信息:"+result.getMsg()); + + }else if(isAudit==3){ + maatCfg.setCompileId(entity.getCompileId()); + maatCfg.setServiceId(entity.getServiceId()); + maatCfg.setIsValid(0);//无效 + configCompileList.add(maatCfg); + maatBean.setConfigCompileList(configCompileList); + maatBean.setAuditTime(auditTime); + maatBean.setCreatorName(entity.getCurrentUser().getName()); + maatBean.setVersion(Constants.MAAT_VERSION); + maatBean.setOpAction(Constants.UPDATE_ACTION); + //调用服务接口取消配置 + String json=gsonToJson(maatBean); + logger.info("File Digest配置下发配置参数:"+json); + //调用服务接口下发配置 + ToMaatResult result = ConfigServiceUtil.put(json,1); + logger.info("File Digest配置取消配置响应信息:"+result.getMsg()); + } + } + } diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index ae2014a23..629ad5f1a 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -579,4 +579,5 @@ action_forward=forward action_ratelimit=rate limit action_replace=replace action_whitelist=white list -action_monit=monitor \ No newline at end of file +action_monit=monitor +file_digest_control=file digest control \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index a50802531..11af36fd0 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -405,4 +405,5 @@ action_forward=\u0432\u043F\u0435\u0440\u0435\u0434 action_ratelimit=\u0441\u0442\u0430\u0432\u043A\u0438 \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0438\u0442\u044C action_replace=\u0437\u0430\u043C\u0435\u043D\u0438\u0442\u044C action_whitelist=\u0431\u0435\u043B\u044B\u0439 \u0441\u043F\u0438\u0441\u043E\u043A -action_monit=\u041C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433 \ No newline at end of file +action_monit=\u041C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433 +file_digest_control=file digest control \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp index 8679dce4f..65135ae82 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp @@ -350,53 +350,62 @@ ${cfg.requestName } - - - - - - - - - - - + + + + + + + + + + + + + - - - ${fns:abbr(classify,20)} + + ${fns:abbr(classify,20)} + - - - - - - - - - - - + + + + + + + + + + + + + - - - ${fns:abbr(attribute,20)} + + ${fns:abbr(attribute,20)} + - - - - - - - - - - - + + + + + + + + + + + + + - - - ${fns:abbr(lableInfo,20)} + + ${fns:abbr(lableInfo,20)} + <%-- ${cfg.areaEffectiveIds } --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp index 562ef370f..6306eb199 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp @@ -297,7 +297,12 @@ ${cfg.cfgDesc } - ${cfg.cfgKeywords } + + + ${fns:abbr(fn:replace(cfg.cfgKeywords, "***and***", " "),20)} + + @@ -336,53 +341,62 @@ ${cfg.requestName } - - - - - - - - - - - + + + + + + + + + + + + + - - - ${fns:abbr(classify,20)} + + ${fns:abbr(classify,20)} + - - - - - - - - - - - + + + + + + + + + + + + + - - - ${fns:abbr(attribute,20)} + + ${fns:abbr(attribute,20)} + - - - - - - - - - - - + + + + + + + + + + + + + - - - ${fns:abbr(lableInfo,20)} + + ${fns:abbr(lableInfo,20)} + <%-- ${cfg.areaEffectiveIds } --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp index 124aac2fc..ed848ddd1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp @@ -350,53 +350,62 @@ ${cfg.requestName } - - - - - - - - - - - + + + + + + + + + + + + + - - - ${fns:abbr(classify,20)} + + ${fns:abbr(classify,20)} + - - - - - - - - - - - + + + + + + + + + + + + + - - - ${fns:abbr(attribute,20)} + + ${fns:abbr(attribute,20)} + - - - - - - - - - - - + + + + + + + + + + + + + - - - ${fns:abbr(lableInfo,20)} + + ${fns:abbr(lableInfo,20)} + <%-- ${cfg.areaEffectiveIds } --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp index 8bb9a32a0..8f24b2441 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp @@ -297,7 +297,12 @@ ${cfg.cfgDesc } - ${cfg.cfgKeywords } + + + ${fns:abbr(fn:replace(cfg.cfgKeywords, "***and***", " "),20)} + + @@ -336,53 +341,62 @@ ${cfg.requestName } - - - - - - - - - - - + + + + + + + + + + + + + - - - ${fns:abbr(classify,20)} + + ${fns:abbr(classify,20)} + - - - - - - - - - - - + + + + + + + + + + + + + - - - ${fns:abbr(attribute,20)} + + ${fns:abbr(attribute,20)} + - - - - - - - - - - - + + + + + + + + + + + + + - - - ${fns:abbr(lableInfo,20)} + + ${fns:abbr(lableInfo,20)} + <%-- ${cfg.areaEffectiveIds } --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp index 6eeb3cd73..3a353d42f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp @@ -108,7 +108,7 @@ html+="
"; html+=""; html+=""; html+="
"; html+=""; @@ -664,53 +664,62 @@ ${indexCfg.requestName } - - - - - - - - - - - + + + + + + + + + + + + + - - - ${fns:abbr(classify,20)} + + ${fns:abbr(classify,20)} + - - - - - - - - - - - + + + + + + + + + + + + + - - - ${fns:abbr(attribute,20)} + + ${fns:abbr(attribute,20)} + - - - - - - - - - - - + + + + + + + + + + + + + - - - ${fns:abbr(lableInfo,20)} + + ${fns:abbr(lableInfo,20)} + diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp new file mode 100644 index 000000000..d7116d837 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp @@ -0,0 +1,162 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + + +
+ + <%--

+ +

--%> + +
+
+
+
+
+ + + +
+
+
+ +
+ + + + + + + + + + + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ + + +
+
+
+
+
+
+
+
+ +
+ +
+ " class="required form-control" style=" background-color:transparent" + aria-required="true" type="text" value="${_cfg.digest }"> + +
+ +
+
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+ +
+ <%-- <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> --%> + + <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> +
+
+
+
+
+
+ + +
+
+
+
+
+
+
+ +
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp new file mode 100644 index 000000000..87be86ce0 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp @@ -0,0 +1,402 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + + + + +
+ + +

+ + +

+ +
+
+
+
+ + + + + + + + + + +
+
+ + + + + + + + +
+ +
+ +
+
+ + + + + + +
+ + + +
+
+
+ + + +
+
+ + + + + +
+ + +
+
+ href="javascript:;"> + + +
+
+ + + +
+
+ +
+ +
+ + + + + + + + +
+ +
+ +
+ +
+ + + + + + + +
+ +
+ +
+ +
+ + + + + + + + +
+ +
+ +
+ +
+ + + + + + + +
+ +
+ +
+ +
+
+
+ + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+
+ + +
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + ${indexCfg.cfgDesc } + + ${fns:abbr(indexCfg.digest,20)} + + ${indexCfg.rawLen }${indexCfg.cfdsLevel } + + + + + + + + + + + + + ${indexCfg.requestName } + + + + + + + + + + + + + + + ${fns:abbr(classify,20)} + + + + + + + + + + + + + + + + + ${fns:abbr(attribute,20)} + + + + + + + + + + + + + + + + + + ${fns:abbr(lableInfo,20)} + + + + + + + + + + + + + ${indexCfg.creatorName }${indexCfg.editorName }${indexCfg.auditorName }
+
${page}
+
+ +
+
+
+ + + \ No newline at end of file