无更改

This commit is contained in:
DuanDongmei
2018-12-04 09:14:49 +08:00
parent 534b38fa4e
commit f93473b466

View File

@@ -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")