asnIp 未下发可删除

asn组下无有效的asnip可删除，提示删除时需要删除asn组下的asnip
asn组无asn ip可删除
日志查看配置优化
用户名校验过滤已删除用户
所有addMessage处理增加messageType
流量统计-解决traffic详情时折线图最后时间点数据为0问题。解决用户行为统计中用户名跟ip可能为空无用户名登录时报错问题。app,协议，traffic详情时间查询条件格式化,默认时间显示为最近一小时，列表数据保留两位小数

26 files changed, 249 insertions, 125 deletions

diff --git a/src/main/java/com/nis/web/controller/basics/AsnIpController.java b/src/main/java/com/nis/web/controller/basics/AsnIpController.java
index 4c93dbd..f7b3459 100644
--- a/src/main/java/com/nis/web/controller/basics/AsnIpController.java
+++ b/src/main/java/com/nis/web/controller/basics/AsnIpController.java
@@ -81,14 +81,14 @@ public class AsnIpController extends BaseController{
 	public String save(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo cfg,RedirectAttributes redirectAttributes){
 		try{
 			asnIpCfgService.saveAsnIpCfg(cfg);
-			addMessage(redirectAttributes,"save_success");
+			addMessage(redirectAttributes,"success","save_success");
 		}catch(Exception e){
 			logger.error("信息保存失败",e);
 			e.printStackTrace();
 			if(e instanceof MaatConvertException) {
-				addMessage(redirectAttributes,e.getMessage());
+				addMessage(redirectAttributes,"error",e.getMessage());
 			}else {
-				addMessage(redirectAttributes,"save_failed");
+				addMessage(redirectAttributes,"error","save_failed");
 			}
 		}
 		
@@ -100,11 +100,11 @@ public class AsnIpController extends BaseController{
 		try{
 			
 			asnIpCfgService.update(cfg);
-			addMessage(redirectAttributes,"save_success");
+			addMessage(redirectAttributes,"success","save_success");
 		}catch(Exception e){
 			logger.error("信息保存失败",e);
 			e.printStackTrace();
-			addMessage(redirectAttributes,"save_failed");
+			addMessage(redirectAttributes,"error","save_failed");
 		}
 		
 		return "redirect:" + adminPath +"/basics/asn/list?functionId="+cfg.getFunctionId();
@@ -116,18 +116,27 @@ public class AsnIpController extends BaseController{
 			,RedirectAttributes redirectAttributes){
 			try{
 				asnIpCfgService.delete(isValid,ids);
-				addMessage(redirectAttributes,"delete_success");
+				addMessage(redirectAttributes,"success","delete_success");
 			}catch(Exception e){
 				logger.error("Delete failed",e);
 				if(e instanceof MaatConvertException) {
-					addMessage(redirectAttributes,e.getMessage());
+					addMessage(redirectAttributes,"error",e.getMessage());
 				}else {
-					addMessage(redirectAttributes,"delete_failed");
+					addMessage(redirectAttributes,"error","delete_failed");
 				}
 			}
 			
 		return "redirect:" + adminPath +"/basics/asn/list?functionId="+functionId;
 	}
+	
+	@RequestMapping(value = {"/ajaxDeleteAsnIp"})
+	public void ajaxDeleteAsnIp(String ids, HttpServletRequest request, HttpServletResponse response){
+		try{
+			asnIpCfgService.ajaxDeleteAsnIp(ids);
+		}catch(Exception e){
+			logger.error("Delete failed",e);
+		}
+	}
 	/**
 	 * ajax设置Name
 	 * @param model
@@ -206,7 +215,7 @@ public class AsnIpController extends BaseController{
 			this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 		} catch (Exception e) {
 			logger.error("asnIp export failed",e);
-			addMessage(redirectAttributes,  "export_failed");
+			addMessage(redirectAttributes,"error","export_failed");
 		}
 		//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 	}
diff --git a/src/main/java/com/nis/web/controller/basics/IpReuseIpCfgController.java b/src/main/java/com/nis/web/controller/basics/IpReuseIpCfgController.java
index 5f04bd4..1b478fd 100644
--- a/src/main/java/com/nis/web/controller/basics/IpReuseIpCfgController.java
+++ b/src/main/java/com/nis/web/controller/basics/IpReuseIpCfgController.java
@@ -70,11 +70,11 @@ public class IpReuseIpCfgController extends BaseController{
 			,RedirectAttributes redirectAttributes) {
 		try{
 		ipReuseIpCfgService.save(entity);;
-		addMessage(redirectAttributes,"save_success");
+		addMessage(redirectAttributes,"success","save_success");
 		}catch(Exception e){
 			logger.error("信息保存失败",e);
 			e.printStackTrace();
-			addMessage(redirectAttributes,"save_failed");
+			addMessage(redirectAttributes,"error","save_failed");
 		}
 		return "redirect:" + adminPath +"/basics/vpn/list?functionId="+entity.getFunctionId();
 	}
@@ -86,11 +86,11 @@ public class IpReuseIpCfgController extends BaseController{
 	public String update(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")IpReuseIpCfg cfg,RedirectAttributes redirectAttributes){
 		try{
 			ipReuseIpCfgService.update(cfg);
-			addMessage(redirectAttributes,"save_success");
+			addMessage(redirectAttributes,"success","save_success");
 		}catch(Exception e){
 			logger.error("信息保存失败",e);
 			e.printStackTrace();
-			addMessage(redirectAttributes,"save_failed");
+			addMessage(redirectAttributes,"error","save_failed");
 		}
 		return "redirect:" + adminPath +"/basics/vpn/list?functionId="+cfg.getFunctionId();
 	}
@@ -101,13 +101,13 @@ public class IpReuseIpCfgController extends BaseController{
 			,RedirectAttributes redirectAttributes){
 			try{
 				ipReuseIpCfgService.delete(isValid,ids);
-				addMessage(redirectAttributes,"delete_success");
+				addMessage(redirectAttributes,"success","delete_success");
 			}catch(Exception e){
 				logger.error("Delete failed",e);
 				if(e instanceof MaatConvertException) {
-					addMessage(redirectAttributes,e.getMessage());
+					addMessage(redirectAttributes,"error",e.getMessage());
 				}else {
-					addMessage(redirectAttributes,"delete_failed");
+					addMessage(redirectAttributes,"error","delete_failed");
 				}
 			}
 			
diff --git a/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java b/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java
index 753f65f..6079b6a 100644
--- a/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java
+++ b/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java
@@ -68,10 +68,10 @@ public class PolicyGroupController extends BaseController {
 		
 		try {
 			policyGroupInfoService.saveOrUpdate(cfg);
-			addMessage(redirectAttributes, "save_success");
+			addMessage(redirectAttributes,"success","save_success");
 		} catch (Exception e) {
 			logger.error("新增失败",e);
-			addMessage(redirectAttributes, "save_failed");
+			addMessage(redirectAttributes,"error","save_failed");
 		}
 		
 		return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList";
@@ -89,10 +89,10 @@ public class PolicyGroupController extends BaseController {
 	public String delete(RedirectAttributes redirectAttributes, String ids,int isValid) {
 		try {
 			policyGroupInfoService.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 + "/basics/policyGroup/policyGroupList";
 	}
diff --git a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
index c750689..90b46fc 100644
--- a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
+++ b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
@@ -213,10 +213,10 @@ public class ServiceDictInfoController extends BaseController {
 		
 		try {
 			serviceDictInfoService.saveOrUpdate(serviceDictInfo);
-			addMessage(redirectAttributes, "save_success");
+			addMessage(redirectAttributes,"success", "save_success");
 		} catch (Exception e) {
 			e.printStackTrace();
-			addMessage(redirectAttributes, "save_failed");
+			addMessage(redirectAttributes,"error", "save_failed");
 		}
 		
 		return "redirect:" + adminPath + "/basics/serviceDictInfo/list?itType="+itType;
@@ -236,10 +236,10 @@ public class ServiceDictInfoController extends BaseController {
 	public String delete(ServiceDictInfo serviceDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) {
 		try {
 			serviceDictInfoService.deleteDict(mulitId);
-			addMessage(redirectAttributes, "delete_success");
+			addMessage(redirectAttributes,"success", "delete_success");
 		} catch (Exception e) {
 			e.printStackTrace();
-			addMessage(redirectAttributes, "delete_failed");
+			addMessage(redirectAttributes,"error", "delete_failed");
 		}
 		return "redirect:" + adminPath + "/basics/serviceDictInfo/list?itType="+itType;
 	}
diff --git a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
index 5a9aa3e..5c46539 100644
--- a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
+++ b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
@@ -155,10 +155,10 @@ public class SysDictInfoController extends BaseController {
 		
 		try {
 			sysDictInfoService.saveOrUpdate(sysDictInfo);
-			addMessage(redirectAttributes, "save_success");
+			addMessage(redirectAttributes,"success", "save_success");
 		} catch (Exception e) {
 			e.printStackTrace();
-			addMessage(redirectAttributes, "save_failed");
+			addMessage(redirectAttributes,"error", "save_failed");
 		}
 		
 		return "redirect:" + adminPath + "/basics/sysDictInfo/list?itType="+itType;
@@ -175,10 +175,10 @@ public class SysDictInfoController extends BaseController {
 	public String delete(SysDictInfo sysDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) {
 		try {
 			sysDictInfoService.deleteDict(mulitId);
-			addMessage(redirectAttributes, "delete_success");
+			addMessage(redirectAttributes,"success", "delete_success");
 		} catch (Exception e) {
 			e.printStackTrace();
-			addMessage(redirectAttributes, "delete_failed");
+			addMessage(redirectAttributes,"error", "delete_failed");
 		}
 		return "redirect:" + adminPath + "/basics/sysDictInfo/list?itType="+itType;
 	}
diff --git a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java
index 45b91b7..5e8fff6 100644
--- a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java
+++ b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java
@@ -59,22 +59,22 @@ public class TaskInfoController extends BaseController{
 				// 保存用户信息
 				logger.info(taskInfo.getId()+"修改成功");
 				taskInfoService.saveOrUpdate(taskInfo);
-				addMessage(redirectAttributes, "save_success");
+				addMessage(redirectAttributes,"success", "save_success");
 			}else{
 				if (!"true".equals(checkTaskName(taskInfo.getTaskName()))){
 					logger.info(taskInfo.getTaskName()+"重复数据");
-					addMessage(model, "save_failed");
+					addMessage(redirectAttributes,"error", "save_failed");
 					return form(taskInfo, model);
 				}
 				// 保存用户信息
 				taskInfoService.saveOrUpdate(taskInfo);
-				addMessage(redirectAttributes, "save_success");
+				addMessage(redirectAttributes,"success", "save_success");
 				logger.info(taskInfo.getId()+"保存成功");
 			}
 		} catch (Exception e) {
 			logger.error(e.getMessage());
 			e.printStackTrace();
-			addMessage(redirectAttributes, "save_failed");
+			addMessage(redirectAttributes,"error", "save_failed");
 		}
 		return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
 	}
@@ -101,7 +101,7 @@ public class TaskInfoController extends BaseController{
     public String taskExamine(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] exId = ids.split(",");
     	taskInfoService.taskExamine(exId);
-    	addMessage(redirectAttributes, "save_success");
+    	addMessage(redirectAttributes,"success", "save_success");
     	return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
     	
     }
@@ -115,7 +115,7 @@ public class TaskInfoController extends BaseController{
 	public String taskExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] noId = ids.split(",");
 		taskInfoService.taskExamineNo(noId);
-		addMessage(redirectAttributes, "save_success");
+		addMessage(redirectAttributes,"success", "save_success");
 		return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
 		
 	}
@@ -129,7 +129,7 @@ public class TaskInfoController extends BaseController{
 	public String taskCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] canclelId = ids.split(",");
 		taskInfoService.taskCancelExamine(canclelId);
-		addMessage(redirectAttributes, "save_success");
+		addMessage(redirectAttributes,"success", "save_success");
 		return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
 		
 	}
@@ -143,7 +143,7 @@ public class TaskInfoController extends BaseController{
 	public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] delId = ids.split(",");
 		taskInfoService.delete(delId);
-		addMessage(redirectAttributes, "delete_success");
+		addMessage(redirectAttributes,"success", "delete_success");
 		return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
 		
 	}
diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java
index ae8004d..61706fe 100644
--- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java
@@ -1077,7 +1077,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");
 			}
 		}
 		
@@ -1202,7 +1202,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");
 			}
 		}
 		
@@ -1346,7 +1346,7 @@ public class AppCfgController extends BaseController {
 						websiteDomainTopic.setIsValid(Constants.VALID_YES);
 						appCfgService.saveDomainDict(websiteDomainTopic);
 					}else{
-						addMessage(redirectAttributes,"save_failed");
+						addMessage(redirectAttributes,"error","save_failed");
 						return "redirect:" + adminPath +"/app/topicDomainCfgList?functionId="+entity.getFunctionId();
 					}
 				}
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
index ab4c2e4..91631a5 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
@@ -270,7 +270,7 @@ public class AvController extends BaseController  {
 						||Constants.SPEAKER_FILE_TYPE.contains(FileUtils.getSuffix(uploadSrcFile.getName(),false))
 						){ 
 					if(!validateAvDuration(uploadSrcFile)){
-						addMessage(redirectAttributes,"exceeds_duration_limit");
+						addMessage(redirectAttributes,"error","exceeds_duration_limit");
 						logger.error("The duration of uploaded files exceeds the limit("+Constants.AV_DURATION_LIMIT+"s).");
 						throw new MultiPartNewException(this.getMsgProp().getProperty("exceeds_duration_limit"));
 					}
@@ -319,7 +319,7 @@ public class AvController extends BaseController  {
 	@RequestMapping(value = {"/sample/updateAvFileSampleValid"})
 	public String updateAvFileSampleValid(Integer isAudit,Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes){
 		avCfgService.updateAvFileSampleValid(isAudit,isValid,ids);
-		addMessage(redirectAttributes,"delete_success");
+		addMessage(redirectAttributes,"success","delete_success");
 		return "redirect:" + adminPath +"/ntc/av/sample/fileSampleList?functionId="+functionId;
 	}
 	//修改文件样例配置审核状态
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
index c62bd2f..04ba6a4 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
@@ -132,6 +132,8 @@ public class FileTransferCfgController  extends BaseController{
 		model.addAttribute("tabList", tabList);
 		return "/cfg/fileTransfer/ftpSubList";
 	}
+	
+	
 	/**
 	 * 做删除操作
 	 * @param isValid
@@ -144,7 +146,7 @@ public class FileTransferCfgController  extends BaseController{
 	public String updateFtpCfgValid(Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
 		try {
 			fileTransferCfgService.updateFtpCfgValid(isValid,ids,functionId);
-			addMessage(redirectAttributes,"delete_success");
+			addMessage(redirectAttributes,"success","delete_success");
 		} catch (Exception e) {
 			if(e instanceof MaatConvertException) {
 				e.printStackTrace();
@@ -458,15 +460,42 @@ public class FileTransferCfgController  extends BaseController{
 	
 	@RequestMapping(value = {"saveP2pCfg"})
 	@RequiresPermissions(value={"fileTransfer:p2p:config"})
-	public String saveP2pCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) {
-		fileTransferCfgService.saveP2pCfg(entity);
+	public String saveP2pCfg(Model model,HttpServletRequest request,HttpServletResponse response,
+			String ids,CfgIndexInfo entity,RedirectAttributes redirectAttributes) {
+		try {
+			fileTransferCfgService.saveP2pCfg(entity);
+			addMessage(redirectAttributes,"success","save_success");
+		} catch (Exception e) {
+			if(e instanceof MaatConvertException) {
+				e.printStackTrace();
+				logger.error("P2P信息保存失败",e);
+				addMessage(redirectAttributes,"error","request_service_failed");
+			}else {
+				e.printStackTrace();
+				logger.error("P2P信息保存失败",e);
+				addMessage(redirectAttributes,"error","save_failed");
+			}
+		}
 		return "redirect:" + adminPath +"/ntc/fileTransfer/p2pList?functionId="+entity.getFunctionId();
 	}
 	
 	@RequestMapping(value = {"updateP2pCfgValid"})
 	@RequiresPermissions(value={"fileTransfer:p2p:config"})
-	public String updateP2pCfgValid(Integer isValid,String ids,Integer functionId) {
-		fileTransferCfgService.updateP2pCfgValid(isValid,ids,functionId);
+	public String updateP2pCfgValid(Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) {
+		try {
+			fileTransferCfgService.updateP2pCfgValid(isValid,ids,functionId);
+			addMessage(redirectAttributes,"success","delete_success");
+		} catch (Exception e) {
+			if(e instanceof MaatConvertException) {
+				e.printStackTrace();
+				logger.info("P2P配置删除失败："+e.getMessage());;
+				addMessage(redirectAttributes,"error","request_service_failed");
+			}else {
+				e.printStackTrace();
+				logger.error("P2P配置删除失败",e);
+				addMessage(redirectAttributes,"error","delete_failed");
+			}
+		}
 		return "redirect:" + adminPath +"/ntc/fileTransfer/p2pList?functionId="+functionId;
 	}
 	
@@ -538,6 +567,7 @@ public class FileTransferCfgController  extends BaseController{
 				entity.setFunctionId(functionId);
 				try {
 					fileTransferCfgService.auditP2pCfg(entity,isAudit);
+					addMessage(redirectAttributes,"success","audit_success");
 				} catch ( Exception e) {
 					e.printStackTrace();
 					logger.info("p2p配置下发失败："+e.getMessage());
diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
index 702b07e..9beb716 100644
--- a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
+++ b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
@@ -531,7 +531,7 @@ public class PxyObjKeyringController extends BaseController  {
 	 		try {
 	 			boolean certFileflag=validCertFileContent(certFileI,"-incert");
 	 			if(!certFileflag){
-	 				addMessage(redirectAttributes,"save_failed");
+	 				addMessage(redirectAttributes,"error","save_failed");
 	 				logger.error(certFileI.getOriginalFilename()+" file non Certificate file format ");
 	 				throw new MultiPartNewException(this.getMsgProp().getProperty("certificate_file_error"));
 	 			}
@@ -618,7 +618,7 @@ public class PxyObjKeyringController extends BaseController  {
 				if( crlFileI != null){
 					boolean certFileflag=validCertFileContent(crlFileI,"-incrl");
 					if(!certFileflag){
-						addMessage(redirectAttributes,"save_failed");
+						addMessage(redirectAttributes,"error","save_failed");
 						logger.error(crlFileI.getOriginalFilename()+" file non crl file format ");
 						throw new MultiPartNewException(this.getMsgProp().getProperty("crl_file_error"));
 					}
diff --git a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java
index 51b24a5..fd9f6bd 100644
--- a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java
+++ b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java
@@ -168,7 +168,7 @@ public class DashboardController extends BaseController{
 			} catch (Exception e) {
 				e.printStackTrace();
 				logger.error("活跃IP统计错误"+e);
-				addMessage(redirectAttributes,"request_service_failed");
+				addMessage(redirectAttributes,"error","request_service_failed");
 			}
 		
         model.addAttribute("ipActiveList", ipActiveList);
diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
index bd836ba..f1a8c6b 100644
--- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
+++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
@@ -115,9 +115,9 @@ public class TrafficStatisticsInfoController extends BaseController {
 	public String bandwidthList(Model model){
 		        Calendar cal = Calendar. getInstance ();
 		        cal.setTime(new Date());
-		        String now =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format(cal.getTime());//获取到完整的时间
+		        String now =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());//获取到完整的时间
 		        cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1);
-		        String oneHoursAgo =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format(cal.getTime());
+		        String oneHoursAgo =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());
 		        model.addAttribute("beginDate", oneHoursAgo);
 		        model.addAttribute("endDate", now);
 		return "/dashboard/trafficBandwidthList";
@@ -126,7 +126,14 @@ public class TrafficStatisticsInfoController extends BaseController {
 	 * 流量统计滚动动作查看详情页面
 	 */
 	@RequestMapping(value={"trafficBlockList","trafficMonitorList"})
-	public String serviceBlockList(@RequestParam("searchAction")String searchAction,HttpServletRequest request, HttpServletResponse response, Model model){
+	public String serviceBlockList(@RequestParam("searchAction")String searchAction,Model model){
+		 Calendar cal = Calendar. getInstance ();
+	        cal.setTime(new Date());
+	        String now =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());//获取到完整的时间
+	        cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1);
+	        String oneHoursAgo =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());
+	        model.addAttribute("beginDate", oneHoursAgo);
+	        model.addAttribute("endDate", now);
 		model.addAttribute("searchAction", searchAction);
 		return "/dashboard/trafficActionTransList";
 	}
@@ -135,12 +142,13 @@ public class TrafficStatisticsInfoController extends BaseController {
 	 */
 	@RequestMapping(value="actionEntranceTrans")
 	@ResponseBody
-	public List actionTrans(@RequestParam("searchAction")String searchAction){
+	public List actionTrans(String beginDate,String endDate,@RequestParam("searchAction")String searchAction){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List resultList = new ArrayList();
 		String url = Constants.DASHBOARD_URL+Constants.NTC_ACTION_ENTRANCE_REPORT;
 			url=url+"?searchAction="+searchAction;
 		try {
+			url = urlAddDate(url,beginDate,endDate);
 			String string = HttpClientUtil.get(url);
 			Gson gson = new GsonBuilder().create();
 			fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType());
@@ -153,13 +161,23 @@ public class TrafficStatisticsInfoController extends BaseController {
 		}
 		return resultList;
 	}
+	/**
+	 * 
+	 * 
+	 * url路径时间参数格式化
+	 * @param url
+	 * @param beginDate
+	 * @param endDate
+	 * @return
+	 * @throws URISyntaxException
+	 */
 	public String urlAddDate(String url,String beginDate,String endDate) throws URISyntaxException{
 		if(StringUtil.isBlank(beginDate)||StringUtil.isBlank(endDate)){
 			 Calendar cal = Calendar. getInstance ();
 		        cal.setTime(new Date());
-		        endDate =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format(cal.getTime());//获取到完整的时间
+		        endDate =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());//获取到完整的时间
 		        cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1);
-		        beginDate =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format(cal.getTime());
+		        beginDate =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());
 		}
 		URIBuilder uriBuilder = new URIBuilder(url);
 		uriBuilder.addParameter("beginDate",beginDate);
@@ -239,11 +257,11 @@ public class TrafficStatisticsInfoController extends BaseController {
 	public String protocolTypeList(Model model){
 		Calendar cal = Calendar. getInstance ();
         cal.setTime(new Date());
-        String now =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format(cal.getTime());//获取到完整的时间
+        String now =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());//获取到完整的时间
         cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1);
-        String oneHoursAgo =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format(cal.getTime());
-        model.addAttribute("searchFoundStartTime", oneHoursAgo);
-        model.addAttribute("searchFoundEndTime", now);
+        String oneHoursAgo =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());
+        model.addAttribute("beginDate", oneHoursAgo);
+        model.addAttribute("endDate", now);
 		return "/dashboard/trafficProtocolTypeList";
 	}
 	/**
@@ -251,16 +269,12 @@ public class TrafficStatisticsInfoController extends BaseController {
 	 */
 	@RequestMapping(value="protocolList")
 	@ResponseBody
