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

多媒体中目录下的特殊用户修改或保存配置直接下发

Browse Source
This commit is contained in:
zhanghongqing
2019-04-17 14:20:19 +08:00
parent cc8cb48da1
commit 1cf9594bd2
7 changed files with 136 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
View File

@@ -395,8 +395,6 @@ public class AvController extends BaseController {
entity = avCfgService.getAvFileSampleById(Long.parseLong(id), null);
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());
entity.setAuditTime(new Date());
// String oldSrcUrl = entity.getSrcPath();
// String oldSampleUrl = entity.getSamplePath();
try {
@@ -511,8 +509,7 @@ public class AvController extends BaseController {
entity = avCfgService.getAvSignSampleById(Long.parseLong(id));
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());
entity.setAuditTime(new Date());
try {
avCfgService.audioAuditAvSignSample(entity, isAudit, false);
addMessage(redirectAttributes, "success", "audit_success");

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

@@ -299,13 +299,12 @@ public class FileTransferCfgController extends BaseController {
}
fileTransferCfgService.saveOrUpdateFileDigestCfg(entity, result, areaCfgIds);
addMessage(redirectAttributes, "success", "save_success");
} catch (MaatConvertException e) {
logger.error("文件摘要配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
} catch (Exception e) {
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
} else {
addMessage(redirectAttributes, "error", "save_failed");
}
logger.error("文件摘要配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
}
return "redirect:" + adminPath + "/ntc/fileTransfer/fileDigestList?functionId=" + entity.getFunctionId();
}
@@ -343,10 +342,9 @@ public class FileTransferCfgController extends BaseController {
HttpServletResponse response, HttpServletRequest request) {
if (!StringUtil.isEmpty(ids)) {
String[] idArray = ids.split(",");
Date auditTime = new Date();
for (String id : idArray) {
try {
fileTransferCfgService.auditFileDigestCfg(isAudit, isValid, functionId, id, auditTime);
fileTransferCfgService.auditFileDigestCfg(isAudit, isValid, functionId, id,Constants.INSERT_ACTION);
addMessage(redirectAttributes, "success", "audit_success");
} catch (Exception e) {
logger.error("File Digest配置下发失败", e);
@@ -383,7 +381,7 @@ public class FileTransferCfgController extends BaseController {
}
return "redirect:" + adminPath + "/ntc/fileTransfer/fileDigestList?functionId=" + functionId;
}
@RequestMapping(value = { "ajaxFileDigestSubIdList" })
public String ajaxFileDigestSubIdList(Model model, Long cfgId, Integer index, Integer compileId) {
FileDigestCfg cfg = fileTransferCfgService.getFileDigestSubIdCfg(cfgId, compileId);