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

File Digest整体功能提交

Browse Source 
修改FileUtils getPrefix方法截取下标
修改音视频文本列表超长信息查看样式
This commit is contained in:
duandongmei
2018-06-07 16:31:14 +08:00
parent 8f75a9dcc4
commit 100a5fdc90
17 changed files with 1327 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
View File

@@ -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());
}
}
}

92
src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
View File

@@ -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<FileDigestCfg> searchPage=new Page<FileDigestCfg>(request,response,"a");
Page<FileDigestCfg> 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<String,Object> 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;
}
}

6
src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java
View File

@@ -82,12 +82,12 @@ public class MailCfgController extends BaseController{
Date creatTime = entity.getCreateTime();
//获取文件摘要接口调用
Map<String,Object> 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));