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

修改snat策略下发的用户信息.

Browse Source
This commit is contained in:
zhangwq
2018-12-05 11:45:59 +08:00
parent dd1862abce
commit 52a8f4b635
7 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/domain/configuration/IpReusePolicyCfg.java
View File

@@ -15,8 +15,8 @@ public class IpReusePolicyCfg extends BaseCfg<IpReusePolicyCfg>{
private Integer addrPoolId; // 地址池ID private Integer addrPoolId; // 地址池ID
private String translateParam; // 地址翻译参数 private String translateParam; // 地址翻译参数
private String userName; // 仅用于列表条件检索 private String userName;
private String addrPoolName; private String addrPoolName; // 仅用于列表条件检索
public Integer getUserId() { public Integer getUserId() {
return userId; return userId;

2
src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java
View File

@@ -20,6 +20,6 @@ public interface IpMultiplexDao extends CrudDao<IpMultiplexDao>{
void updatePolicyCfg(IpReusePolicyCfg entity); void updatePolicyCfg(IpReusePolicyCfg entity);
String getUserType(@Param("userId")Integer userId); String getUserType(@Param("userName")String userName);
} }

17
src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml
View File

@@ -6,7 +6,7 @@
<id column="cfg_id" property="cfgId" jdbcType="BIGINT"/> <id column="cfg_id" property="cfgId" jdbcType="BIGINT"/>
<result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR"/> <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR"/>
<result column="addr_pool_id" property="addrPoolId" jdbcType="INTEGER"/> <result column="addr_pool_id" property="addrPoolId" jdbcType="INTEGER"/>
<result column="user_id" property="userId" jdbcType="INTEGER"/> <result column="user_name" property="userName" jdbcType="VARCHAR"/>
<result column="user_type" property="userType" jdbcType="VARCHAR"/> <result column="user_type" property="userType" jdbcType="VARCHAR"/>
<result column="do_log" property="doLog" jdbcType="INTEGER" /> <result column="do_log" property="doLog" jdbcType="INTEGER" />
@@ -38,7 +38,7 @@
</resultMap> </resultMap>
<sql id="policyColumns"> <sql id="policyColumns">
r.CFG_ID,r.CFG_DESC,r.ADDR_POOL_ID,r.USER_ID,r.USER_TYPE, r.CFG_ID,r.CFG_DESC,r.ADDR_POOL_ID,r.USER_NAME,r.USER_TYPE,
r.ACTION,r.DO_LOG,r.IS_VALID,r.IS_AUDIT,r.CFG_REGION_CODE,r.CFG_TYPE,r.FUNCTION_ID, r.ACTION,r.DO_LOG,r.IS_VALID,r.IS_AUDIT,r.CFG_REGION_CODE,r.CFG_TYPE,r.FUNCTION_ID,
r.SERVICE_ID,r.COMPILE_ID,r.REQUEST_ID,r.CLASSIFY,r.ATTRIBUTE,r.LABLE, r.SERVICE_ID,r.COMPILE_ID,r.REQUEST_ID,r.CLASSIFY,r.ATTRIBUTE,r.LABLE,
r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME, r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME,
@@ -171,7 +171,7 @@
INSERT INTO ip_reuse_policy_cfg ( INSERT INTO ip_reuse_policy_cfg (
cfg_desc, cfg_desc,
addr_pool_id, addr_pool_id,
user_id, user_name,
user_type, user_type,
action, action,
do_log, do_log,
@@ -202,7 +202,7 @@
)VALUES ( )VALUES (
#{cfgDesc,jdbcType=VARCHAR}, #{cfgDesc,jdbcType=VARCHAR},
#{addrPoolId,jdbcType=INTEGER}, #{addrPoolId,jdbcType=INTEGER},
#{userId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR},
#{userType,jdbcType=VARCHAR}, #{userType,jdbcType=VARCHAR},
#{action,jdbcType=INTEGER}, #{action,jdbcType=INTEGER},
#{doLog,jdbcType=INTEGER}, #{doLog,jdbcType=INTEGER},
@@ -239,15 +239,15 @@
FROM FROM
user_manage user_manage
WHERE WHERE
id = #{userId} user_name = #{userName}
</select> </select>
<update id="updatePolicyCfg" parameterType="com.nis.domain.configuration.IpReusePolicyCfg"> <update id="updatePolicyCfg" parameterType="com.nis.domain.configuration.IpReusePolicyCfg">
update ip_reuse_policy_cfg update ip_reuse_policy_cfg
<set> <set>
<trim suffixOverrides=","> <trim suffixOverrides=",">
<if test="userId != null" > <if test="userName != null and userName != ''" >
user_id = #{userId,jdbcType=INTEGER}, user_name = #{userName,jdbcType=VARCHAR},
</if> </if>
<if test="userType != null and userType != ''" > <if test="userType != null and userType != ''" >
user_type = #{userType,jdbcType=VARCHAR}, user_type = #{userType,jdbcType=VARCHAR},
@@ -261,9 +261,6 @@
<if test="translateParam != null and translateParam != ''" > <if test="translateParam != null and translateParam != ''" >
translate_param = #{translateParam,jdbcType=VARCHAR}, translate_param = #{translateParam,jdbcType=VARCHAR},
</if> </if>
<if test="userId != null" >
user_id = #{userId,jdbcType=INTEGER},
</if>
<if test="doLog != null" > <if test="doLog != null" >
do_log = #{doLog,jdbcType=INTEGER}, do_log = #{doLog,jdbcType=INTEGER},
</if> </if>

12
src/main/java/com/nis/web/service/configuration/IpMultiplexService.java
View File

@@ -15,10 +15,12 @@ import org.springframework.transaction.annotation.Transactional;
import com.beust.jcommander.internal.Lists; import com.beust.jcommander.internal.Lists;
import com.nis.domain.Page; import com.nis.domain.Page;
import com.nis.domain.configuration.IpReusePolicyCfg; import com.nis.domain.configuration.IpReusePolicyCfg;
import com.nis.domain.configuration.UserManage;
import com.nis.domain.maat.ToMaatResult; import com.nis.domain.maat.ToMaatResult;
import com.nis.exceptions.MaatConvertException; import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil; import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants; import com.nis.util.Constants;
import com.nis.util.StringUtils;
import com.nis.web.dao.configuration.IpMultiplexDao; import com.nis.web.dao.configuration.IpMultiplexDao;
import com.nis.web.security.UserUtils; import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService; import com.nis.web.service.BaseService;
@@ -56,8 +58,8 @@ public class IpMultiplexService extends BaseService{
setAreaEffectiveIds(entity); setAreaEffectiveIds(entity);
// 获取用户/账号类型 // 获取用户/账号类型
if(entity.getUserId() != null){ if(StringUtils.isNotBlank(entity.getUserName())){
String userType = ipMultiplexDao.getUserType(entity.getUserId()); String userType = ipMultiplexDao.getUserType(entity.getUserName());
entity.setUserType(userType); entity.setUserType(userType);
} }
@@ -119,7 +121,7 @@ public class IpMultiplexService extends BaseService{
cfg.setIsAudit(isAudit); cfg.setIsAudit(isAudit);
cfg.setAuditorId(UserUtils.getUser().getId()); cfg.setAuditorId(UserUtils.getUser().getId());
cfg.setAuditTime(auditTime); cfg.setAuditTime(auditTime);
cfg.setDoLog(null);; cfg.setDoLog(null);
ipMultiplexDao.updatePolicyCfg(cfg); ipMultiplexDao.updatePolicyCfg(cfg);
SysDictInfoService sysDictInfoService = SpringContextHolder.getBean(SysDictInfoService.class); SysDictInfoService sysDictInfoService = SpringContextHolder.getBean(SysDictInfoService.class);
@@ -132,7 +134,7 @@ public class IpMultiplexService extends BaseService{
params.put("configId", cfg.getCompileId()); params.put("configId", cfg.getCompileId());
params.put("addrPoolId", cfg.getAddrPoolId()); params.put("addrPoolId", cfg.getAddrPoolId());
params.put("userType", cfg.getUserType()); params.put("userType", cfg.getUserType());
params.put("userId", cfg.getUserId()); params.put("userId", keywordsEscape(cfg.getUserName()));
params.put("doLog", cfg.getDoLog()); params.put("doLog", cfg.getDoLog());
params.put("action", cfg.getAction()); params.put("action", cfg.getAction());
params.put("service", cfg.getServiceId()); params.put("service", cfg.getServiceId());
@@ -163,7 +165,7 @@ public class IpMultiplexService extends BaseService{
params.put("configId", cfg.getCompileId()); params.put("configId", cfg.getCompileId());
params.put("addrPoolId", cfg.getAddrPoolId()); params.put("addrPoolId", cfg.getAddrPoolId());
params.put("userType", cfg.getUserType()); params.put("userType", cfg.getUserType());
params.put("userId", cfg.getUserId()); params.put("userId", keywordsEscape(cfg.getUserName()));
params.put("doLog", cfg.getDoLog()); params.put("doLog", cfg.getDoLog());
params.put("action", cfg.getAction()); params.put("action", cfg.getAction());
params.put("service", cfg.getServiceId()); params.put("service", cfg.getServiceId());

1
src/main/resources/sql/20181205/update_ip_reuse_policy_cfg.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE ip_reuse_policy_cfg CHANGE user_id user_name VARCHAR(255) NOT NULL COMMENT '用户标识';

6
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp
View File

@@ -134,14 +134,14 @@ $(function(){
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="user"/></label> <label class="control-label col-md-3"><font color="red">*</font><spring:message code="user"/></label>
<div class="col-md-6"> <div class="col-md-6">
<select name="userId" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search"> <select name="userName" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
<option value="" ><spring:message code="select"/></option> <option value="" ><spring:message code="select"/></option>
<c:forEach items="${users }" var="user"> <c:forEach items="${users }" var="user">
<option value="${user.id}" <c:if test="${_cfg.userId eq user.id }">selected</c:if>><spring:message code="${user.userName}"/></option> <option value="${user.userName}" <c:if test="${_cfg.userName eq user.userName }">selected</c:if>><spring:message code="${user.userName}"/></option>
</c:forEach> </c:forEach>
</select> </select>
</div> </div>
<div for="userId"></div> <div for="userName"></div>
</div> </div>
</div> </div>

2
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp
View File

@@ -317,7 +317,7 @@
</td> </td>
<td> <td>
<c:forEach items="${users }" var="user"> <c:forEach items="${users }" var="user">
<c:if test="${indexCfg.userId eq user.id }"> <c:if test="${indexCfg.userName eq user.userName }">
<spring:message code="${user.userName }"/> <spring:message code="${user.userName }"/>
</c:if> </c:if>
</c:forEach> </c:forEach>