Cgi接口调整
This commit is contained in:
@@ -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<UserManage> fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_CREATE,request);
|
||||
Map<String,String> 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<String, Object> params = new HashMap<String, Object>();
|
||||
params.put("server_ip", ip);
|
||||
params.put("user_name", olduser.getUserName());
|
||||
LogRecvData<UserManage> fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_DELETE,request);
|
||||
Map<String,String> 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<String, Object> params = new HashMap<String, Object>();
|
||||
params.put("server_ip", newIp);
|
||||
params.put("user_name", entity.getUserName());
|
||||
params.put("user_pwd", entity.getUserPwd());
|
||||
LogRecvData<UserManage> fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_CREATE,request);
|
||||
Map<String,String> 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<UserManage> getUrl(Map<String, Object> params,String urlType,HttpServletRequest request){
|
||||
LogRecvData<UserManage> fromJson = new LogRecvData<UserManage>();
|
||||
public Map<String,String> getUrl(Map<String, Object> params,String urlType,HttpServletRequest request){
|
||||
Map<String,String> map=new HashMap<String,String>();
|
||||
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<LogRecvData<UserManage>>(){}.getType());
|
||||
map=(Map<String,String>)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<String,String> getUser(String serverIp,String userName,HttpServletRequest request){
|
||||
Map<String, Object> params = new HashMap<String, Object>();
|
||||
params.put("server_ip", serverIp);
|
||||
params.put("user_name", userName);
|
||||
Map<String,String> map=new HashMap<String,String>();
|
||||
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<UserManage> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<UserManage>>(){}.getType());
|
||||
user=fromJson.getData().getList().get(0);
|
||||
map=(Map<String,String>)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<UserManage> userList=new ArrayList<UserManage>();
|
||||
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<String, Object> params = new HashMap<String, Object>();
|
||||
params.put("server_ip", ip);
|
||||
params.put("user_name",userList.get(i).getUserName());
|
||||
LogRecvData<UserManage> fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_DELETE,request);
|
||||
Map<String,String> 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<UserManage> findUsers() {
|
||||
|
||||
Reference in New Issue
Block a user