From 4edab492094c0d3387ee4c707087992cc0d2ff44 Mon Sep 17 00:00:00 2001 From: leijun Date: Thu, 29 Nov 2018 14:06:47 +0800 Subject: [PATCH] =?UTF-8?q?Cgi=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/domain/configuration/UserManage.java | 78 +-------------- .../nis/util/httpclient/HttpClientUtil.java | 12 +-- .../maintenance/UserManageController.java | 13 +-- .../configuration/UserManageService.java | 96 +++++++------------ src/main/resources/nis.properties | 3 +- .../views/cfg/maintenance/userManage/list.jsp | 24 ++--- 6 files changed, 60 insertions(+), 166 deletions(-) diff --git a/src/main/java/com/nis/domain/configuration/UserManage.java b/src/main/java/com/nis/domain/configuration/UserManage.java index 71bed1b83..1bceb2efe 100644 --- a/src/main/java/com/nis/domain/configuration/UserManage.java +++ b/src/main/java/com/nis/domain/configuration/UserManage.java @@ -28,8 +28,7 @@ public class UserManage extends BaseEntity{ private String newUserPwd; private String oldUserName;//原用户名 //用户名详细信息 - private String authType; - private Date createOn; +/* private Date createOn; private Date updatedOn; private String outgoingUnicastPackets; private String outgoingUnicastTotalSize; @@ -39,7 +38,7 @@ public class UserManage extends BaseEntity{ private String incomingUnicastTotalSize; private String incomingBroadcastPackets; private String incomingBroadcastTotalSize; - private Integer numberOfLogins; + private Integer numberOfLogins;*/ private String creatorName; private String editorName; @@ -211,79 +210,6 @@ public class UserManage extends BaseEntity{ public void setTransferPackets(String transferPackets) { this.transferPackets = transferPackets; } - public String getAuthType() { - return authType; - } - public void setAuthType(String authType) { - this.authType = authType; - } - public Date getCreateOn() { - return createOn; - } - public void setCreateOn(Date createOn) { - this.createOn = createOn; - } - public Date getUpdatedOn() { - return updatedOn; - } - public void setUpdatedOn(Date updatedOn) { - this.updatedOn = updatedOn; - } - public String getOutgoingUnicastPackets() { - return outgoingUnicastPackets; - } - public void setOutgoingUnicastPackets(String outgoingUnicastPackets) { - this.outgoingUnicastPackets = outgoingUnicastPackets; - } - public String getOutgoingUnicastTotalSize() { - return outgoingUnicastTotalSize; - } - public void setOutgoingUnicastTotalSize(String outgoingUnicastTotalSize) { - this.outgoingUnicastTotalSize = outgoingUnicastTotalSize; - } - public String getOutgoingBroadcastPackets() { - return outgoingBroadcastPackets; - } - public void setOutgoingBroadcastPackets(String outgoingBroadcastPackets) { - this.outgoingBroadcastPackets = outgoingBroadcastPackets; - } - public String getOutgoingBroadcastTotalSize() { - return outgoingBroadcastTotalSize; - } - public void setOutgoingBroadcastTotalSize(String outgoingBroadcastTotalSize) { - this.outgoingBroadcastTotalSize = outgoingBroadcastTotalSize; - } - - public String getIncomingUnicastPackets() { - return incomingUnicastPackets; - } - public void setIncomingUnicastPackets(String incomingUnicastPackets) { - this.incomingUnicastPackets = incomingUnicastPackets; - } - public String getIncomingUnicastTotalSize() { - return incomingUnicastTotalSize; - } - public void setIncomingUnicastTotalSize(String incomingUnicastTotalSize) { - this.incomingUnicastTotalSize = incomingUnicastTotalSize; - } - public String getIncomingBroadcastPackets() { - return incomingBroadcastPackets; - } - public void setIncomingBroadcastPackets(String incomingBroadcastPackets) { - this.incomingBroadcastPackets = incomingBroadcastPackets; - } - public String getIncomingBroadcastTotalSize() { - return incomingBroadcastTotalSize; - } - public void setIncomingBroadcastTotalSize(String incomingBroadcastTotalSize) { - this.incomingBroadcastTotalSize = incomingBroadcastTotalSize; - } - public Integer getNumberOfLogins() { - return numberOfLogins; - } - public void setNumberOfLogins(Integer numberOfLogins) { - this.numberOfLogins = numberOfLogins; - } public static String getTablename() { return tableName; } diff --git a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java index 68d9565e4..dcd2fa06c 100644 --- a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java +++ b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java @@ -400,16 +400,8 @@ public class HttpClientUtil { //获取响应结果 Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); response= header.get(); - int status = response.getStatus(); - if (status == HttpStatus.SC_OK) { - result= response.readEntity(String.class); - result = galaxyMessageFormat(result); - logger.info("获取消息成功，相应内容如下： " + result); - - } else { - logger.error("获取消息失败，相应内容如下： " + result); - throw new MaatConvertException(status+""); - } + result= response.readEntity(String.class); + logger.info("获取消息成功，相应内容如下： " + result); } catch (Exception e) { e.printStackTrace(); logger.error("获取消息失败，相应内容如下： " + result); 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 df0b54fcb..1a4fd32b5 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 @@ -1,6 +1,7 @@ package com.nis.web.controller.configuration.maintenance; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -144,17 +145,17 @@ public class UserManageController extends BaseController{ @ResponseBody @RequestMapping(value = "userInfo") - public List getUserInfo(String serverIp,HttpServletRequest request,HttpServletResponse response){ + public List> getUserInfo(String serverIp,String userName,HttpServletRequest request,HttpServletResponse response){ String[] ipArray = serverIp.split(","); - List userManageList=new ArrayList(); + List> userManageList=new ArrayList>(); for(String ip :ipArray){ UserManage user=new UserManage(); IpReuseIpCfg ipReuseIpCfg=ipReuseIpCfgService.getIpByIp(ip); //根据ip调用接口获取数据 - //user=userManageService.getUser(ip, request); - if(ipReuseIpCfg!=null){ - user.setServerIp(ipReuseIpCfg.getDestIpAddress()); - userManageList.add(user); + Map map=userManageService.getUser(ip,userName, request); + if(ipReuseIpCfg!=null ){ + map.put("serverIp", ipReuseIpCfg.getDestIpAddress()); + userManageList.add(map); } } return userManageList; diff --git a/src/main/java/com/nis/web/service/configuration/UserManageService.java b/src/main/java/com/nis/web/service/configuration/UserManageService.java index 6de5cb043..36c2fa89c 100644 --- a/src/main/java/com/nis/web/service/configuration/UserManageService.java +++ b/src/main/java/com/nis/web/service/configuration/UserManageService.java @@ -7,28 +7,16 @@ 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.springframework.beans.BeanUtils; +import org.eclipse.jetty.util.ajax.JSON; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.reflect.TypeToken; import com.nis.domain.Page; -import com.nis.domain.basics.IpReuseIpCfg; import com.nis.domain.configuration.UserManage; -import com.nis.domain.log.NtcIpLog; -import com.nis.domain.maat.LogRecvData; -import com.nis.domain.maat.MaatCfg; -import com.nis.domain.maat.ToMaatBean; -import com.nis.domain.maat.ToMaatResult; import com.nis.exceptions.MaatConvertException; -import com.nis.util.ConfigServiceUtil; import com.nis.util.Constants; import com.nis.util.StringUtil; import com.nis.util.httpclient.HttpClientUtil; @@ -73,13 +61,8 @@ public class UserManageService extends BaseService{ params.put("server_ip", ip); params.put("user_name", entity.getUserName()); params.put("user_pwd", entity.getUserPwd()); - LogRecvData fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_CREATE,request); + Map map=getUrl(params,Constants.NTC_IP_REUSE_USER_CREATE,request); //返回处理 - if (fromJson.getStatus().intValue() == 200) { - }else{ - } - String url="?cmd=UserCreate&server_ip="+ip+"&user_name="+entity.getUserName()+"&user_pwd="+entity.getUserPwd(); - System.out.println(url); }*/ } catch (MaatConvertException e) { e.printStackTrace(); @@ -94,17 +77,15 @@ public class UserManageService extends BaseService{ UserManage olduser=userManageDao.getUserById(String.valueOf(entity.getId())); userManageDao.update(entity); //cgi接口删除旧数据 - /*String[] ipArray = olduser.getServerIp().split(","); - for(String ip :ipArray){ + String[] ipArray = olduser.getServerIp().split(","); + /*for(String ip :ipArray){ //循环调用接口删除 Map params = new HashMap(); params.put("server_ip", ip); params.put("user_name", olduser.getUserName()); - LogRecvData fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_DELETE,request); + Map map=getUrl(params,Constants.NTC_IP_REUSE_USER_DELETE,request); //返回处理 - if (fromJson.getStatus().intValue() == 200) { - }else{ - } + }*/ if(StringUtil.isEmpty(entity.getUserName())){ entity.setUserName(olduser.getUserName()); @@ -112,18 +93,16 @@ public class UserManageService extends BaseService{ if(StringUtil.isEmpty(entity.getUserPwd())){ entity.setUserPwd(olduser.getUserPwd()); } - /* String[] newIpArray = entity.getServerIp().split(","); + /*String[] newIpArray = entity.getServerIp().split(","); for(String newIp :newIpArray){ //循环调用接口添加 Map params = new HashMap(); params.put("server_ip", newIp); params.put("user_name", entity.getUserName()); params.put("user_pwd", entity.getUserPwd()); - LogRecvData fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_CREATE,request); + Map map=getUrl(params,Constants.NTC_IP_REUSE_USER_CREATE,request); //返回处理 - if (fromJson.getStatus().intValue() == 200) { - }else{ - } + }*/ }catch (Exception e) { e.printStackTrace(); @@ -132,45 +111,43 @@ public class UserManageService extends BaseService{ } } } - public LogRecvData getUrl(Map params,String urlType,HttpServletRequest request){ - LogRecvData fromJson = new LogRecvData(); + public Map getUrl(Map params,String urlType,HttpServletRequest request){ + Map map=new HashMap(); try{ - String url ="URL"+ urlType ; + String url =Constants.IP_REUSE_CALL_CGI_URL+ Constants.NTC_IP_REUSE_USER_GET ; String recv = HttpClientUtil.getCGI(url, params, request); logger.info("查询结果:" + recv); if (StringUtils.isNotBlank(recv)) { - Gson gson = new GsonBuilder().create(); - fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); + map=(Map)JSON.parse(recv); } } catch (Exception e) { logger.error("查询失败", e); } - return fromJson; + return map; } -/* //根据vpn服务器ip获取用户vpn服务器ip信息 - public UserManage getUser(String serverIp,HttpServletRequest request){ - UserManage user=new UserManage(); + //根据vpn服务器ip获取用户vpn服务器ip信息 + public Map getUser(String serverIp,String userName,HttpServletRequest request){ Map params = new HashMap(); params.put("server_ip", serverIp); + params.put("user_name", userName); + Map map=new HashMap(); try{ - String url ="URL"+ Constants.NTC_IP_REUSE_USER_LIST ; - //String recv = HttpClientUtil.getCGI(url, params, request); - String recv="{\"data\":{\"list\":[{\"userName\":\"zhangsan\",\"createOn\":\"2018-11-01 14:51:12 \",\"updatedOn\":\"2018-11-02 10:54:07 \",\"outgoingUnicastPackets\":\"537,962\",\"outgoingUnicastTotalSize\":\"278,885\",\"outgoingBroadcastPackets\":\"51,130,890\"" - + ",\"outgoingBroadcastTotalSize\":\"4781,154\",\"incomingUnicastPackets\":\"454,121\",\"incomingUnicastTotalSize\":\"45,565\",\"incomingBroadcastPackets\":\"454,4545\"" - + ",\"incomingBroadcastTotalSize\":\"4781,154\",\"numberOfLogins\":\"124\"}]}}"; - recv=HttpClientUtil.galaxyMessageFormat(recv); + String url =Constants.IP_REUSE_CALL_CGI_URL+ Constants.NTC_IP_REUSE_USER_GET ; + String recv = HttpClientUtil.getCGI(url, params, request); logger.info("查询结果:" + recv); if (StringUtils.isNotBlank(recv)) { - Gson gson = new GsonBuilder().create(); - LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); - user=fromJson.getData().getList().get(0); + map=(Map)JSON.parse(recv); } } catch (Exception e) { logger.error("查询失败", e); } - return user; - }*/ + return map; + } + + + + /** * * @param isAudit @@ -179,7 +156,7 @@ public class UserManageService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void delete(Integer isValid,String ids,HttpServletRequest request){ - /*try{*/ + try{ String[] idArray = ids.split(","); List userList=new ArrayList(); for(String id :idArray){ @@ -195,23 +172,20 @@ public class UserManageService extends BaseService{ userManageDao.update(entity); } //cgi接口删除旧数据 -/* for (int i = 0; i < userList.size(); i++) { + /*for (int i = 0; i < userList.size(); i++) { String[] ipArray = userList.get(i).getServerIp().split(","); for(String ip :ipArray){ //循环调用接口删除 Map params = new HashMap(); params.put("server_ip", ip); params.put("user_name",userList.get(i).getUserName()); - LogRecvData fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_DELETE,request); + Map map=getUrl(params,Constants.NTC_IP_REUSE_USER_DELETE,request); //返回处理 - if (fromJson.getStatus().intValue() == 200) { - }else{ - } - } - } - } catch (Exception e) { - logger.error("查询失败", e); - }*/ + } + }*/ + } catch (Exception e) { + logger.error("查询失败", e); + } } public List findUsers() { diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 7a5141dc7..f1aca8c9d 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -564,4 +564,5 @@ userCreate=UserCreate userPasswordSet=UserPasswordSet userDelete=UserDelete userGet=UserGet -userList=UserList \ No newline at end of file +userList=UserList +ip_reuse_call_cgi_url=http://192.168.11.137:8090/command/?cmd= \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp index 6d23fdbbf..2624cce36 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp @@ -51,7 +51,7 @@ $.ajax({ type:'post', url:'${ctx}/maintenance/userManage/userInfo', - data:{"serverIp":serverIp}, + data:{"serverIp":serverIp,"userName":userName}, dataType:'json', async:false, success:function(data){ @@ -73,27 +73,27 @@ html+=""; } html+=""+data[i].serverIp+""; - html+=""+(data[i].createOn==null?"":data[i].createOn); + html+=""+(data[i].Create_on==null?"":data[i].Create_on); html+=""; - html+=""+(data[i].updatedOn==null?"":data[i].updatedOn); + html+=""+(data[i].Updated_on==null?"":data[i].Updated_on); html+=""; - html+=""+(data[i].numberOfLogins==null?"":data[i].numberOfLogins); + html+=""+(data[i].Number_of_Logins==null?"":data[i].Number_of_Logins); html+=""; - html+=""+(data[i].outgoingUnicastPackets==null?"":data[i].outgoingUnicastPackets); + html+=""+(data[i].Outgoing_Unicast_Packets==null?"":data[i].Outgoing_Unicast_Packets); html+=""; - html+=""+(data[i].outgoingUnicastTotalSize==null?"":data[i].outgoingUnicastTotalSize); + html+=""+(data[i].Outgoing_Unicast_Total_Size==null?"":data[i].Outgoing_Unicast_Total_Size); html+=""; - html+=""+(data[i].outgoingBroadcastPackets==null?"":data[i].outgoingBroadcastPackets); + html+=""+(data[i].Outgoing_Broadcast_Packets==null?"":data[i].Outgoing_Broadcast_Packets); html+=""; - html+=""+(data[i].outgoingBroadcastTotalSize==null?"":data[i].outgoingBroadcastTotalSize); + html+=""+(data[i].Outgoing_Broadcast_Total_Size==null?"":data[i].Outgoing_Broadcast_Total_Size); html+=""; - html+=""+(data[i].incomingUnicastPackets==null?"":data[i].incomingUnicastPackets); + html+=""+(data[i].Incoming_Unicast_Packets==null?"":data[i].Incoming_Unicast_Packets); html+=""; - html+=""+(data[i].incomingUnicastTotalSize==null?"":data[i].incomingUnicastTotalSize); + html+=""+(data[i].Incoming_Unicast_Total_Size==null?"":data[i].Incoming_Unicast_Total_Size); html+=""; - html+=""+(data[i].incomingBroadcastPackets==null?"":data[i].incomingBroadcastPackets); + html+=""+(data[i].Incoming_Broadcast_Packets==null?"":data[i].Incoming_Broadcast_Packets); html+=""; - html+=""+(data[i].incomingBroadcastTotalSize==null?"":data[i].incomingBroadcastTotalSize); + html+=""+(data[i].Incoming_Broadcast_Total_Size==null?"":data[i].Incoming_Broadcast_Total_Size); html+=""; html+=""; }