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

捕捉异常后增加记录异常日志的操作

Browse Source
This commit is contained in:
李皓宸
2019-04-25 14:42:41 +08:00
parent 6223c66618
commit 26097409d6
106 changed files with 814 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/nis/web/controller/basics/AsnGroupController.java
View File

@@ -18,6 +18,7 @@ import com.nis.domain.Page;
import com.nis.domain.basics.AsnGroupInfo;
import com.nis.domain.basics.AsnIpCfg;
import com.nis.domain.specific.ConfigGroupInfo;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
/**
@@ -67,7 +68,7 @@ public class AsnGroupController extends BaseController {
//@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR)
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(AsnGroupInfo cfg,Model model,
RedirectAttributes redirectAttributes,String itType) {
RedirectAttributes redirectAttributes,String itType,HttpServletRequest request) {
try {
AsnGroupInfo asnGroup=asnGroupInfoService.getGroupIdByNameAndASNId(cfg.getOrganization().trim(), cfg.getCountry().trim(), cfg.getAsnId());
@@ -80,6 +81,7 @@ public class AsnGroupController extends BaseController {
} catch (Exception e) {
logger.error("新增失败",e);
addMessage(redirectAttributes,"error","save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/asnGroup/asnGroupList";
@@ -94,13 +96,14 @@ public class AsnGroupController extends BaseController {
*/
//@RequiresPermissions(value={"basics:classification:del","basics:attribute:del","basics:label:del"},logical=Logical.OR)
@RequestMapping(value={"delete"})
public String delete(RedirectAttributes redirectAttributes,String ids,String asnIds) {
public String delete(RedirectAttributes redirectAttributes,String ids,String asnIds,HttpServletRequest request) {
try {
asnGroupInfoService.delete(ids,asnIds);
addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) {
logger.error("删除失败",e);
addMessage(redirectAttributes,"error","delete_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/asnGroup/asnGroupList";
}

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

@@ -32,6 +32,7 @@ import com.nis.exceptions.MaatConvertException;
//import com.nis.util.AsnCacheUtils;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -89,9 +90,11 @@ public class AsnIpController extends BaseController{
} catch (MaatConvertException e) {
logger.error("ASN IP配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("ASN IP配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath +"/basics/asn/list?functionId="+cfg.getFunctionId();
@@ -112,9 +115,11 @@ public class AsnIpController extends BaseController{
} catch (MaatConvertException e) {
logger.error("ASN IP配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("ASN IP配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath +"/basics/asn/list?functionId="+cfg.getFunctionId();
@@ -160,8 +165,10 @@ public class AsnIpController extends BaseController{
logger.error("配置下发失败：",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -187,8 +194,10 @@ public class AsnIpController extends BaseController{
logger.error("Delete failed",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error",e.getMessage());
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error","delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -277,6 +286,7 @@ public class AsnIpController extends BaseController{
} catch (Exception e) {
logger.error("asnIp export failed",e);
addMessage(redirectAttributes,"error","export_failed");
LogUtils.saveLog(request, null, e, null);
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

7
src/main/java/com/nis/web/controller/basics/InnerProtectionListController.java
View File

@@ -15,6 +15,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.basics.ProtectionListInfo;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
@@ -49,25 +50,27 @@ public class InnerProtectionListController extends BaseController{
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(ProtectionListInfo cfg,Model model,String itType,Integer groupType,
RedirectAttributes redirectAttributes) {
RedirectAttributes redirectAttributes,HttpServletRequest request) {
try {
innerProtectionListService.saveOrUpdate(cfg);
addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) {
logger.error("新增失败",e);
addMessage(redirectAttributes,"error","save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/innerProtectionList/list";
}
@RequestMapping(value={"delete"})
public String delete(RedirectAttributes redirectAttributes,String ids,int isValid) {
public String delete(RedirectAttributes redirectAttributes,String ids,int isValid,HttpServletRequest request) {
try {
innerProtectionListService.deldete(ids,isValid);
addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) {
logger.error("删除失败",e);
addMessage(redirectAttributes,"error","delete_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/innerProtectionList/list";
}

7
src/main/java/com/nis/web/controller/basics/IpReuseIpCfgController.java
View File

@@ -20,6 +20,7 @@ import com.nis.domain.basics.IpReuseIpCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.web.controller.BaseController;
@Controller
@RequestMapping(value = "${adminPath}/basics/vpn")
@@ -75,6 +76,7 @@ public class IpReuseIpCfgController extends BaseController{
logger.error("信息保存失败",e);
e.printStackTrace();
addMessage(redirectAttributes,"error","save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath +"/basics/vpn/list?functionId="+entity.getFunctionId();
}
@@ -91,6 +93,7 @@ public class IpReuseIpCfgController extends BaseController{
logger.error("信息保存失败",e);
e.printStackTrace();
addMessage(redirectAttributes,"error","save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath +"/basics/vpn/list?functionId="+cfg.getFunctionId();
}
@@ -98,7 +101,7 @@ public class IpReuseIpCfgController extends BaseController{
@RequiresPermissions(value={"asn:ip:config"})
public String delete(Integer isValid
,String ids,Integer functionId
,RedirectAttributes redirectAttributes){
,RedirectAttributes redirectAttributes,HttpServletRequest request){
try{
ipReuseIpCfgService.delete(isValid,ids);
addMessage(redirectAttributes,"success","delete_success");
@@ -106,8 +109,10 @@ public class IpReuseIpCfgController extends BaseController{
logger.error("Delete failed",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error",e.getMessage());
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error","delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}

8
src/main/java/com/nis/web/controller/basics/PolicyGroupController.java
View File

@@ -21,6 +21,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.util.Constants;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
/**
@@ -71,7 +72,7 @@ public class PolicyGroupController extends BaseController {
//@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR)
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(PolicyGroupInfo cfg,Model model,
RedirectAttributes redirectAttributes,String itType,Integer groupType) {
RedirectAttributes redirectAttributes,String itType,Integer groupType,HttpServletRequest request) {
try {
policyGroupInfoService.saveOrUpdate(cfg);
@@ -79,6 +80,7 @@ public class PolicyGroupController extends BaseController {
} catch (Exception e) {
logger.error("新增失败",e);
addMessage(redirectAttributes,"error","save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList?groupType="+groupType;
@@ -93,13 +95,14 @@ public class PolicyGroupController extends BaseController {
*/
//@RequiresPermissions(value={"basics:classification:del","basics:attribute:del","basics:label:del"},logical=Logical.OR)
@RequestMapping(value={"delete"})
public String delete(RedirectAttributes redirectAttributes, Integer groupType,String ids,int isValid) {
public String delete(RedirectAttributes redirectAttributes, Integer groupType,String ids,int isValid,HttpServletRequest request) {
try {
policyGroupInfoService.deldete(ids,isValid);
addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) {
logger.error("删除失败",e);
addMessage(redirectAttributes,"error","delete_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList?groupType="+groupType;
}
@@ -194,6 +197,7 @@ public class PolicyGroupController extends BaseController {
} catch (Exception e) {
logger.error("Group export failed",e);
addMessage(redirectAttributes,"error","export_failed");
LogUtils.saveLog(request, null, e, null);
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

14
src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
View File

@@ -29,6 +29,7 @@ import com.nis.util.ConfigDictUtils;
import com.nis.util.Configurations;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils;
import com.nis.web.controller.BaseController;
@@ -52,7 +53,7 @@ public class ServiceDictInfoController extends BaseController {
@ResponseBody
@RequestMapping(value="requestCancleInfoAjax", method = RequestMethod.POST)
public String requestCancleInfoAjax(Integer cancelRequestId,String ids,String indexTable){
public String requestCancleInfoAjax(Integer cancelRequestId,String ids,String indexTable,HttpServletRequest request){
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
for(String id :idArray){
@@ -61,6 +62,7 @@ public class ServiceDictInfoController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
logger.error("审核添加取消来函信息失败",e);
LogUtils.saveLog(request, null, e, null);
return "false";
}
}
@@ -76,7 +78,7 @@ public class ServiceDictInfoController extends BaseController {
*/
@ResponseBody
@RequestMapping(value="requestCancleInfoNumber")
public Map requestCancleInfoNumber(String ids,String indexTable){
public Map requestCancleInfoNumber(String ids,String indexTable,HttpServletRequest request){
List list = new ArrayList();
String requestTitle="";
Map map=new HashMap();
@@ -94,6 +96,7 @@ public class ServiceDictInfoController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
logger.error("查询取消审核来函信息失败",e);
LogUtils.saveLog(request, null, e, null);
return map;
}
// }
@@ -207,7 +210,7 @@ public class ServiceDictInfoController extends BaseController {
*/
@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:vpn_ip:add","basics:classification:edit","basics:attribute:edit","basics:label:edit","basics:vpn_ip:edit"},logical=Logical.OR)
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(ServiceDictInfo serviceDictInfo,Model model, RedirectAttributes redirectAttributes,String itType) {
public String saveOrUpdate(ServiceDictInfo serviceDictInfo,Model model, RedirectAttributes redirectAttributes,String itType,HttpServletRequest request) {
try {
serviceDictInfoService.saveOrUpdate(serviceDictInfo);
@@ -215,6 +218,7 @@ public class ServiceDictInfoController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes,"error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/serviceDictInfo/list?itType="+itType;
@@ -231,7 +235,7 @@ public class ServiceDictInfoController extends BaseController {
*/
@RequiresPermissions(value={"basics:classification:del","basics:attribute:del","basics:label:del","basics:vpn_ip:del"},logical=Logical.OR)
@RequestMapping(value={"delete"})
public String delete(ServiceDictInfo serviceDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) {
public String delete(ServiceDictInfo serviceDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId,HttpServletRequest request) {
try {
String exIp="";
String id="";
@@ -266,6 +270,7 @@ public class ServiceDictInfoController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes,"error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/serviceDictInfo/list?itType="+itType;
}
@@ -586,6 +591,7 @@ public class ServiceDictInfoController extends BaseController {
} catch (Exception e) {
logger.error("dict white export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

7
src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
View File

@@ -25,6 +25,7 @@ import com.nis.domain.basics.ServiceDictInfo;
import com.nis.domain.basics.SysDictInfo;
import com.nis.util.ConfigDictUtils;
import com.nis.util.Configurations;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils;
import com.nis.web.controller.BaseController;
@@ -151,7 +152,7 @@ public class SysDictInfoController extends BaseController {
*/
@RequiresPermissions(value={"basics:area:add","basics:isp:add","basics:scope:add","basics:area:edit","basics:isp:edit","basics:scope:edit"},logical=Logical.OR)
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(SysDictInfo sysDictInfo,Model model, RedirectAttributes redirectAttributes, String itType) {
public String saveOrUpdate(SysDictInfo sysDictInfo,Model model, RedirectAttributes redirectAttributes, String itType,HttpServletRequest request) {
try {
sysDictInfoService.saveOrUpdate(sysDictInfo);
@@ -159,6 +160,7 @@ public class SysDictInfoController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes,"error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/sysDictInfo/list?itType="+itType;
@@ -172,13 +174,14 @@ public class SysDictInfoController extends BaseController {
*/
@RequiresPermissions(value={"basics:area:del","basics:isp:del","basics:scope:del"},logical=Logical.OR)
@RequestMapping(value={"delete"})
public String delete(SysDictInfo sysDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) {
public String delete(SysDictInfo sysDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId,HttpServletRequest request) {
try {
sysDictInfoService.deleteDict(mulitId);
addMessage(redirectAttributes,"success", "delete_success");
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes,"error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/sysDictInfo/list?itType="+itType;
}

3
src/main/java/com/nis/web/controller/basics/TaskInfoController.java
View File

@@ -24,6 +24,7 @@ import com.nis.domain.configuration.RequestInfo;
import com.nis.domain.configuration.TaskInfo;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.excel.ExcelField;
import com.nis.web.controller.BaseController;
@@ -90,6 +91,7 @@ public class TaskInfoController extends BaseController{
logger.error(e.getMessage());
e.printStackTrace();
addMessage(redirectAttributes,"error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/taskInfo/list?functionId="+taskInfo.getFunctionId()+"&repage";
}
@@ -233,6 +235,7 @@ public class TaskInfoController extends BaseController{
} catch (Exception e) {
logger.error("ip addr export failed",e);
addMessage(redirectAttributes,"error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}