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

用户管理模块

Browse Source 
1、用户类型添加
2、新增vpn服务器ip修改
This commit is contained in:
leijun
2018-11-27 18:14:06 +08:00
parent 1afa3ffea2
commit 3b0f8410a3
8 changed files with 167 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/nis/domain/configuration/UserManage.java
View File

@@ -23,6 +23,7 @@ public class UserManage extends BaseEntity<UserManage>{
private Date editTime;
private Integer isValid;
private String remarks;
private String userType;
private String newUserPwd;
private String oldUserName;//原用户名
@@ -51,6 +52,14 @@ public class UserManage extends BaseEntity<UserManage>{
private Integer functionId;
private String isAudit;
public String getUserType() {
return userType;
}
public void setUserType(String userType) {
this.userType = userType;
}
public String getIsAudit() {
return isAudit;
}

6
src/main/java/com/nis/util/Constants.java
View File

@@ -745,5 +745,9 @@ public final class Constants {
public static final String POLICIES_MENU_ID=Configurations.getStringProperty("policies_menu_id", "86");
public static final String NTC_IP_REUSE_USER_CREATE = Configurations.getStringProperty("userCreate","");
public static final String NTC_IP_REUSE_USER_PASSWORD = Configurations.getStringProperty("userPasswordSet","");
public static final String NTC_IP_REUSE_USER_DELETE = Configurations.getStringProperty("userDelete","");
public static final String NTC_IP_REUSE_USER_GET = Configurations.getStringProperty("userGet","");
public static final String NTC_IP_REUSE_USER_LIST = Configurations.getStringProperty("userList","");
}

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

@@ -151,7 +151,7 @@ public class UserManageController extends BaseController{
UserManage user=new UserManage();
IpReuseIpCfg ipReuseIpCfg=ipReuseIpCfgService.getIpByIp(ip);
//根据ip调用接口获取数据
//user=userManageService.getUserManage(ip, request);
//user=userManageService.getUserList(ip, request);
if(ipReuseIpCfg!=null){
user.setServerIp(ipReuseIpCfg.getDestIpAddress());
user.setRemarks(ipReuseIpCfg.getCfgDesc());
@@ -167,6 +167,7 @@ public class UserManageController extends BaseController{
UserManage user=new UserManage();
user=userManageService.getUserByLoginName(userName);
IpReuseIpCfg ipReuseIpCfg=ipReuseIpCfgService.getIpByIp(serverIp);
//user=userManageService.getUserManage(ip, request);
if(ipReuseIpCfg!=null){
user.setServerIp(ipReuseIpCfg.getDestIpAddress());
user.setRemarks(ipReuseIpCfg.getCfgDesc());

11
src/main/java/com/nis/web/dao/configuration/UserManageDao.xml
View File

@@ -7,6 +7,7 @@
<result column="user_name" property="userName" jdbcType="VARCHAR"/>
<result column="user_pwd" property="userPwd" jdbcType="VARCHAR"/>
<result column="server_ip" property="serverIp" jdbcType="VARCHAR"/>
<result column="user_type" property="userType" jdbcType="VARCHAR"/>
<result column="is_valid" property="isValid" jdbcType="INTEGER"/>
<result column="is_audit" property="isAudit" jdbcType="INTEGER" />
<result column="creator_id" property="creatorId" jdbcType="INTEGER" />
@@ -17,7 +18,7 @@
</resultMap>
<sql id="Columns">
r.ID,r.USER_NAME,r.USER_PWD,r.SERVER_IP,r.is_audit,
r.ID,r.USER_NAME,r.USER_PWD,r.SERVER_IP,r.user_type,r.is_audit,
r.IS_VALID,r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,remarks
</sql>
@@ -46,6 +47,9 @@
<if test="serverIp != null and serverIp != ''">
AND r.server_ip like concat(concat('%',#{serverIp,jdbcType=VARCHAR}),'%')
</if>
<if test="userType != null and userType != ''">
AND r.user_type =#{userType,jdbcType=VARCHAR}
</if>
<if test="remarks != null and remarks != ''">
AND r.remarks like concat(concat('%',#{remarks,jdbcType=VARCHAR}),'%')
</if>
@@ -74,6 +78,7 @@
USER_NAME,
USER_PWD,
SERVER_IP,
user_type,
IS_VALID,
is_audit,
CREATOR_ID,
@@ -85,6 +90,7 @@
#{userName,jdbcType=VARCHAR},
#{userPwd,jdbcType=VARCHAR},
#{serverIp,jdbcType=VARCHAR},
#{userType,jdbcType=VARCHAR},
#{isValid,jdbcType=INTEGER},
0,
#{creatorId,jdbcType=INTEGER},
@@ -111,6 +117,9 @@
<if test="serverIp != null and serverIp != ''" >
server_ip = #{serverIp,jdbcType=VARCHAR},
</if>
<if test="userType != null and userType != ''">
user_type =#{userType,jdbcType=VARCHAR},
</if>
<if test="creatorId != null" >
creator_id = #{creatorId,jdbcType=INTEGER},
</if>

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

@@ -106,27 +106,49 @@ public class UserManageService extends BaseService{
}
//根据vpn服务器ip获取用户vpn服务器ip信息
public UserManage getUserManage(String serverIp,HttpServletRequest request){
public UserManage getUser(String serverIp,HttpServletRequest request){
UserManage user=new UserManage();
/*Map<String, Object> params = new HashMap<String, Object>();
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.getUserMsg(url, params, request);
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;
}
//根据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