From f93473b4666e4835d704fb8840bb2ce475b36b09 Mon Sep 17 00:00:00 2001
From: DuanDongmei <DuanDongmei@192.168.11.156>
Date: Tue, 4 Dec 2018 09:14:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenance/UserManageController.java     | 34 ++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
index a664f9f55..e984ec2c1 100644
--- a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
+++ b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
@@ -10,6 +10,7 @@ import java.util.Properties;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.eclipse.jetty.util.ajax.JSON;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -36,7 +37,7 @@ public class UserManageController  extends BaseController{
 	@RequiresPermissions(value={"user:manage:view"})
 	public String list(Model model,HttpServletRequest  request,HttpServletResponse response
 			,@ModelAttribute("cfg")UserManage entity){
-		Page<UserManage> page = userManageService.findPage(new Page<UserManage>(request, response,"r"), entity);
+		Page<UserManage> page = userManageService.findPage(new Page<UserManage>(request, response,"a"), entity);
 		model.addAttribute("page", page);
 		return "/cfg/maintenance/userManage/list";
 	}
@@ -301,20 +302,37 @@ public class UserManageController  extends BaseController{
 	
 	@ResponseBody
 	@RequestMapping(value = "userInfo")
-	public List<Map<String,String>> getUserInfo(String serverIp,String userName,HttpServletRequest request,HttpServletResponse response){
+	public Map<String,Object> getUserInfo(String serverIp,String userName,HttpServletRequest request,HttpServletResponse response){
 		String[] ipArray = serverIp.split(",");
 		List<Map<String,String>> userManageList=new ArrayList<Map<String,String>>();
+		String message="";
+		Map<String,Object> mess=new HashMap<String,Object>();
 		for(String ip :ipArray){
+			Map<String,String> map=new HashMap<String,String>();
 			UserManage  user=new UserManage();
 			IpReuseIpCfg  ipReuseIpCfg=ipReuseIpCfgService.getIpByIp(ip);
 			//根据ip调用接口获取数据
-			Map<String,String> map=userManageService.getUser(ip,userName);
-			if(ipReuseIpCfg!=null ){
-				map.put("serverIp", ipReuseIpCfg.getDestIpAddress());
-				userManageList.add(map);
-			}
+			try{
+			String recv=userManageService.getUser(ip,userName);
+			if (StringUtils.isNotBlank(recv)) {
+				map=(Map<String,String>)JSON.parse(recv);
+				if(ipReuseIpCfg!=null ){
+					map.put("serverIp", ipReuseIpCfg.getDestIpAddress());
+					userManageList.add(map);
+				 }
+			   }
+		    } catch (Exception e) {
+		    	if(message==""){
+		    		message=ip;
+		    	}else{
+		    		message+=","+ip;
+		    	}
+			logger.error("查询失败", e);
+		   }
 		}
-		return userManageList;
+		mess.put("message", message);
+		mess.put("user", userManageList);
+		return mess;
 	}
 
 /*	@RequestMapping(value = "view")