-	public List protocolList(Model model,@RequestParam(required=false)String searchFoundStartTime,@RequestParam(required=false)String searchFoundEndTime){
+	public List protocolList(Model model,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List list = new ArrayList();
 		String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_PROTOCOL_LIST;
 		try {
-			if(!StringUtil.isBlank(searchFoundStartTime)&&!StringUtil.isBlank(searchFoundEndTime)){
-				searchFoundStartTime=URLEncoder.encode(searchFoundStartTime, "UTF-8");
-				searchFoundEndTime=URLEncoder.encode(searchFoundEndTime, "UTF-8");
-				url+="?searchFoundStartTime="+searchFoundStartTime+"&searchFoundEndTime="+searchFoundEndTime;
-			}
+			url=urlAddDate(url,beginDate,endDate);
 			String string = HttpClientUtil.get(url);
 			Gson gson = new GsonBuilder().create();
 			fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType());
@@ -311,7 +325,14 @@ public class TrafficStatisticsInfoController extends BaseController {
 	 * App类型详细列表
 	 */
 	@RequestMapping(value="appTypeList")
-	public String appTypeList(){
+	public String appTypeList(Model model){
+		Calendar cal = Calendar. getInstance ();
+        cal.setTime(new Date());
+        String now =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());//获取到完整的时间
+        cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1);
+        String oneHoursAgo =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());
+        model.addAttribute("beginDate", oneHoursAgo);
+        model.addAttribute("endDate", now);
 		return "/dashboard/trafficAppTypeList";
 	}
 	/**
@@ -319,16 +340,12 @@ public class TrafficStatisticsInfoController extends BaseController {
 	 */
 	@RequestMapping(value="appList")
 	@ResponseBody
-	public List appList(@RequestParam(value="searchFoundStartTime",required=false)String searchFoundStartTime,@RequestParam(value="searchFoundEndTime",required=false)String searchFoundEndTime){
+	public List appList(@RequestParam(value="beginDate",required=false)String beginDate,@RequestParam(value="endDate",required=false)String endDate){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List list = new ArrayList();
 		String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_APP_LIST;
 		try {
-			if(!StringUtil.isBlank(searchFoundStartTime)&&!StringUtil.isBlank(searchFoundEndTime)){
-				searchFoundStartTime=URLEncoder.encode(searchFoundStartTime, "UTF-8");
-				searchFoundEndTime=URLEncoder.encode(searchFoundEndTime, "UTF-8");
-				url+="?searchFoundStartTime="+searchFoundStartTime+"&searchFoundEndTime="+searchFoundEndTime;
-			}
+			url=urlAddDate(url,beginDate,endDate);
 			String string = HttpClientUtil.get(url);
 			Gson gson = new GsonBuilder().create();
 			fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType());
diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java
index e92d55d..6c747bf 100644
--- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java
+++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java
@@ -94,23 +94,29 @@ public class TrafficStatisticsReportController extends BaseController {
 			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");
+				String firstAccount="";
+				if(accountMap!=null&&accountMap.get("account")!=null){
+					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");
+				Map ipMap = (Map) nasIpList.get(0);
+				String firstIp="";
+				if(ipMap!=null&&ipMap.get("nasIp")!=null){
+					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);
 				
diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
index 32039ca..e897fac 100644
--- a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
+++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
@@ -159,10 +159,10 @@ public class SpecificServiceCfgController extends BaseController {
 			RedirectAttributes redirectAttributes) {
 		try {
 			specificServiceCfgService.saveOrUpdate(specificServiceCfg);
-			addMessage(redirectAttributes, "save_success");
+			addMessage(redirectAttributes,"success", "save_success");
 		} catch (Exception e) {
 			e.printStackTrace();
-			addMessage(redirectAttributes, "save_failed");
+			addMessage(redirectAttributes,"error", "save_failed");
 		}
 		return "redirect:" + adminPath + "/specific/specificServiceCfg/list?cfgType="+specificServiceCfg.getCfgType();
 	}
@@ -179,10 +179,10 @@ public class SpecificServiceCfgController extends BaseController {
 	public String delete(SpecificServiceCfg specificServiceCfg, RedirectAttributes redirectAttributes, String mulitId){
 		try{
 			specificServiceCfgService.delete(mulitId);
-			addMessage(redirectAttributes,"delete_success");
+			addMessage(redirectAttributes,"success","delete_success");
 		}catch (Exception e){
 			e.printStackTrace();
-			addMessage(redirectAttributes,"delete_failed");
+			addMessage(redirectAttributes,"error","delete_failed");
 		}
 		
 		return "redirect:"+adminPath+"/specific/specificServiceCfg/list";
diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java
index dbbbbc6..b2f538c 100644
--- a/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java
+++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java
@@ -95,10 +95,10 @@ public class SpecificServiceHostCfgController extends BaseController {
 	public String saveOrUpdate(SpecificServiceHostCfg specificServiceHostCfg,Model model,RedirectAttributes redirectAttributes){
 		try {
 			specificServiceHostCfgService.saveOrUpdate(specificServiceHostCfg);
-			addMessage(redirectAttributes, "save_success");
+			addMessage(redirectAttributes,"success", "save_success");
 		} catch (Exception e) {
 			e.printStackTrace();
-			addMessage(redirectAttributes, "save_failed");
+			addMessage(redirectAttributes,"error", "save_failed");
 		}
 		return "redirect:"+adminPath+"/specific/specificServiceHostCfg/list";
 	}
@@ -114,10 +114,10 @@ public class SpecificServiceHostCfgController extends BaseController {
 	public String delete(SpecificServiceHostCfg specificServiceHostCfg, RedirectAttributes redirectAttributes, String mulitId){
 		try{
 			specificServiceHostCfgService.delete(mulitId);
-			addMessage(redirectAttributes,"delete_success");
+			addMessage(redirectAttributes,"success","delete_success");
 		}catch (Exception e){
 			e.printStackTrace();
-			addMessage(redirectAttributes,"delete_failed");
+			addMessage(redirectAttributes,"error","delete_failed");
 		}
 		
 		return "redirect:"+adminPath+"/specific/specificServiceHostCfg/list";
@@ -148,7 +148,7 @@ public class SpecificServiceHostCfgController extends BaseController {
 	        	write(request,response, fileName).dispose();
 	        return null;
 	    } catch (Exception e) {
-	    	addMessage(redirectAttributes, msgProp.getProperty("import_template_failed")+e.getMessage());
+	    	addMessage(redirectAttributes,"error", msgProp.getProperty("import_template_failed")+e.getMessage());
 	    }
 	    return "redirect:"+adminPath+"/specific/specificServiceHostCfg/list";
 	}
diff --git a/src/main/java/com/nis/web/controller/sys/AreaController.java b/src/main/java/com/nis/web/controller/sys/AreaController.java
index 884bea0..9118388 100644
--- a/src/main/java/com/nis/web/controller/sys/AreaController.java
+++ b/src/main/java/com/nis/web/controller/sys/AreaController.java
@@ -70,7 +70,7 @@ public class AreaController extends BaseController {
 	@RequestMapping(value = "saveOrUpdate")
 	public String saveOrUpdate(SysArea sysArea, Model model, RedirectAttributes redirectAttributes) {
 		areaService.saveOrUpdate(sysArea);
-		addMessage(redirectAttributes, "保存区域'" + sysArea.getName() + "'成功");
+		addMessage(redirectAttributes,"success", "save_success");
 		String id = sysArea.getParentId().equals(0l) ? "" : String.valueOf(sysArea.getParentId());
 		
 		return "redirect:" + adminPath + "/sys/area/list?id="+id+"&parentIds="+sysArea.getParent().getParentIds();
@@ -82,7 +82,7 @@ public class AreaController extends BaseController {
 	public String delete(SysArea area, RedirectAttributes redirectAttributes) {
 		areaService.delete(area);
 		
-		addMessage(redirectAttributes, "删除区域成功");
+		addMessage(redirectAttributes,"success", "delete_success");
 		
 		return "redirect:" + adminPath + "/sys/area/list?id="+area.getParentId()+"&parentIds="+area.getParent().getParentIds();
 	}
diff --git a/src/main/java/com/nis/web/controller/sys/DictController.java b/src/main/java/com/nis/web/controller/sys/DictController.java
index d2ccd28..426639d 100644
--- a/src/main/java/com/nis/web/controller/sys/DictController.java
+++ b/src/main/java/com/nis/web/controller/sys/DictController.java
@@ -68,10 +68,10 @@ public class DictController extends BaseController {
 			dictService.saveOrUpdate(sysDictName);
 			//删除字典缓存
 			CacheUtils.remove(Constants.CACHE_DICT_MAP);
-			addMessage(redirectAttributes, "save_success");
+			addMessage(redirectAttributes,"success", "save_success");
 		} catch (Exception e) {
 			e.printStackTrace();
-			addMessage(redirectAttributes, "save_failed");
+			addMessage(redirectAttributes,"error", "save_failed");
 		}
 		
 		return "redirect:" + adminPath + "/sys/dict/list";
@@ -85,10 +85,10 @@ public class DictController extends BaseController {
 			dictService.deleteDict(id);
 			//删除字典缓存
 			CacheUtils.remove(Constants.CACHE_DICT_MAP);
-			addMessage(redirectAttributes, "delete_success");
+			addMessage(redirectAttributes,"success", "delete_success");
 		} catch (Exception e) {
 			e.printStackTrace();
-			addMessage(redirectAttributes, "delete_failed");
+			addMessage(redirectAttributes,"error", "delete_failed");
 		}
 		
 		
diff --git a/src/main/java/com/nis/web/controller/sys/MenuController.java b/src/main/java/com/nis/web/controller/sys/MenuController.java
index f104f0f..e262f02 100644
--- a/src/main/java/com/nis/web/controller/sys/MenuController.java
+++ b/src/main/java/com/nis/web/controller/sys/MenuController.java
@@ -71,12 +71,12 @@ public class MenuController extends BaseController {
 	@RequestMapping(value = "saveOrUpdate")
 	public String saveOrUpdate(SysMenu menu, Model model, RedirectAttributes redirectAttributes) {
 		if(!UserUtils.getUser().isAdmin()){
-			addMessage(redirectAttributes, "越权操作，只有超级管理员才能添加或修改数据！");
+			addMessage(redirectAttributes,"error", "越权操作，只有超级管理员才能添加或修改数据！");
 			return "redirect:" + adminPath + "/sys/role/?repage";
 		}
 		
 		menuService.saveOrUpdateMenu(menu);
-		addMessage(redirectAttributes, "保存菜单'" + menu.getName() + "'成功");
+		addMessage(redirectAttributes,"success", "保存菜单'" + menu.getName() + "'成功");
 		return "redirect:" + adminPath + "/sys/menu/";
 	}
 	
@@ -89,7 +89,7 @@ public class MenuController extends BaseController {
 //			addMessage(redirectAttributes, "删除菜单失败, 不允许删除顶级菜单或编号为空");
 //		}else{
 		menuService.deleteMenu(menu);
-		addMessage(redirectAttributes, "删除菜单成功");
+		addMessage(redirectAttributes,"success", "删除菜单成功");
 //		}
 		return "redirect:" + adminPath + "/sys/menu/";
 	}
diff --git a/src/main/java/com/nis/web/controller/sys/OfficeController.java b/src/main/java/com/nis/web/controller/sys/OfficeController.java
index 4879033..c65b905 100644
--- a/src/main/java/com/nis/web/controller/sys/OfficeController.java
+++ b/src/main/java/com/nis/web/controller/sys/OfficeController.java
@@ -99,7 +99,7 @@ public class OfficeController extends BaseController {
 	public String saveOrUpdate(SysOffice office, Model model, RedirectAttributes redirectAttributes) {
 		
 		officeService.saveOrUpdate(office);
-		addMessage(redirectAttributes, "save_success");
+		addMessage(redirectAttributes,"success", "save_success");
 		String id = office.getParentId().equals(0l) ? "" : String.valueOf(office.getParentId());
 		
 		return "redirect:" + adminPath + "/sys/office/list?id="+id+"&parentIds="+office.getParentIds();
@@ -114,7 +114,7 @@ public class OfficeController extends BaseController {
 //			addMessage(redirectAttributes, "删除机构失败, 不允许删除顶级机构或编号空");
 //		}else{
 			officeService.delete(office);
-			addMessage(redirectAttributes, "delete_success");
+			addMessage(redirectAttributes,"success", "delete_success");
 //		}
 		String id = office.getParentId().equals(0l) ? "" : String.valueOf(office.getParentId());
 		
diff --git a/src/main/java/com/nis/web/controller/sys/RoleController.java b/src/main/java/com/nis/web/controller/sys/RoleController.java
index ca08868..1a7484f 100644
--- a/src/main/java/com/nis/web/controller/sys/RoleController.java
+++ b/src/main/java/com/nis/web/controller/sys/RoleController.java
@@ -143,11 +143,11 @@ public class RoleController extends BaseController {
 	public String saveOrUpdate(SysRole role, Model model, RedirectAttributes redirectAttributes) {
 		
 		if (!"true".equals(checkName(role.getOldName(), role.getName()))){
-			addMessage(model, "save_failed");
+			addMessage(redirectAttributes,"error", "save_failed");
 			return form(role, model);
 		}
 		roleService.saveOrUpdate(role);
-		addMessage(redirectAttributes, "save_success");
+		addMessage(redirectAttributes,"success", "save_success");
 		return "redirect:" + adminPath + "/sys/role/?repage";
 	}
 	
@@ -155,7 +155,7 @@ public class RoleController extends BaseController {
 	@RequestMapping(value = "delete")
 	public String delete(SysRole role, RedirectAttributes redirectAttributes) {
 		roleService.deleteRole(role);
-		addMessage(redirectAttributes, "delete_success");
+		addMessage(redirectAttributes,"success", "delete_success");
 		return "redirect:" + adminPath + "/sys/role/?repage";
 	}
 	
@@ -195,16 +195,16 @@ public class RoleController extends BaseController {
 		if (UserUtils.getUser().getId().equals(userId)) {
 			/*format(getMsgProp().get("single_file_upload_size_error").toString(),
 					role.getName(),user.getName());*/
-			addMessage(redirectAttributes, "无法从角色【" + role.getName() + "】中移除用户【" + user.getName() + "】自己！");
+			addMessage(redirectAttributes,"error", "无法从角色【" + role.getName() + "】中移除用户【" + user.getName() + "】自己！");
 		}else {
 			if (user.getUserRoleList().size() <= 1){
-				addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！这已经是该用户的唯一角色，不能移除。");
+				addMessage(redirectAttributes,"error", "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！这已经是该用户的唯一角色，不能移除。");
 			}else{
 				Boolean flag = systemService.outUserInRole(role, user);
 				if (!flag) {
-					addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！");
+					addMessage(redirectAttributes,"error", "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！");
 				}else {
-					addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除成功！");
+					addMessage(redirectAttributes,"success", "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除成功！");
 				}
 			}		
 		}
diff --git a/src/main/java/com/nis/web/controller/sys/UserController.java b/src/main/java/com/nis/web/controller/sys/UserController.java
index 198b828..43399a2 100644
--- a/src/main/java/com/nis/web/controller/sys/UserController.java
+++ b/src/main/java/com/nis/web/controller/sys/UserController.java
@@ -1,12 +1,24 @@
 package com.nis.web.controller.sys;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.derby.tools.sysinfo;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.cache.Cache;
+import org.apache.shiro.mgt.RealmSecurityManager;
+import org.apache.shiro.realm.Realm;
+import org.apache.shiro.session.Session;
+import org.apache.shiro.subject.PrincipalCollection;
+import org.apache.shiro.subject.SimplePrincipalCollection;
+import org.apache.shiro.subject.support.DefaultSubjectContext;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -22,11 +34,14 @@ import com.nis.domain.Page;
 import com.nis.domain.SysRole;
 import com.nis.domain.SysUser;
 import com.nis.util.DateUtils;
+import com.nis.util.IpUtil;
 import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.util.excel.ExportExcel;
 import com.nis.web.controller.BaseController;
+import com.nis.web.security.SystemAuthorizingRealm;
 import com.nis.web.security.UserUtils;
+import com.nis.web.security.UsernamePasswordToken;
 
 @Controller
 @RequestMapping("${adminPath}/sys/user")
@@ -97,7 +112,7 @@ public class UserController extends BaseController{
 			return form(user, model);
 		}*/
 		if (!"true".equals(checkLoginName(user.getOldLoginId(), user.getLoginId()))){
-			addMessage(model, "save_failed");
+			addMessage(model,"error", "save_failed");
 			return form(user, model);
 		}
 		// 角色数据有效性验证，过滤不在授权内的角色
@@ -115,7 +130,7 @@ public class UserController extends BaseController{
 		if (user.getLoginId().equals(UserUtils.getUser().getLoginId())){
 			UserUtils.clearCache();
 		}
-		addMessage(redirectAttributes, "save_success");
+		addMessage(redirectAttributes,"success", "save_success");
 		return "redirect:" + adminPath + "/sys/user/list?repage";
 	}
 	
@@ -125,12 +140,12 @@ public class UserController extends BaseController{
 	public String delete(SysUser user, RedirectAttributes redirectAttributes) {
 		
 		if (UserUtils.getUser().getId().equals(user.getId())){
-			addMessage(redirectAttributes, "delete_failed");
+			addMessage(redirectAttributes,"error", "delete_failed");
 		}else if (user.isAdmin()){
-			addMessage(redirectAttributes, "delete_failed_admin");
+			addMessage(redirectAttributes,"error", "delete_failed_admin");
 		}else{
 			userService.deleteUser(user);
-			addMessage(redirectAttributes, "delete_success");
+			addMessage(redirectAttributes,"success", "delete_success");
 		}
 		return "redirect:" + adminPath + "/sys/user/list?repage";
 	}
@@ -205,7 +220,7 @@ public class UserController extends BaseController{
     		new ExportExcel("用户数据", SysUser.class).setDataList(getMsgProp(),page.getList(),null).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
-			addMessage(redirectAttributes, "导出用户失败！失败信息："+e.getMessage());
+			addMessage(redirectAttributes,"error", "导出用户失败！失败信息："+e.getMessage());
 		}
 		return "redirect:" + adminPath + "/sys/user/list?repage";
     }
@@ -277,6 +292,44 @@ public class UserController extends BaseController{
 			
 			if (StringUtils.validatePassword(oldPassword, user.getPassword())){
 				userService.updatePasswordById(user.getId(), user.getLoginId(), newPassword);
+				systemService.deleteSession(UserUtils.getSession());
+				RealmSecurityManager securityManager =  
+					     (RealmSecurityManager) SecurityUtils.getSecurityManager();  
+				Collection<Realm> realm=securityManager.getRealms();
+			   for (Realm realm2 : realm) {
+				   SystemAuthorizingRealm userRealm = (SystemAuthorizingRealm) realm2;  
+				   userRealm.clearCachedAuthorizationInfo(UserUtils.getPrincipal());
+				   userRealm.clearCachedAuthenticationInfo(UserUtils.getPrincipal());
+				   
+				  /* new UsernamePasswordToken(UserUtils.getUser(), UserUtils.getUser().getpas.toCharArray(), rememberMe, host, captcha, mobile);*/
+				   
+				   Cache<Object, AuthenticationInfo> cache= userRealm.getAuthenticationCache();
+				   for (AuthenticationInfo auth :  cache.values()) {
+					   /*auth.getPrincipals().getPrimaryPrincipal()*/
+						userRealm.getAuthenticationCache().remove(auth.getPrincipals().getPrimaryPrincipal());
+					}
+			   }
+					    /*userRealm.clearCachedAuthorizationInfoC(SecurityUtils.getSubject().getPreviousPrincipals());*/
+				
+				
+				
+				/*Cache<Object, AuthenticationInfo> cache=SecurityUtils.getSecurityManager() getAvailableAuthenticationCache();;
+				 Object cacheKey="";
+				for (Object cacheKey1 :  cache.keys()) {
+					cacheKey=cacheKey1;
+					System.out.println(cacheKey);
+					System.out.println(userRealm.getAuthenticationCache().get(cacheKey));
+					AuthenticationInfo auth=cache.get(cacheKey);
+					userRealm.clearCachedAuthorizationInfoC(auth.getPrincipals());
+				}*/
+				/*userRealm.getAuthenticationCache().remove(cacheKey);
+				 userRealm.getAuthenticationCache().remove(cacheKey);
+				for (AuthenticationInfo auth :  cache.values()) {
+					//userRealm.clearCachedAuthorizationInfoC(auth.getPrincipals());
+					userRealm.getAuthenticationCache().remove(auth.getPrincipals());
+				}
+				 Cache<Object, AuthenticationInfo> cache2=userRealm.getAuthenticationCache();*/
+			    /*UserUtils.getSubject().logout();*/
 				model.addAttribute("message", "update_success");
 			}else{
 				model.addAttribute("message", "update_failed");
diff --git a/src/main/java/com/nis/web/dao/UserDao.xml b/src/main/java/com/nis/web/dao/UserDao.xml
index c33c61d..61f2087 100644
--- a/src/main/java/com/nis/web/dao/UserDao.xml
+++ b/src/main/java/com/nis/web/dao/UserDao.xml
@@ -22,7 +22,7 @@
 	</select>
 	
 	<select id="getUserByLoginName"  resultMap="userResultMap">
-		select 
+		SELECT 
 			id,
 			login_id,
 			name,
@@ -31,7 +31,7 @@
 			email,
 			create_time,
 			status
-		from sys_user where login_id=#{loginName}
+		FROM sys_user WHERE login_id=#{loginName} AND status != 0
 	</select>
 	
 	<!-- map 转为对象 -->
diff --git a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java
index de7729f..2d66112 100644
--- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java
+++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java
@@ -25,4 +25,5 @@ public interface AsnIpCfgDao extends CrudDao<AsnIpCfg>{
 	public int deleteByAsnGroup(@Param("asnId")String asnNo);
 	public int insertBatch(List<AsnIpCfg> list);
 	public Varibles getVaribles(@Param("name")String name);
+	public void ajaxDeleteAsnIp(@Param("ids")String ids);
 }
diff --git a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
index 28b403c..2eed756 100644
--- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
@@ -408,6 +408,9 @@
    <update id="delete" parameterType="java.lang.String" >
     delete from asn_ip_cfg where cfg_id in (${ids}) 
    </update>
+   <update id="ajaxDeleteAsnIp" parameterType="java.lang.String" >
+    delete from asn_ip_cfg where asn_ip_group in (${ids}) 
+   </update>
 	<select id="findOtherIps" resultType="java.lang.Integer" parameterType="java.lang.Integer">
 	  select 1 from asn_ip_cfg where is_valid=1 and asn_ip_group=#{groupId} and cfg_id !=#{cfgId} limit 1
 	</select>
diff --git a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml
index 1134253..859c119 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml
@@ -450,9 +450,9 @@
    	 	<if test="isValid !=null">

   			AND r.is_valid = #{isValid,jdbcType=INTEGER}

   		</if>

-  		<!-- <if test="isValid == null">

+  		<if test="isValid == null">

     		AND r.is_valid != -1

-    	</if> -->

+    	</if>

    	 	<if test="functionId != null">

     		AND r.function_id = #{functionId,jdbcType=INTEGER}

     	</if>

diff --git a/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java b/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java
index dde663d..2060961 100644
--- a/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java
+++ b/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java
@@ -353,9 +353,9 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
 	}
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
 	public void delete(Integer isValid,String ids) {
-		for(String id:ids.split(",")) {
+		/*for(String id:ids.split(",")) {
 			Long.parseLong(id);
-		}
+		}*/
 		List<AsnIpCfg> issuedList=new ArrayList<>();
 		List<AsnIpCfg> asnIpCfgList= asnIpCfgDao.getByIds(ids);
 		
@@ -373,7 +373,9 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
 		asnIpCfgDao.delete(ids);
 		//已经下发过的,调用分组复用配置删除接口
 //		splitAndSend(issuedList,Constants.VALID_NO);
-		asnIPRegionSendToMaat(issuedList,Constants.VALID_NO);
+		if(issuedList.size() > 0){
+			asnIPRegionSendToMaat(issuedList,Constants.VALID_NO);
+		}
 		
 	}
 //	public List<ConfigGroupInfo> findPolicyGroupInfosByType(Integer groupId) {
@@ -463,4 +465,7 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
 			asnNoList.clear();
 		}
 	}
+	public void ajaxDeleteAsnIp(String ids) {
+		asnIpCfgDao.ajaxDeleteAsnIp(ids);
+	}
 }