gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户管理模块

Browse Source 
1、调整页面字段查询及优化页面
2、增加cgi 接口请求
调整http url检索条件
This commit is contained in:
leijun
2018-11-28 19:06:14 +08:00
parent 1fcc9fbbac
commit 7ab1a38131
7 changed files with 259 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/java/com/nis/util/httpclient/HttpClientUtil.java
View File

@@ -373,4 +373,53 @@ public class HttpClientUtil {
//
// }
/**
* CGI get 获取消息
* @param destUrl 业务地址
* @param params 参数列表
* @return 查询结果数据json
*/
public static String getCGI(String destUrl, Map<String, Object> params, HttpServletRequest req) throws IOException {
String result = null;
Response response=null;
String url = "";
try {
URIBuilder uriBuilder = new URIBuilder(destUrl);
if(params!=null) {
for (String param : params.keySet()) {
if(!StringUtil.isBlank(param)&&params.get(param)!=null) {
uriBuilder.addParameter(param, params.get(param).toString());
}
}
}
System.err.println(uriBuilder);
url=uriBuilder.toString();
//创建连接
WebTarget wt = ClientUtil.getWebTarger(url);
logger.info("getMsg url:"+url);
//获取响应结果
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+"");
}
} catch (Exception e) {
e.printStackTrace();
logger.error("获取消息失败，相应内容如下： " + result);
logger.error("获取消息失败 ", e);
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:");
}finally {
if (response != null) {
response.close();
}
}
return result;
}
}

11
src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
View File

@@ -57,9 +57,9 @@ public class UserManageController extends BaseController{
@RequiresPermissions(value={"user:manage:config"})
public String delete(Integer isValid
,String ids
,RedirectAttributes redirectAttributes){
,RedirectAttributes redirectAttributes,HttpServletRequest request){
try{
userManageService.delete(isValid,ids);
userManageService.delete(isValid,ids,request);
addMessage(redirectAttributes,"delete_success");
}catch(Exception e){
logger.error("Delete failed",e);
@@ -151,17 +151,16 @@ public class UserManageController extends BaseController{
UserManage user=new UserManage();
IpReuseIpCfg ipReuseIpCfg=ipReuseIpCfgService.getIpByIp(ip);
//根据ip调用接口获取数据
//user=userManageService.getUserList(ip, request);
//user=userManageService.getUser(ip, request);
if(ipReuseIpCfg!=null){
user.setServerIp(ipReuseIpCfg.getDestIpAddress());
user.setRemarks(ipReuseIpCfg.getCfgDesc());
userManageList.add(user);
}
}
return userManageList;
}
@RequestMapping(value = "view")
/* @RequestMapping(value = "view")
@RequiresPermissions(value={"user:manage:config"})
public String view(String serverIp,String userName,HttpServletResponse response,Model model){
UserManage user=new UserManage();
@@ -174,5 +173,5 @@ public class UserManageController extends BaseController{
}
model.addAttribute("user", user);
return "/cfg/maintenance/userManage/userView";
}
}*/
}

128
src/main/java/com/nis/web/service/configuration/UserManageService.java
View File

@@ -65,19 +65,29 @@ public class UserManageService extends BaseService{
entity.setCreatorId(entity.getCurrentUser().getId());
entity.setIsValid(Constants.VALID_NO);
userManageDao.insert(entity);
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
//cgi接口添加
/*String[] ipArray = entity.getServerIp().split(",");
for(String ip :ipArray){
//循环调用接口增加
Map<String, Object> params = new HashMap<String, Object>();
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);
//返回处理
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();
logger.info("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
}else{
try {
entity.setEditTime(createTime);
entity.setEditorId(entity.getCurrentUser().getId());
//获取修改之前数据
@@ -87,8 +97,14 @@ public class UserManageService extends BaseService{
/*String[] ipArray = olduser.getServerIp().split(",");
for(String ip :ipArray){
//循环调用接口删除
String url="?cmd=UserDelete&server_ip="+ip+"&user_name="+olduser.getUserName();
System.out.println(url);
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);
//返回处理
if (fromJson.getStatus().intValue() == 200) {
}else{
}
}*/
if(StringUtil.isEmpty(entity.getUserName())){
entity.setUserName(olduser.getUserName());
@@ -96,59 +112,65 @@ 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){
//循环调用接口添加
String url="?cmd=UserCreate&server_ip="+newIp+"&user_name="+entity.getUserName()+"&user_pwd="+entity.getUserPwd();
System.out.println(url);
}*/
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);
//返回处理
if (fromJson.getStatus().intValue() == 200) {
}else{
}
}*/
}catch (Exception e) {
e.printStackTrace();
logger.info("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
}
}
public LogRecvData<UserManage> getUrl(Map<String, Object> params,String urlType,HttpServletRequest request){
LogRecvData<UserManage> fromJson = new LogRecvData<UserManage>();
try{
String url ="URL"+ urlType ;
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());
}
} catch (Exception e) {
logger.error("查询失败", e);
}
return fromJson;
}
//根据vpn服务器ip获取用户vpn服务器ip信息
/* //根据vpn服务器ip获取用户vpn服务器ip信息
public UserManage getUser(String serverIp,HttpServletRequest request){
UserManage user=new UserManage();
Map<String, Object> params = new HashMap<String, Object>();
params.put("server_ip", serverIp);
try{
String url ="URL"+ Constants.NTC_IP_REUSE_USER_LIST;
String recv = HttpClientUtil.getMsg(url, params, request);
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);
logger.info("查询结果:" + recv);
if (StringUtils.isNotBlank(recv)) {
Gson gson = new GsonBuilder().create();
LogRecvData<UserManage> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<UserManage>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
}
user=fromJson.getData().getList().get(0);
}
} catch (Exception e) {
logger.error("查询失败", e);
}
return user;
}
//根据vpn服务器ip,用户名获取用户信息
public UserManage getUserManage(String serverIp,String userName,HttpServletRequest request){
UserManage user=new UserManage();
Map<String, Object> params = new HashMap<String, Object>();
params.put("server_ip", serverIp);
params.put("user_name", userName);
try{
String url ="URL"+ Constants.NTC_IP_REUSE_USER_GET;
String recv = HttpClientUtil.getMsg(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());
if (fromJson.getStatus().intValue() == 200) {
}
}
} catch (Exception e) {
logger.error("查询失败", e);
}
return user;
}
}*/
/**
*
* @param isAudit
@@ -156,7 +178,8 @@ public class UserManageService extends BaseService{
* @param ids compileIds
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void delete(Integer isValid,String ids){
public void delete(Integer isValid,String ids,HttpServletRequest request){
/*try{*/
String[] idArray = ids.split(",");
List<UserManage> userList=new ArrayList<UserManage>();
for(String id :idArray){
@@ -172,16 +195,27 @@ 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){
//循环调用接口删除
String url="?cmd=UserDelete&server_ip="+ip+"&user_name="+userList.get(i).getUserName();
System.out.println(url);
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);
//返回处理
if (fromJson.getStatus().intValue() == 200) {
}else{
}
}
}
}
} catch (Exception e) {
logger.error("查询失败", e);
}*/
}
public List<UserManage> findUsers() {
return userManageDao.findUsers();
}
}