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

1.ftp增加doLog2.增加subscribeId3.增加compileId查询

Browse Source
This commit is contained in:
zhanghongqing
2018-08-22 22:42:12 +08:00
parent 5932b68c84
commit 8884972507
9 changed files with 285 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,7 +132,7 @@ public class BasicProtocolController extends BaseController {
logger.error("基础协议信息保存失败",e);
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
// addMessage(redirectAttributes,e.getMessage());
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
addMessage(redirectAttributes,"request_service_failed");
}else {
addMessage(redirectAttributes,"save_failed");
}
@@ -169,7 +169,7 @@ public class BasicProtocolController extends BaseController {
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.info("app策略配置下发失败："+e.getMessage());;
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
addMessage(redirectAttributes,"request_service_failed");
}else {
e.printStackTrace();
logger.error("app策略配置下发失败",e);
@@ -197,7 +197,7 @@ public class BasicProtocolController extends BaseController {
logger.error("基础协议信息保存失败",e);
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
e.printStackTrace();
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
addMessage(redirectAttributes,"request_service_failed");
}else {
e.printStackTrace();
addMessage(redirectAttributes,"delete_failed");

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

@@ -97,7 +97,7 @@ public class AvContentController extends BaseController {
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.error("voip IP信息保存失败",e);
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
addMessage(redirectAttributes,"request_service_failed");
}else {
e.printStackTrace();
logger.error("voip IP信息保存失败",e);
@@ -117,7 +117,7 @@ public class AvContentController extends BaseController {
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.error("voip Account信息保存失败",e);
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
addMessage(redirectAttributes,"request_service_failed");
}else {
e.printStackTrace();
logger.error("voip Account信息保存失败",e);
@@ -175,7 +175,7 @@ public class AvContentController extends BaseController {
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.error("voip IP信息审核失败",e);
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
addMessage(redirectAttributes,"request_service_failed");
}else {
e.printStackTrace();
logger.error("voip IP信息审核失败",e);
@@ -196,7 +196,7 @@ public class AvContentController extends BaseController {
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.error("voip Account信息审核失败",e);
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
addMessage(redirectAttributes,"request_service_failed");
}else {
e.printStackTrace();
logger.error("voip Account信息审核失败",e);
@@ -221,7 +221,7 @@ public class AvContentController extends BaseController {
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.info("VOIP配置下发失败："+e.getMessage());;
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
addMessage(redirectAttributes,"request_service_failed");
}else {
e.printStackTrace();
logger.error("VOIP配置下发失败",e);
@@ -250,7 +250,7 @@ public class AvContentController extends BaseController {
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.info("VOIPAccount配置下发失败："+e.getMessage());;
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
addMessage(redirectAttributes,"request_service_failed");
}else {
e.printStackTrace();
logger.error("VOIPAccount配置下发失败",e);

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

@@ -61,7 +61,7 @@ public class FileTransferCfgController extends BaseController{
}
@RequestMapping(value = {"ftpForm"})
@RequiresPermissions(value={"fileTransfer:ftp:config"})
public String ftpForm(Model model,String ids,CfgIndexInfo entity) {
public String ftpForm(Model model,String compileIds,String ids,CfgIndexInfo entity) {
if(StringUtils.isNotBlank(ids)){
entity = fileTransferCfgService.getFtpCfg(Long.parseLong(ids));
initUpdateFormCondition(model,entity);
@@ -74,8 +74,21 @@ public class FileTransferCfgController extends BaseController{
@RequestMapping(value = {"saveFtpCfg"})
@RequiresPermissions(value={"fileTransfer:ftp:config"})
public String saveFtpCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids,
CfgIndexInfo entity) {
fileTransferCfgService.saveFtpCfg(entity);
CfgIndexInfo entity,RedirectAttributes redirectAttributes) {
try {
fileTransferCfgService.saveFtpCfg(entity);
addMessage(redirectAttributes,"save_success");
} catch (Exception e) {
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.error("ftp信息保存失败",e);
addMessage(redirectAttributes,"request_service_failed");
}else {
e.printStackTrace();
logger.error("ftp信息保存失败",e);
addMessage(redirectAttributes,"save_failed");
}
}
return "redirect:" + adminPath +"/ntc/fileTransfer/ftpList?functionId="+entity.getFunctionId();
}
@RequestMapping(value = {"ajaxFtpSubList"})
@@ -100,15 +113,45 @@ public class FileTransferCfgController extends BaseController{
}
}
}
//查询关键字
if(cfg.getNtcSubscribeIdCfgList()!=null){
String cfgType = null;
for(NtcSubscribeIdCfg ntc:cfg.getNtcSubscribeIdCfgList()){
if(!ntc.getCfgType().equals(cfgType)){
tabList.add(new String[]{"2",ntc.getCfgType()});
cfgType = ntc.getCfgType();
}
}
}
model.addAttribute("_cfg", cfg);
model.addAttribute("index", index);
model.addAttribute("tabList", tabList);
return "/cfg/fileTransfer/ftpSubList";
}
/**
* 做删除操作
* @param isValid
* @param ids
* @param functionId
* @return
*/
@RequestMapping(value = {"updateFtpCfgValid"})
@RequiresPermissions(value={"fileTransfer:ftp:config"})
public String updateFtpCfgValid(Integer isValid,String ids,Integer functionId) {
fileTransferCfgService.updateFtpCfgValid(isValid,ids,functionId);
public String updateFtpCfgValid(Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
try {
fileTransferCfgService.updateFtpCfgValid(isValid,ids,functionId);
addMessage(redirectAttributes,"delete_success");
} catch (Exception e) {
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.info("ftp配置删除失败："+e.getMessage());;
addMessage(redirectAttributes,"request_service_failed");
}else {
e.printStackTrace();
logger.error("ftp配置删除失败",e);
addMessage(redirectAttributes,"delete_failed");
}
}
return "redirect:" + adminPath +"/ntc/fileTransfer/ftpList?functionId="+functionId;
}
@RequestMapping(value = {"auditFtpCfg"})
@@ -125,10 +168,17 @@ public class FileTransferCfgController extends BaseController{
entity.setFunctionId(functionId);
try {
fileTransferCfgService.auditFtpCfg(entity,isAudit);
addMessage(redirectAttributes,"audit_success");
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("ftp配置下发失败："+e.getMessage());
addMessage(redirectAttributes, e.getMessage());
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.info("ftp配置下发失败："+e.getMessage());;
addMessage(redirectAttributes,"request_service_failed");
}else {
e.printStackTrace();
logger.error("ftp配置下发失败",e);
addMessage(redirectAttributes,"audit_failed");
}
}
}
return "redirect:" + adminPath +"/ntc/fileTransfer/ftpList?functionId="+functionId;