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

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

Browse Source 
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	证书颁发机构及 吊销列表功能提交
This commit is contained in:
duandongmei
2018-11-08 19:50:04 +08:00
parent 7a77f0ebcf 837574cd70
commit e59d98499e
181 changed files with 11974 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -831,7 +831,7 @@ public class BaseController {
if (entry.getCfgId() != null) {
params.put("searchCfgId", entry.getCfgId());
}
if (entry.getOrderBy() != null&&entry.getOrderBy()!="") {
if (StringUtils.isNotBlank(entry.getOrderBy())) {
params.put("orderBy", entry.getOrderBy());
}
}

80
src/main/java/com/nis/web/controller/SystemController.java
View File

@@ -1,11 +1,20 @@
package com.nis.web.controller;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestMapping;
import com.nis.domain.SysMenu;
import com.nis.util.StringUtil;
import com.nis.web.security.UserUtils;
@Controller
@RequestMapping("${adminPath}/sys/")
public class SystemController extends BaseController{
@@ -14,7 +23,76 @@ public class SystemController extends BaseController{
return "/sys/sysIndex";
}
@RequestMapping("help")
public String help(HttpServletRequest request, HttpServletResponse response,ModelMap model){
List<SysMenu> menuList = UserUtils.getMenuList();
List<SysMenu> newList = new ArrayList();
for(SysMenu menu:menuList){
if(menu.getIsTop()==1 && !StringUtil.isEmpty(menu.getChildren())){
boolean topShow = false;
for(SysMenu second:menu.getChildren()){
boolean secondShow = false;
if(!StringUtil.isEmpty(second.getChildren())&&second.getIsShow()==1){
for(SysMenu third:second.getChildren()){
boolean thirdShow = false;
if(!StringUtil.isEmpty(third.getChildren())&&third.getIsShow()==1){
for(SysMenu fourth:third.getChildren()){
if(!StringUtil.isEmpty(fourth.getMenuBg())&&fourth.getIsShow()==1){
newList.add(fourth);
thirdShow = true;
secondShow = true;
}
}
}else{
if(!StringUtil.isEmpty(third.getMenuBg())&&third.getIsShow()==1){
thirdShow = true;
secondShow = true;
}
}
if(thirdShow){
newList.add(third);
}
}
if(secondShow){
newList.add(second);
topShow = true;
}
}else{
if(!StringUtil.isEmpty(second.getMenuBg())&&second.getIsShow()==1){
topShow = true;
}
}
}
if(topShow){
newList.add(menu);
}
}
/*if(menu.getChildren()!=null && menu.getChildren().size()>0 && menu.getIsShow()==1){
newList.add(menu);
}else if(menu.getMenuBg()!=null && !"".equals(menu.getMenuBg())){
newList.add(menu);
}else if(menu.getId()==1){
newList.add(menu);
}*/
/*if((menu.getParentIds().startsWith("0,1,86,")
|| menu.getId()==86
||menu.getId()==0
||menu.getId()==1)
&& menu.getIsShow()==1
){
System.out.println(menu.getParentIds());
newList.add(menu);
}*/
}
model.addAttribute("menuList",newList);
return "/help";
}
}

9
src/main/java/com/nis/web/controller/basics/AsnIpController.java
View File

@@ -163,13 +163,8 @@ public class AsnIpController extends BaseController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<AsnIpCfg> pageInfo=new Page<AsnIpCfg>(request, response,"r");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<AsnIpCfg> page = asnIpCfgService.findPage(pageInfo, entity);
for (AsnIpCfg asnIp : page.getList()) {
asnIp.setIsIssued(String.valueOf(asnIp.getIsValid()));

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

@@ -1279,15 +1279,15 @@ public class AppCfgController extends BaseController {
public String updateAppTopicDomainCfgValid(Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) {
try {
appCfgService.updateAppTopicDomainCfgValid(isValid,ids,functionId);
addMessage(redirectAttributes,"delete_success");
addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) {
logger.error("app主题网站删除失败",e);
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
e.printStackTrace();
addMessage(redirectAttributes,"request_service_failed");
addMessage(redirectAttributes,"error","request_service_failed");
}else {
e.printStackTrace();
addMessage(redirectAttributes,"delete_failed");
addMessage(redirectAttributes,"error","delete_failed");
}
}
return "redirect:" + adminPath +"/app/topicDomainCfgList?functionId="+functionId;
@@ -1360,7 +1360,7 @@ public class AppCfgController extends BaseController {
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
}
@@ -1427,7 +1427,7 @@ public class AppCfgController extends BaseController {
//ip配置导出
@RequestMapping(value = "exportIpAddr")
public void exportIp(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportIpAddr(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")AppPolicyCfg entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -1445,13 +1445,8 @@ public class AppCfgController extends BaseController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<AppPolicyCfg> pageInfo=new Page<AppPolicyCfg>(request, response,"a");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<AppPolicyCfg> page = appCfgService.findAppPolicyList(pageInfo, entity);
for(AppPolicyCfg policy:page.getList()){
SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(policy.getSpecServiceId());
@@ -1515,14 +1510,14 @@ public class AppCfgController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("ip addr export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}
//top
@RequestMapping(value = "exportTop")
public void exporttop(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportTop(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")AppTopicDomainCfg entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -1540,13 +1535,8 @@ public class AppCfgController extends BaseController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<AppTopicDomainCfg> pageInfo=new Page<AppTopicDomainCfg>(request, response,"r");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<AppTopicDomainCfg> page = appCfgService.findAppTopicDomainList(pageInfo, entity);
for (int i = 0; i < page.getList().size(); i++) {
AppTopicDomainCfg appTop=page.getList().get(i);
@@ -1555,21 +1545,21 @@ public class AppCfgController extends BaseController {
}
titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), AppTopicDomainCfg.class);
String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,action,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,block_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
dataMap.put(entity.getMenuNameCode(), page.getList());
/*}*/
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("top export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}
//appIp配置导出
@RequestMapping(value = "exportAppIp")
public void exportAppip(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportAppIp(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")AppIpCfg entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -1589,13 +1579,8 @@ public class AppCfgController extends BaseController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<AppIpCfg> pageInfo=new Page<AppIpCfg>(request, response,"r");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<AppIpCfg> page = appCfgService.findAppIpList(pageInfo, entity);
for(AppIpCfg appIp:page.getList()){
SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(appIp.getSpecServiceId());
@@ -1603,14 +1588,14 @@ public class AppCfgController extends BaseController {
}
titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), AppIpCfg.class);
String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,action,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,block_type,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
dataMap.put(entity.getMenuNameCode(), page.getList());
/*}*/
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("appIp export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}
@@ -1637,13 +1622,8 @@ public class AppCfgController extends BaseController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<AppHttpCfg> pageInfo=new Page<AppHttpCfg>(request, response,"r");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<AppHttpCfg> page = appCfgService.findAppHttpList(pageInfo, entity);
for(AppHttpCfg http:page.getList()){
http.setIsHex(http.getIsHexbin());
@@ -1655,14 +1635,14 @@ public class AppCfgController extends BaseController {
titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), AppHttpCfg.class);
String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,action,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,block_type,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
dataMap.put(entity.getMenuNameCode(), page.getList());
/*}*/
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("http export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}
@@ -1689,13 +1669,8 @@ public class AppCfgController extends BaseController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<AppDomainCfg> pageInfo=new Page<AppDomainCfg>(request, response,"r");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<AppDomainCfg> page = appCfgService.findAppDomainList(pageInfo, entity);
for(AppDomainCfg domain:page.getList()){
domain.setIsHex(domain.getIsHexbin());
@@ -1706,14 +1681,14 @@ public class AppCfgController extends BaseController {
titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), AppDomainCfg.class);
String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,action,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,block_type,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
dataMap.put(entity.getMenuNameCode(), page.getList());
/*}*/
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("http export failed",e);
addMessage(redirectAttributes, "export_failed");
logger.error("Domain export failed",e);
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}
@@ -1740,13 +1715,8 @@ public class AppCfgController extends BaseController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<AppSslCertCfg> pageInfo=new Page<AppSslCertCfg>(request, response,"r");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<AppSslCertCfg> page = appCfgService.findAppSslList(pageInfo, entity);
for(AppSslCertCfg ssl:page.getList()){
ssl.setIsHex(ssl.getIsHexbin());
@@ -1757,14 +1727,14 @@ public class AppCfgController extends BaseController {
}
titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), AppSslCertCfg.class);
String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,action,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,block_type,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
dataMap.put(entity.getMenuNameCode(), page.getList());
/*}*/
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("App ssl export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

61
src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java
View File

@@ -260,7 +260,7 @@ public class AppFeatureCfgController extends BaseController {
//appfeature配置导出
@RequestMapping(value = "exportFeature")
public void exportAppSsl(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportFeature(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")AppFeatureIndex entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -280,24 +280,19 @@ public class AppFeatureCfgController extends BaseController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<AppFeatureIndex> pageInfo=new Page<AppFeatureIndex>(request, response,"r");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<AppFeatureIndex> page = appMultiFeatureCfgService.findAppFeatureIndexList(pageInfo, entity);
for(AppFeatureIndex feature:page.getList()){
SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(feature.getSpecServiceId());
feature.setAppName(app.getSpecServiceName());
}
String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,action,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
String appComplexNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,block_type,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
String appComplexNoExport=",do_log,block_type,config_describe,valid_identifier,is_audit,creator,creator"
+ ",config_time,editor,edit_time,auditor,audit_time"
+",letter,whether_area_block,classification,attribute,label"
+",userregion1,userregion2,userregion3,userregion4,userregion5,";
String ipPortInfoNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
String ipPortInfoNoExport=",do_log,block_type,config_describe,valid_identifier,is_audit,creator,creator"
+ ",config_time,editor,edit_time,auditor,audit_time"
+",letter,whether_area_block,classification,attribute,label"
+",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,";
@@ -306,52 +301,59 @@ public class AppFeatureCfgController extends BaseController {
noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
List<IpPortCfg> ipList=new ArrayList<IpPortCfg>();
List<AppComplexFeatureCfg> keywordList=new ArrayList<AppComplexFeatureCfg>();
List<AppStringFeatureCfg> strList=new ArrayList<AppStringFeatureCfg>();
for (AppFeatureIndex cfg : page.getList()) {
Map<String, List> maps=appMultiFeatureCfgService.exportFeature(cfg);
keywordList.addAll(maps.get("APP_KEYWORDS"));
if(entity.getFunctionId()!=567){
keywordList.addAll(maps.get("APP_KEYWORDS"));
}else{
strList.addAll(maps.get("APP_DK_GL"));
}
ipList.addAll(maps.get("APP_IP_RANGE"));
}
keywordList=replaceKeyList(keywordList);
dataMap.put(entity.getMenuNameCode(), page.getList());
if(entity.getFunctionId()!=564 && entity.getFunctionId()!=567 ){
keywordList=replaceKeyList(keywordList);
titleList.add("APP_IP_RANGE");
classMap.put("APP_IP_RANGE", IpPortCfg.class);
noExportMap.put("APP_IP_RANGE",ipPortInfoNoExport);
dataMap.put("APP_IP_RANGE", ipList);
if(entity.getFunctionId()==563){
}
if(entity.getFunctionId()==563){
titleList.add("APP_PAYLOAD");
classMap.put("APP_PAYLOAD", AppComplexFeatureCfg.class);
noExportMap.put("APP_PAYLOAD",appComplexNoExport);
dataMap.put("APP_PAYLOAD", keywordList);
}else if(entity.getFunctionId()==565){
}else if(entity.getFunctionId()==565){
titleList.add("APP_HTTP");
classMap.put("APP_HTTP", AppComplexFeatureCfg.class);
noExportMap.put("APP_HTTP",appComplexNoExport);
dataMap.put("APP_HTTP", keywordList);
}else if(entity.getFunctionId()==566){
}else if(entity.getFunctionId()==566){
titleList.add("APP_SSL");
classMap.put("APP_SSL", AppComplexFeatureCfg.class);
noExportMap.put("APP_SSL",appComplexNoExport);
dataMap.put("APP_SSL", keywordList);
}else if(entity.getFunctionId()==564){
}else if(entity.getFunctionId()==564){
keywordList=replaceKeyList(keywordList);
titleList.add("APP_DNS");
classMap.put("APP_DNS", AppComplexFeatureCfg.class);
noExportMap.put("APP_DNS",appComplexNoExport);
dataMap.put("APP_DNS", keywordList);
}else if(entity.getFunctionId()==567){
}else if(entity.getFunctionId()==567){
strList=replaceFeatureList(strList);
appComplexNoExport=appComplexNoExport+"district,";
titleList.add("APP_DK_GL");
classMap.put("APP_DK_GL", AppComplexFeatureCfg.class);
noExportMap.put("APP_DK_GL",appComplexNoExport);
dataMap.put("APP_DK_GL", keywordList);
}
titleList.add("APP_DK");
classMap.put("APP_DK", AppStringFeatureCfg.class);
noExportMap.put("APP_DK",appComplexNoExport);
dataMap.put("APP_DK", strList);
}
/*}*/
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("Appfeature export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}
@@ -366,4 +368,15 @@ public class AppFeatureCfgController extends BaseController {
return list;
}
public static List<AppStringFeatureCfg> replaceFeatureList(List<AppStringFeatureCfg> list){
for (int i = 0; i < list.size(); i++) {
AppStringFeatureCfg base=(AppStringFeatureCfg)list.get(i);
base.setIsHex(base.getIsHexbin());
base.setIsCaseInsenstive(base.getIsHexbin());
base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," "));
}
return list;
}
}

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

@@ -201,7 +201,7 @@ public class BasicProtocolController extends BaseController {
public String updateAppPolicyCfgValid(Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) {
try {
appCfgService.updateAppPolicyCfgValid(isValid,ids,functionId);
addMessage(redirectAttributes,"delete_success");
addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) {
logger.error("基础协议信息保存失败",e);
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
@@ -217,7 +217,7 @@ public class BasicProtocolController extends BaseController {
//ip配置导出
@RequestMapping(value = "exportIpAddr")
public void exportIp(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportIpAddr(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")AppPolicyCfg entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -235,13 +235,8 @@ public class BasicProtocolController extends BaseController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<AppPolicyCfg> pageInfo=new Page<AppPolicyCfg>(request, response,"a");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<AppPolicyCfg> page = appCfgService.findAppPolicyList(pageInfo, entity);
for(AppPolicyCfg policy:page.getList()){
SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(policy.getSpecServiceId());
@@ -284,7 +279,7 @@ public class BasicProtocolController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("ip addr export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

13
src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java
View File

@@ -234,7 +234,7 @@ public class EncryptedTunnelBehaviorController extends BaseController {
//ip配置导出
@RequestMapping(value = "exportIpAddr")
public void exportIp(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportIpAddr(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")AppPolicyCfg entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -252,13 +252,8 @@ public class EncryptedTunnelBehaviorController extends BaseController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<AppPolicyCfg> pageInfo=new Page<AppPolicyCfg>(request, response,"a");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<AppPolicyCfg> page = appCfgService.findAppPolicyList(pageInfo, entity);
for(AppPolicyCfg policy:page.getList()){
SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(policy.getSpecServiceId());
@@ -322,7 +317,7 @@ public class EncryptedTunnelBehaviorController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("TunnelBehavior export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

4
src/main/java/com/nis/web/controller/configuration/GroupAreaController.java
View File

@@ -84,10 +84,10 @@ public class GroupAreaController extends BaseController {
public String delete(RedirectAttributes redirectAttributes, String ids,int isValid) {
try {
groupAreaService.deldete(ids,isValid);
addMessage(redirectAttributes, "delete_success");
addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) {
logger.error("删除失败",e);
addMessage(redirectAttributes, "delete_failed");
addMessage(redirectAttributes,"error","delete_failed");
}
return "redirect:" + adminPath + "/cfg/groupArea/groupAreaList";
}

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

@@ -63,22 +63,22 @@ public class RequestInfoController extends BaseController{
// 保存用户信息
logger.info(requestInfo.getId()+"修改成功");
requestInfoService.saveOrUpdate(requestInfo);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success","save_success");
}else{
if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){
logger.info(requestInfo.getRequestNumber()+"重复数据");
addMessage(model, "save_failed");
addMessage(model,"error","save_failed");
return form(requestInfo, model);
}
// 保存用户信息
requestInfoService.saveOrUpdate(requestInfo);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success","save_success");
logger.info(requestInfo.getId()+"保存成功");
}
} catch (Exception e) {
logger.error(e.getMessage());
e.printStackTrace();
addMessage(model, "save_failed");
addMessage(model,"error","save_failed");
}
return "redirect:" + adminPath + "/cfg/request/list?repage";
}
@@ -105,7 +105,7 @@ public class RequestInfoController extends BaseController{
public String requestExamine(String ids, Model model,RedirectAttributes redirectAttributes){
String[] exId = ids.split(",");
requestInfoService.requestExamine(exId);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success","save_success");
return "redirect:" + adminPath + "/cfg/request/list?repage";
}
@@ -119,7 +119,7 @@ public class RequestInfoController extends BaseController{
public String requestExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
String[] noId = ids.split(",");
requestInfoService.requestExamineNo(noId);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success","save_success");
return "redirect:" + adminPath + "/cfg/request/list?repage";
}
@@ -133,7 +133,7 @@ public class RequestInfoController extends BaseController{
public String requestCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
String[] canclelId = ids.split(",");
requestInfoService.requestCancelExamine(canclelId);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success","save_success");
return "redirect:" + adminPath + "/cfg/request/list?repage";
}
@@ -147,7 +147,7 @@ public class RequestInfoController extends BaseController{
public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
String[] delId = ids.split(",");
requestInfoService.delete(delId);
addMessage(redirectAttributes, "delete_success");
addMessage(redirectAttributes,"success","delete_success");
return "redirect:" + adminPath + "/cfg/request/list?repage";
}

9
src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java
View File

@@ -147,13 +147,8 @@ public class DnsIpCfgController extends BaseController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<DnsIpCfg> pageInfo=new Page<DnsIpCfg>(request, response,"r");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<DnsIpCfg> page = dnsIpCfgService.findPage(pageInfo, entity);
for (int i = 0; i < page.getList().size(); i++) {
if(StringUtil.isEmpty(page.getList().get(i).getDnsStrategyName())){

9
src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java
View File

@@ -169,13 +169,8 @@ public class DnsResStrategyController extends BaseController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<DnsResStrategy> pageInfo=new Page<DnsResStrategy>(request, response,"r");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<DnsResStrategy> page = dnsResStrategyService.findPage(pageInfo, entity);
for (int i = 0; i < page.getList().size(); i++) {
page.getList().get(i).setMiTtlmax(String.valueOf(page.getList().get(i).getMinTtl())+"-"+String.valueOf(page.getList().get(i).getMaxTtl()));

28
src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java
View File

@@ -208,7 +208,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
for(String id :idArray){
try {
ipMultiplexPoolCfgService.audit(isAudit,isValid,functionId,id,auditTime);
} catch (MaatConvertException e) {
} catch (Exception e) {
e.printStackTrace();
logger.error("SNAT地址池管理配置下发失败："+e.getMessage());
if(e instanceof MaatConvertException) {
@@ -230,10 +230,10 @@ public class IpMultiplexPoolCfgController extends BaseController {
if(!StringUtil.isEmpty(ids)){
ipMultiplexPoolCfgService.delete(isAudit,isValid,ids,functionId);
}
addMessage(redirectAttributes,"delete_success");
addMessage(redirectAttributes,"success","delete_success");
}catch(Exception e){
logger.error(e);
addMessage(redirectAttributes,"delete_failed");
addMessage(redirectAttributes,"error","delete_failed");
}
return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+functionId;
}
@@ -285,13 +285,8 @@ public class IpMultiplexPoolCfgController extends BaseController {
}else{*/
//条件导出数据大于最大导出数，只导出最大导出条数
Page<IpMultiplexPoolCfg> pageInfo=new Page<IpMultiplexPoolCfg>(request, response,"r");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<IpMultiplexPoolCfg> page = ipMultiplexPoolCfgService.findPage(pageInfo, entity);
page.setList(ipMultiplexPoolCfgService.getIsp(page.getList()));
titleList.add(entity.getMenuNameCode());
@@ -303,7 +298,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("snat export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}
@@ -329,13 +324,8 @@ public class IpMultiplexPoolCfgController extends BaseController {
}else{*/
//条件导出数据大于最大导出数，只导出最大导出条数
Page<IpMultiplexPoolCfg> pageInfo=new Page<IpMultiplexPoolCfg>(request, response,"r");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<IpMultiplexPoolCfg> page = ipMultiplexPoolCfgService.findPage(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), IpMultiplexPoolCfg.class);
@@ -346,7 +336,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("dnat export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

13
src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java
View File

@@ -129,24 +129,19 @@ public class DdosCfgController extends BaseController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<DdosIpCfg> pageInfo=new Page<DdosIpCfg>(request, response,"r");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<DdosIpCfg> page = ddosCfgService.findPage(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), DdosIpCfg.class);
String cfgIndexInfoNoExport=",client_ip,client_port,server_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
String cfgIndexInfoNoExport=",client_ip,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
dataMap.put(entity.getMenuNameCode(), page.getList());
/*}*/
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("ddos export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

22
src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java
View File

@@ -223,13 +223,8 @@ public class IpMultiplexController extends CommonController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<BaseIpCfg> pageInfo=new Page<BaseIpCfg>(request, response,"r");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<BaseIpCfg> page = ipCfgService.findPage(pageInfo, entity);//
for (BaseIpCfg baseIp : page.getList()) {
if(StringUtil.isEmpty(baseIp.getGroupName())){
@@ -246,7 +241,7 @@ public class IpMultiplexController extends CommonController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("snat export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}
@@ -274,13 +269,8 @@ public class IpMultiplexController extends CommonController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<BaseIpCfg> pageInfo=new Page<BaseIpCfg>(request, response,"r");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<BaseIpCfg> page = ipCfgService.findPage(pageInfo, entity);//
for (BaseIpCfg baseIp : page.getList()) {
if(StringUtil.isEmpty(baseIp.getGroupName())){
@@ -297,7 +287,7 @@ public class IpMultiplexController extends CommonController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("dnat export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

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

@@ -209,7 +209,7 @@ public class AvContentController extends BaseController {
for(String id :idArray){
try {
avContentCfgService.auditAvVoip(isAudit,isValid,functionId,id,auditTime);
} catch (MaatConvertException e) {
} catch ( Exception e) {
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.error("VOIP配置下发失败："+e.getMessage());;
@@ -563,7 +563,7 @@ public class AvContentController extends BaseController {
,HttpServletResponse response
,@ModelAttribute("cfg")CfgIndexInfo entity
,RedirectAttributes redirectAttributes){
if(entity.getIpPort()== null){
/*if(entity.getIpPort()== null){
entity.setIpPort(new IpPortCfg());
}
if(entity.getAvContUrlCfgList()== null){
@@ -571,7 +571,7 @@ public class AvContentController extends BaseController {
}
if(entity.getNtcSubscribeIdCfg()==null){
entity.setNtcSubscribeIdCfg(new NtcSubscribeIdCfg());
}
}*/
Page<CfgIndexInfo> page = avContentCfgService.findPage(new Page<CfgIndexInfo>(request, response,"r"), entity);
model.addAttribute("page", page);
initPageCondition(model,entity);
@@ -616,11 +616,11 @@ public class AvContentController extends BaseController {
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.error("Stream Media 信息保存失败",e);
addMessage(redirectAttributes,"request_service_failed");
addMessage(redirectAttributes,"error","request_service_failed");
}else {
e.printStackTrace();
logger.error("Stream Media 信息保存失败",e);
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
}
return "redirect:" + adminPath +"/ntc/av/contUrlList?functionId="+cfg.getFunctionId();
@@ -902,7 +902,7 @@ public class AvContentController extends BaseController {
//stream配置导出
@RequestMapping(value = "exportStream")
public void exportsteam(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportStream(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -922,13 +922,8 @@ public class AvContentController extends BaseController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"r");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
if(entity.getIpPort()== null){
entity.setIpPort(new IpPortCfg());
}
@@ -992,7 +987,7 @@ public class AvContentController extends BaseController {
//voip配置导出
@RequestMapping(value = "exportVoip")
public void exportvoip(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportVoip(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -1012,13 +1007,8 @@ public class AvContentController extends BaseController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"r");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
if(entity.getIpPort()== null){
entity.setIpPort(new IpPortCfg());
}

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

@@ -469,7 +469,7 @@ public class AvController extends BaseController {
//ysp配置导出
@RequestMapping(value = "exportYsp")
public void exportysp(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportYsp(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")AvFileSampleCfg entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -489,13 +489,8 @@ public class AvController extends BaseController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<AvFileSampleCfg> pageInfo=new Page<AvFileSampleCfg>(request, response,"a");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<AvFileSampleCfg> page = avCfgService.getAvFileSampleList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), AvFileSampleCfg.class);

13
src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java
View File

@@ -157,7 +157,7 @@ public class BgpCfgController extends BaseController{
//bgp配置导出
@RequestMapping(value = "exportbgp")
public void exportdns(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportbgp(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -177,13 +177,8 @@ public class BgpCfgController extends BaseController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = bgpCfgService.getBgpList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
titleList.add("NTC_IP");
@@ -229,7 +224,7 @@ public class BgpCfgController extends BaseController{
/*}*/
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("dns export failed",e);
logger.error("bgp export failed",e);
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();

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

@@ -85,11 +85,11 @@ public class FileTransferCfgController extends BaseController{
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.error("ftp信息保存失败",e);
addMessage(redirectAttributes,"request_service_failed");
addMessage(redirectAttributes,"error","request_service_failed");
}else {
e.printStackTrace();
logger.error("ftp信息保存失败",e);
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
}
return "redirect:" + adminPath +"/ntc/fileTransfer/ftpList?functionId="+entity.getFunctionId();
@@ -148,11 +148,11 @@ public class FileTransferCfgController extends BaseController{
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.info("ftp配置删除失败："+e.getMessage());;
addMessage(redirectAttributes,"request_service_failed");
addMessage(redirectAttributes,"error","request_service_failed");
}else {
e.printStackTrace();
logger.error("ftp配置删除失败",e);
addMessage(redirectAttributes,"delete_failed");
addMessage(redirectAttributes,"error","delete_failed");
}
}
return "redirect:" + adminPath +"/ntc/fileTransfer/ftpList?functionId="+functionId;
@@ -171,16 +171,16 @@ public class FileTransferCfgController extends BaseController{
entity.setFunctionId(functionId);
try {
fileTransferCfgService.auditFtpCfg(entity,isAudit);
addMessage(redirectAttributes,"audit_success");
} catch (MaatConvertException e) {
addMessage(redirectAttributes,"success","audit_success");
} catch ( Exception e) {
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.error("ftp配置下发失败："+e.getMessage());;
addMessage(redirectAttributes,"request_service_failed");
addMessage(redirectAttributes,"error","request_service_failed");
}else {
e.printStackTrace();
logger.error("ftp配置下发失败",e);
addMessage(redirectAttributes,"audit_failed");
addMessage(redirectAttributes,"error","audit_failed");
}
}
}
@@ -256,8 +256,6 @@ public class FileTransferCfgController extends BaseController{
}
fileTransferCfgService.saveOrUpdateFileDigestCfg(entity,result,areaCfgIds);
addMessage(redirectAttributes,"success","save_success");
} catch (MaatConvertException e) {
addMessage(redirectAttributes, "request_service_failed");
} catch ( Exception e) {
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","request_service_failed");
@@ -478,7 +476,7 @@ public class FileTransferCfgController extends BaseController{
//ftp配置导出
@RequestMapping(value = "exportftp")
public void exportdns(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportftp(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -498,13 +496,8 @@ public class FileTransferCfgController extends BaseController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = fileTransferCfgService.getFtpList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
titleList.add("NTC_UNIVERSAL_IP");
@@ -559,14 +552,14 @@ public class FileTransferCfgController extends BaseController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("ftp export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}
//p2p配置导出
@RequestMapping(value = "exportP2p")
public void exportp2p(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportP2p(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -586,13 +579,8 @@ public class FileTransferCfgController extends BaseController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = fileTransferCfgService.getP2pList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
@@ -652,7 +640,7 @@ public class FileTransferCfgController extends BaseController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("p2p export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}
@@ -660,7 +648,7 @@ public class FileTransferCfgController extends BaseController{
//file配置导出
@RequestMapping(value = "exportFile")
public void exportfile(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportFile(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")FileDigestCfg entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -680,13 +668,8 @@ public class FileTransferCfgController extends BaseController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<FileDigestCfg> pageInfo=new Page<FileDigestCfg>(request, response,"a");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<FileDigestCfg> page = fileTransferCfgService.getFileDigestList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), FileDigestCfg.class);
@@ -697,7 +680,7 @@ public class FileTransferCfgController extends BaseController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("file export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

11
src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
View File

@@ -360,7 +360,7 @@ public class IpController extends BaseController{
}
//ip配置导出
@RequestMapping(value = "exportIpAddr")
public void exportIp(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportIpAddr(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -380,13 +380,8 @@ public class IpController extends BaseController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = ipCfgService.getIpCfgList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
titleList.add("NTC_IP");

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

@@ -190,7 +190,7 @@ public class MailCfgController extends BaseController{
//mail配置导出
@RequestMapping(value = "exportmail")
public void exportdns(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportmail(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -210,13 +210,8 @@ public class MailCfgController extends BaseController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = mailCfgService.getMailList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
@@ -281,7 +276,7 @@ public class MailCfgController extends BaseController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("mail export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

29
src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java
View File

@@ -557,13 +557,8 @@ public class WebsiteController extends BaseController{
}else{*/
//条件导出数据大于最大导出数，只导出最大导出条数
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = httpRedirectCfgService.getHttpRedirectList(pageInfo, entity);
String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
String httpUrlCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
@@ -685,13 +680,8 @@ public class WebsiteController extends BaseController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = websiteCfgService.getWebsiteList(pageInfo, entity);
for (int i = 0; i < page.getList().size(); i++) {
Properties msgProp = getMsgProp();
@@ -763,7 +753,7 @@ public class WebsiteController extends BaseController{
//ssl配置导出
@RequestMapping(value = "exportSsl")
public String exportssl(Model model,HttpServletRequest request,HttpServletResponse response,
public String exportSsl(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -783,13 +773,8 @@ public class WebsiteController extends BaseController{
}else{*/
//条件导出数据大于最大导出数，只导出最大导出条数
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = websiteCfgService.getWebsiteList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
titleList.add("NTC_UNIVERSAL_IP");

25
src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
View File

@@ -11,15 +11,11 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.taglibs.standard.functions.Functions;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
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.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
@@ -29,7 +25,6 @@ import com.nis.domain.configuration.HttpUrlCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.domain.configuration.template.WhiteListIpTemplate;
import com.nis.domain.specific.ConfigGroupInfo;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.StringUtil;
@@ -278,7 +273,7 @@ public class WhiteListController extends CommonController{
//ip配置导出
@RequestMapping(value = "exportIpAddr")
public void exportIp(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportIpAddr(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -298,13 +293,8 @@ public class WhiteListController extends CommonController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = ipCfgService.getIpCfgList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
titleList.add("NTC_IP");
@@ -354,13 +344,8 @@ public class WhiteListController extends CommonController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = domainService.getDomainList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
titleList.add("NTC_HTTP_URL");

17
src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
View File

@@ -251,7 +251,7 @@ public class HttpRedirectPolicyController extends BaseController{
//http配置导出
@RequestMapping(value = "exportHttp")
public String exportHttp(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportHttp(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -271,13 +271,8 @@ public class HttpRedirectPolicyController extends BaseController{
}else{*/
//条件导出数据大于最大导出数，只导出最大导出条数
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = httpRedirectCfgService.getHttpRedirectList(pageInfo, entity);
Properties prop = getMsgProp();
@@ -313,7 +308,7 @@ public class HttpRedirectPolicyController extends BaseController{
}else if(entity.getFunctionId()==208){
cfgIndexInfoNoExport=",policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:redirect_response_code-userregion2:redirect_url-";
}else if(entity.getFunctionId()==209){
cfgIndexInfoNoExport=",policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:replace_zone-userregion2:replaced_content-userregion3:replace_content-";
cfgIndexInfoNoExport=",policy_name,group_name,userregion4,userregion5,&userregion1:replace_zone-userregion2:replaced_content-userregion3:replace_content-";
}else if(entity.getFunctionId()==211){
cfgIndexInfoNoExport=",do_log,log_total,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
}
@@ -408,8 +403,8 @@ public class HttpRedirectPolicyController extends BaseController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("http export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId();
/*return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId();*/
}
}

36
src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
View File

@@ -147,7 +147,7 @@ public class InterceptController extends CommonController{
entity.setFunctionId(functionId);
try {
interceptCfgService.auditInterceptIpCfg(entity,isAudit);
addMessage(redirectAttributes,"audit_success");
addMessage(redirectAttributes,"success","audit_success");
} catch ( Exception e) {
logger.error("intercept ip audit failed",e);
if(e instanceof MaatConvertException) {
@@ -164,10 +164,10 @@ public class InterceptController extends CommonController{
public String updateInterceptIpValid(Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
try {
interceptCfgService.updatInterceptValid(isValid,ids,functionId);
addMessage(redirectAttributes,"delete_success");
addMessage(redirectAttributes,"error","delete_success");
} catch (Exception e) {
logger.error("intercept ip delete failed",e);
addMessage(redirectAttributes,"delete_failed");
addMessage(redirectAttributes,"error","delete_failed");
}
return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+functionId;
}
@@ -196,7 +196,7 @@ public class InterceptController extends CommonController{
//ip配置导出
@RequestMapping(value = "exportIpAddr")
public void exportIp(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportIpAddr(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -217,13 +217,8 @@ public class InterceptController extends CommonController{
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<CfgIndexInfo> page = ipCfgService.getIpCfgList(pageInfo, entity);
//获取证书信息
@@ -242,12 +237,21 @@ public class InterceptController extends CommonController{
}
if(certificateList!=null){
if(entity.getFunctionId()==200|| entity.getFunctionId()==201){
if(!StringUtil.isEmpty(str.getUserRegion1())){
boolean flag=false;
for (PxyObjKeyring pxyObjKeyring : certificateList) {
if(str.getUserRegion2().equals(pxyObjKeyring.getCompileId())){
str.setUserRegion2(pxyObjKeyring.getCfgDesc());
}
if(str.getUserRegion1().equals(String.valueOf(pxyObjKeyring.getCompileId()))){
str.setUserRegion1(pxyObjKeyring.getCfgDesc());
flag=true;
break;
}
}
if(!flag){
str.setUserRegion1(null);
}
}
}
}
}
}
titleList.add(entity.getMenuNameCode());
@@ -307,7 +311,7 @@ public class InterceptController extends CommonController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("ip addr export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

12
src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
View File

@@ -120,7 +120,11 @@ public class PxyObjKeyringController extends BaseController {
} catch (Exception e) {
validFlag=false;
logger.error("证书文件校验失败",e);
addMessage(redirectAttributes,"error",e.getMessage());
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}
}
try{
@@ -163,7 +167,11 @@ public class PxyObjKeyringController extends BaseController {
}catch (Exception e) {
validFlag=false;
logger.error("证书信息获取失败",e);
addMessage(redirectAttributes,"error","save_failed");
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}
}
try{
if(validFlag){

29
src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java
View File

@@ -86,6 +86,29 @@ public class TrafficStatisticsReportController extends BaseController {
List accountList=(List) map.get("accountList");
model.addAttribute("nasIpList", nasIpList);
model.addAttribute("accountList", accountList);
if(StringUtil.isBlank(account)&&accountList!=null&&accountList.size()>0&&!"3".equals(searchBusinessType)) {
Map accountMap = (Map) accountList.get(0);
String firstAccount=(String) accountMap.get("account");
String userString = HttpClientUtil.get(userUrl+"&searchAccount="+firstAccount);
// 指定用户 查询
Gson usergson = new GsonBuilder().create();
userJsonList = usergson.fromJson(userString, new TypeToken<Map>(){}.getType());
userList = (ArrayList) userJsonList.get("data");
model.addAttribute("userList", userList);
model.addAttribute("searchAccount", firstAccount);
}
if(StringUtil.isBlank(nasIp)&&nasIpList!=null&&nasIpList.size()>0&&!"2".equals(searchBusinessType)) {
Map IpMap = (Map) nasIpList.get(0);
String firstIp=(String) IpMap.get("nasIp");
String ipString = HttpClientUtil.get(ipUrl+"&searchNasIp="+firstIp);
// 指定IP查询
Gson ipgson = new GsonBuilder().create();
ipJsonList = ipgson.fromJson(ipString, new TypeToken<Map>(){}.getType());
ipList = (ArrayList) ipJsonList.get("data");
model.addAttribute("ipList", ipList);
model.addAttribute("searchNasIp", firstIp);
}
if("2".endsWith(searchBusinessType)&&!StringUtil.isBlank(account)) {
String userString = HttpClientUtil.get(userUrl+"&searchAccount="+account);
@@ -94,6 +117,7 @@ public class TrafficStatisticsReportController extends BaseController {
userJsonList = usergson.fromJson(userString, new TypeToken<Map>(){}.getType());
userList = (ArrayList) userJsonList.get("data");
model.addAttribute("userList", userList);
model.addAttribute("searchAccount", account);
}
if ("3".endsWith(searchBusinessType)&&!StringUtil.isBlank(nasIp)) {
String ipString = HttpClientUtil.get(ipUrl+"&searchNasIp="+nasIp);
@@ -102,13 +126,14 @@ public class TrafficStatisticsReportController extends BaseController {
ipJsonList = ipgson.fromJson(ipString, new TypeToken<Map>(){}.getType());
ipList = (ArrayList) ipJsonList.get("data");
model.addAttribute("ipList", ipList);
model.addAttribute("searchNasIp", nasIp);
}
} catch (Exception e) {
e.printStackTrace();
}
return "/dashboard/trafficUserBehavior";
}
public static void main(String[] args) {
/* public static void main(String[] args) {
Map<String, Object> fromJsonList = new HashMap<String, Object>();
HashMap<String, Object> m = new HashMap<String, Object>();
List list = new ArrayList();
@@ -128,5 +153,5 @@ public class TrafficStatisticsReportController extends BaseController {
e.printStackTrace();
}
}
*/
}

4
src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java
View File

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.http.client.ClientProtocolException;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -81,7 +82,8 @@ public class DkBehaviorLogController extends BaseController{
if (fromJson.getStatus().intValue() == 200) {
Page<DkBehaviorLog> data = fromJson.getData();
page.setList(data.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});
page.setList(fromJson.getData().getList());
List<DkBehaviorLog> list = page.getList();
for (DkBehaviorLog l : list) {
l.setFunctionId(entry.getFunctionId());

2
src/main/java/com/nis/web/controller/log/ntc/AppLogController.java
View File

@@ -75,7 +75,7 @@ public class AppLogController extends BaseController{
if (fromJson.getStatus().intValue() == 200) {
Page<NtcAppLog> data = fromJson.getData();
page.setList(data.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<NtcAppLog> list = page.getList();
for (NtcAppLog l : list) {
l.setFunctionId(entry.getFunctionId());

3
src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java
View File

@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -50,7 +51,7 @@ public class BgpLogController extends BaseController {
Gson gson = new GsonBuilder().create();
LogRecvData<NtcBGPLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcBGPLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
page.setList(fromJson.getData().getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<NtcBGPLog> list = page.getList();
for (NtcBGPLog l : list) {
l.setFunctionId(log.getFunctionId());

156
src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java Normal file
View File

@@ -0,0 +1,156 @@
package com.nis.web.controller.log.ntc;
import java.io.IOException;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.client.ClientProtocolException;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import com.google.gson.reflect.TypeToken;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.PageLog;
import com.nis.domain.log.NtcCollectVoipLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.CodeDicUtils;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.DictUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.dao.dashboard.codedic.CodeResult;
@Controller
@RequestMapping(value = "${adminPath}/log/ntc/ntcCollectVoipLogs")
public class CollectVoipLogController extends BaseController{
/**
* voip泛收日志
* @param model
* @param entry
* @param request
* @param response
* @return
* @throws ClientProtocolException
* @throws IOException
*/
@RequestMapping(value={"list",""})
public String list(Model model,@ModelAttribute("log")NtcCollectVoipLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
try {
PageLog<NtcCollectVoipLog> page = new PageLog<NtcCollectVoipLog>(request, response);
Map<String, Object> params=new HashMap<>();
params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo());
//查询值判断
if (StringUtils.isNotBlank(entry.getSearchFoundStartTime())
&& StringUtils.isNotBlank(entry.getSearchFoundEndTime())) {
params.put("searchFoundStartTime", entry.getSearchFoundStartTime());
params.put("searchFoundEndTime", entry.getSearchFoundEndTime());
} else {
// 判断是否是从配置界面过来的日志查询
if (StringUtils.isNotBlank(entry.getIsLogTotalSearch())) {
Calendar time = Calendar.getInstance();
time.add(Calendar.MINUTE, -5);
String searchEndTime = DateUtils.formatDateTime(time.getTime());
params.put("searchFoundEndTime", searchEndTime);
entry.setSearchFoundEndTime(searchEndTime);
time.add(Calendar.MINUTE, -5);
String searchStartTime = DateUtils.formatDateTime(time.getTime());
params.put("searchFoundStartTime", searchStartTime);
entry.setSearchFoundStartTime(searchStartTime);
} else {
// 设置默认查询当前时间及前五分钟
String endTime = DateUtils.getDateTime();
Date dateStart = new Date(new Date().getTime() - Constants.LOG_TIME_INTERVAL);
String startTime = DateUtils.formatDateTime(dateStart);
params.put("searchFoundStartTime", startTime);
params.put("searchFoundEndTime", endTime);
entry.setSearchFoundStartTime(startTime);
entry.setSearchFoundEndTime(endTime);
}
logger.info("searchFoundStartTime：" + params.get("searchFoundStartTime"));
logger.info("searchFoundEndTime：" + params.get("searchFoundEndTime"));
}
if (StringUtils.isNotBlank(entry.getVoipProtocol())) {
params.put("searchVoipProtocol", entry.getVoipProtocol());
}
if (StringUtils.isNotBlank(entry.getRtpDIp())) {
params.put("searchRtpDIp", entry.getRtpDIp());
}
if (StringUtils.isNotBlank(entry.getCapIp())) {
params.put("searchRtpSIp", entry.getCapIp());
}
if (StringUtils.isNotBlank(entry.getSipDIp())) {
params.put("searchSipDIp", entry.getSipDIp());
}
if (StringUtils.isNotBlank(entry.getSipSIp())) {
params.put("searchSipSIp", entry.getSipSIp());
}
if (StringUtils.isNotBlank(entry.getOrderBy())) {
params.put("orderBy", entry.getOrderBy());
}
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
model.addAttribute("serviceList", serviceList);
//获取字典信息
List<CodeResult> protocolList=CodeDicUtils.getCodeList("protocolCode");
List<CodeResult> behaviorList=CodeDicUtils.getCodeList("behaviorCode");
List<CodeResult> appList=CodeDicUtils.getCodeList("appCode");
model.addAttribute("protocolList", protocolList);
model.addAttribute("behaviorList", behaviorList);
model.addAttribute("appList", appList);
String url = "";
url = Constants.LOG_BASE_URL+Constants.NTC_COLLECT_VOIP_LOG;
String jsonString = HttpClientUtil.getMsg(url,params,request);
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(Date.class, new JsonDeserializer<Date>() {
public Date deserialize(JsonElement json, java.lang.reflect.Type typeOfT,
JsonDeserializationContext context) throws JsonParseException {
return new Date(json.getAsJsonPrimitive().getAsLong());
}
});
Gson gson = builder.setDateFormat("yyyy-MM-dd HH:mm:ss").create();
//gson泛型支持
LogRecvData<NtcCollectVoipLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<NtcCollectVoipLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
Page<NtcCollectVoipLog> data = fromJson.getData();
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});
page.setList(fromJson.getData().getList());
model.addAttribute("page", page);
logger.info("查询VoIP泛收日志成功");
}
} catch (Exception e) {
logger.error("查询VoIP泛收日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/ntc/collectVoipList";
}
}

6
src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java
View File

@@ -1,7 +1,6 @@
package com.nis.web.controller.log.ntc;
import java.io.IOException;
import java.sql.Timestamp;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -11,6 +10,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.http.client.ClientProtocolException;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -23,7 +23,6 @@ import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import com.google.gson.reflect.TypeToken;
import com.google.protobuf.DescriptorProtos.FieldDescriptorProto.Type;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.PageLog;
@@ -33,7 +32,6 @@ import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.sun.jna.platform.win32.OaIdl.DATE;
@Controller
@RequestMapping(value = "${adminPath}/log/ntc/ntcDdosLogs")
@@ -87,7 +85,7 @@ public class DdosLogController extends BaseController{
if (fromJson.getStatus().intValue() == 200) {
Page<NtcDdosLog> data = fromJson.getData();
page.setList(data.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<NtcDdosLog> list = page.getList();
for (NtcDdosLog l : list) {
l.setFunctionId(entry.getFunctionId());

2
src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java
View File

@@ -56,7 +56,7 @@ public class DnsLogController extends BaseController {
LogRecvData<NtcDnsLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcDnsLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
// BeanUtils.copyProperties(fromJson.getData(), page);
page.setList(fromJson.getData().getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<NtcDnsLog> list = page.getList();
for (NtcDnsLog l : list) {
l.setFunctionId(log.getFunctionId());

2
src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java
View File

@@ -68,7 +68,7 @@ public class FtpLogController extends BaseController{
if (fromJson.getStatus().intValue() == 200) {
// BeanUtils.copyProperties(fromJson.getData(), page);
Page<NtcFtpLog> data = fromJson.getData();
page.setList(data.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<NtcFtpLog> list = page.getList();
for (NtcFtpLog l : list) {
l.setFunctionId(entry.getFunctionId());

2
src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java
View File

@@ -56,7 +56,7 @@ public class HttpKeyLogController extends BaseController {
LogRecvData<NtcKeywordsUrlLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcKeywordsUrlLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
Page<NtcKeywordsUrlLog> data = fromJson.getData();
page.setList(data.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<NtcKeywordsUrlLog> list = page.getList();
for (NtcKeywordsUrlLog l : list) {
l.setFunctionId(log.getFunctionId());

2
src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java
View File

@@ -55,7 +55,7 @@ public class HttpLogController extends BaseController {
LogRecvData<NtcHttpLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcHttpLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
Page<NtcHttpLog> data = fromJson.getData();
page.setList(data.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<NtcHttpLog> list = page.getList();
for (NtcHttpLog l : list) {
l.setFunctionId(log.getFunctionId());

2
src/main/java/com/nis/web/controller/log/ntc/IpLogController.java
View File

@@ -56,7 +56,7 @@ public class IpLogController extends BaseController {
Gson gson = new GsonBuilder().create();
LogRecvData<NtcIpLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcIpLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
// BeanUtils.copyProperties(fromJson.getData(), page);
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});
page.setList(fromJson.getData().getList());
List<NtcIpLog> list = page.getList();
for (NtcIpLog l : list) {

1
src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java
View File

@@ -67,6 +67,7 @@ public class IpsecLogController extends BaseController{
if (fromJson.getStatus().intValue() == 200) {
List<NtcIpsecLog> list = fromJson.getData().getList();
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});
page.setList(list);
for (NtcIpsecLog l : list) {
l.setFunctionId(entry.getFunctionId());

2
src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java
View File

@@ -53,7 +53,7 @@ public class L2tpLogController extends BaseController {
LogRecvData<NtcL2tpLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<NtcL2tpLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<NtcL2tpLog> fromPage = fromJson.getData();
page.setList(fromPage.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<NtcL2tpLog> list = fromPage.getList();
for (NtcL2tpLog log : list) {
log.setFunctionId(ntcL2tpLog.getFunctionId());

2
src/main/java/com/nis/web/controller/log/ntc/MailLogController.java
View File

@@ -51,7 +51,7 @@ public class MailLogController extends BaseController {
Gson gson = new GsonBuilder().create();
LogRecvData<NtcMailLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcMailLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
page.setList(fromJson.getData().getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<NtcMailLog> list = page.getList();
for (NtcMailLog l : list) {
l.setFunctionId(log.getFunctionId());

3
src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java
View File

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.http.client.ClientProtocolException;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -66,7 +67,7 @@ public class MmAvIpLogController extends BaseController{
if (fromJson.getStatus().intValue() == 200) {
Page<MmAvIpLog> data = fromJson.getData();
page.setList(data.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<MmAvIpLog> list = page.getList();
for (MmAvIpLog l : list) {
l.setFunctionId(entry.getFunctionId());

3
src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java
View File

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.http.client.ClientProtocolException;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -66,7 +67,7 @@ public class MmAvUrlLogController extends BaseController{
if (fromJson.getStatus().intValue() == 200) {
Page<NtcStreamMediaLog> data = fromJson.getData();
page.setList(data.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<NtcStreamMediaLog> list = page.getList();
for (NtcStreamMediaLog l : list) {
l.setFunctionId(entry.getFunctionId());

3
src/main/java/com/nis/web/controller/log/ntc/MmFileDigestLogController.java
View File

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.http.client.ClientProtocolException;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -66,7 +67,7 @@ public class MmFileDigestLogController extends BaseController{
if (fromJson.getStatus().intValue() == 200) {
Page<MmFileDigestLog> data = fromJson.getData();
page.setList(data.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<MmFileDigestLog> list = page.getList();
for (MmFileDigestLog l : list) {
l.setFunctionId(entry.getFunctionId());

3
src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java
View File

@@ -7,6 +7,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -51,7 +52,7 @@ public class MmPicIpLogController extends BaseController {
LogRecvData<MmPicIpLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmPicIpLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<MmPicIpLog> fromPage = fromJson.getData();
page.setList(fromPage.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<MmPicIpLog> list = fromPage.getList();
for (MmPicIpLog log : list) {
log.setFunctionId(mmPicIpLog.getFunctionId());

3
src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java
View File

@@ -7,6 +7,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -51,7 +52,7 @@ public class MmPicUrlController extends BaseController{
LogRecvData<MmPicUrlLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmPicUrlLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<MmPicUrlLog> fromPage = fromJson.getData();
page.setList(fromPage.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<MmPicUrlLog> list = fromPage.getList();
for (MmPicUrlLog log : list) {
log.setFunctionId(mmPicUrlLog.getFunctionId());

5
src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java
View File

@@ -7,6 +7,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -53,7 +54,7 @@ public class MmPornAvSampleController extends BaseController {
if (fromJson.getStatus().intValue() == 200) {
Page<MmAvIpLog> data = fromJson.getData();
page.setList(data.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<MmAvIpLog> list = page.getList();
for (MmAvIpLog l : list) {
l.setFunctionId(entry.getFunctionId());
@@ -94,7 +95,7 @@ public class MmPornAvSampleController extends BaseController {
if (fromJson.getStatus().intValue() == 200) {
Page<MmAvIpLog> data = fromJson.getData();
page.setList(data.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<MmAvIpLog> list = page.getList();
for (MmAvIpLog l : list) {
l.setFunctionId(entry.getFunctionId());

3
src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java
View File

@@ -7,6 +7,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -51,7 +52,7 @@ public class MmSampleAudioController extends BaseController{
LogRecvData<MmSampleAudioLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSampleAudioLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<MmSampleAudioLog> fromPage = fromJson.getData();
page.setList(fromPage.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<MmSampleAudioLog> list = fromPage.getList();
for (MmSampleAudioLog log : list) {
log.setFunctionId(sampleAudioLog.getFunctionId());

3
src/main/java/com/nis/web/controller/log/ntc/MmSampleFaceController.java
View File

@@ -7,6 +7,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -51,7 +52,7 @@ public class MmSampleFaceController extends BaseController{
LogRecvData<MmSamplePicLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSamplePicLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<MmSamplePicLog> fromPage = fromJson.getData();
page.setList(fromPage.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<MmSamplePicLog> list = fromPage.getList();
for (MmSamplePicLog log : list) {
log.setFunctionId(samplePicLog.getFunctionId());

3
src/main/java/com/nis/web/controller/log/ntc/MmSampleLogoController.java
View File

@@ -7,6 +7,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -51,7 +52,7 @@ public class MmSampleLogoController extends BaseController{
LogRecvData<MmSamplePicLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSamplePicLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<MmSamplePicLog> fromPage = fromJson.getData();
page.setList(fromPage.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<MmSamplePicLog> list = fromPage.getList();
for (MmSamplePicLog log : list) {
log.setFunctionId(samplePicLog.getFunctionId());

4
src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java
View File

@@ -1,3 +1,4 @@
package com.nis.web.controller.log.ntc;
import java.util.HashMap;
@@ -7,6 +8,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -51,7 +53,7 @@ public class MmSamplePicController extends BaseController{
LogRecvData<MmSamplePicLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSamplePicLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<MmSamplePicLog> fromPage = fromJson.getData();
page.setList(fromPage.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<MmSamplePicLog> list = fromPage.getList();
for (MmSamplePicLog log : list) {
log.setFunctionId(samplePicLog.getFunctionId());

3
src/main/java/com/nis/web/controller/log/ntc/MmSampleSpeakerController.java
View File

@@ -7,6 +7,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -51,7 +52,7 @@ public class MmSampleSpeakerController extends BaseController{
LogRecvData<MmSamplePicLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSamplePicLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<MmSamplePicLog> fromPage = fromJson.getData();
page.setList(fromPage.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<MmSamplePicLog> list = fromPage.getList();
for (MmSamplePicLog log : list) {
log.setFunctionId(samplePicLog.getFunctionId());

3
src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java
View File

@@ -7,6 +7,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -51,7 +52,7 @@ public class MmSampleVideoController extends BaseController{
LogRecvData<MmSampleVideoLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSampleVideoLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<MmSampleVideoLog> fromPage = fromJson.getData();
page.setList(fromPage.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<MmSampleVideoLog> list = fromPage.getList();
for (MmSampleVideoLog log : list) {
log.setFunctionId(sampleVideoLog.getFunctionId());

5
src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java
View File

@@ -1,6 +1,5 @@
package com.nis.web.controller.log.ntc;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
@@ -10,7 +9,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.http.client.ClientProtocolException;
import org.aspectj.util.FileUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -58,7 +57,7 @@ public class MmSampleVoipLogController extends BaseController {
if (fromJson.getStatus().intValue() == 200) {
Page<MmVoipLog> data = fromJson.getData();
page.setList(data.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<MmVoipLog> list = page.getList();
for (MmVoipLog l : list) {
l.setFunctionId(entry.getFunctionId());

3
src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java
View File

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.http.client.ClientProtocolException;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -65,7 +66,7 @@ public class MmVoipAccountLogController extends BaseController{
if (fromJson.getStatus().intValue() == 200) {
Page<MmVoipLog> data = fromJson.getData();
page.setList(data.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<MmVoipLog> list = page.getList();
for (MmVoipLog l : list) {
l.setFunctionId(entry.getFunctionId());

3
src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java
View File

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.http.client.ClientProtocolException;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -65,7 +66,7 @@ public class MmVoipIpLogController extends BaseController{
if (fromJson.getStatus().intValue() == 200) {
Page<MmVoipLog> data = fromJson.getData();
page.setList(data.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<MmVoipLog> list = page.getList();
for (MmVoipLog l : list) {
l.setFunctionId(entry.getFunctionId());

3
src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java
View File

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.http.client.ClientProtocolException;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -65,7 +66,7 @@ public class MmVoipLogController extends BaseController{
if (fromJson.getStatus().intValue() == 200) {
Page<MmVoipLog> data = fromJson.getData();
page.setList(data.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<MmVoipLog> list = page.getList();
for (MmVoipLog l : list) {
l.setFunctionId(entry.getFunctionId());

2
src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java
View File

@@ -67,7 +67,7 @@ public class OpenVpnLogController extends BaseController{
if (fromJson.getStatus().intValue() == 200) {
Page<NtcOpenVpnLog> data = fromJson.getData();
page.setList(data.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<NtcOpenVpnLog> list = page.getList();
for (NtcOpenVpnLog l : list) {
l.setFunctionId(entry.getFunctionId());

4
src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java
View File

@@ -8,10 +8,12 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
@@ -47,7 +49,7 @@ public class P2pLogController extends BaseController {
Gson gson = new GsonBuilder().create();
LogRecvData<NtcP2pLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcP2pLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
page.setList(fromJson.getData().getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<NtcP2pLog> list = page.getList();
for (NtcP2pLog l : list) {
l.setFunctionId(log.getFunctionId());

1
src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java
View File

@@ -54,6 +54,7 @@ public class PptpLogController extends BaseController {
if(fromJson.getStatus().intValue() == 200) {
Page<NtcPptpLog> fromPage = fromJson.getData();
List<NtcPptpLog> list = fromPage.getList();
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});
page.setList(list);
for (NtcPptpLog log : list) {
log.setFunctionId(ntcPptpLog.getFunctionId());

2
src/main/java/com/nis/web/controller/log/ntc/SshLogController.java
View File

@@ -67,7 +67,7 @@ public class SshLogController extends BaseController{
if (fromJson.getStatus().intValue() == 200) {
Page<NtcSshLog> data = fromJson.getData();
page.setList(data.getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<NtcSshLog> list = page.getList();
for (NtcSshLog l : list) {
l.setFunctionId(entry.getFunctionId());

1
src/main/java/com/nis/web/controller/log/ntc/SslLogController.java
View File

@@ -58,6 +58,7 @@ public class SslLogController extends BaseController {
if(fromJson.getStatus().intValue() == 200) {
Page<NtcSslLog> fromPage = fromJson.getData();
List<NtcSslLog> list = fromPage.getList();
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});
page.setList(list);
for (NtcSslLog log : list) {
log.setFunctionId(ntcSslLog.getFunctionId());

4
src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java
View File

@@ -7,7 +7,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -54,7 +54,7 @@ public class PxyHttpLogController extends BaseController {
LogRecvData<PxyHttpLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<PxyHttpLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
page.setList(fromJson.getData().getList());
BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
List<PxyHttpLog> list = page.getList();
for (PxyHttpLog l : list) {
l.setFunctionId(log.getFunctionId());