diff --git a/src/main/java/com/nis/domain/configuration/IpReusePolicyCfg.java b/src/main/java/com/nis/domain/configuration/IpReusePolicyCfg.java index 21e8ac381..a43dae6f0 100644 --- a/src/main/java/com/nis/domain/configuration/IpReusePolicyCfg.java +++ b/src/main/java/com/nis/domain/configuration/IpReusePolicyCfg.java @@ -15,8 +15,8 @@ public class IpReusePolicyCfg extends BaseCfg{ private Integer addrPoolId; // 地址池ID private String translateParam; // 地址翻译参数 - private String userName; // 仅用于列表条件检索 - private String addrPoolName; + private String userName; + private String addrPoolName; // 仅用于列表条件检索 public Integer getUserId() { return userId; diff --git a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java index cece5005b..8d08288f3 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java +++ b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java @@ -20,6 +20,6 @@ public interface IpMultiplexDao extends CrudDao{ void updatePolicyCfg(IpReusePolicyCfg entity); - String getUserType(@Param("userId")Integer userId); + String getUserType(@Param("userName")String userName); } diff --git a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml index c4cfc7cbb..b94690224 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml @@ -6,7 +6,7 @@ - + @@ -38,7 +38,7 @@ - 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.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, @@ -171,7 +171,7 @@ INSERT INTO ip_reuse_policy_cfg ( cfg_desc, addr_pool_id, - user_id, + user_name, user_type, action, do_log, @@ -202,7 +202,7 @@ )VALUES ( #{cfgDesc,jdbcType=VARCHAR}, #{addrPoolId,jdbcType=INTEGER}, - #{userId,jdbcType=INTEGER}, + #{userName,jdbcType=VARCHAR}, #{userType,jdbcType=VARCHAR}, #{action,jdbcType=INTEGER}, #{doLog,jdbcType=INTEGER}, @@ -239,15 +239,15 @@ FROM user_manage WHERE - id = #{userId} + user_name = #{userName} update ip_reuse_policy_cfg - - user_id = #{userId,jdbcType=INTEGER}, + + user_name = #{userName,jdbcType=VARCHAR}, user_type = #{userType,jdbcType=VARCHAR}, @@ -261,9 +261,6 @@ translate_param = #{translateParam,jdbcType=VARCHAR}, - - user_id = #{userId,jdbcType=INTEGER}, - do_log = #{doLog,jdbcType=INTEGER}, diff --git a/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java b/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java index b60bc159c..a8b083ba0 100644 --- a/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java +++ b/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java @@ -15,10 +15,12 @@ import org.springframework.transaction.annotation.Transactional; import com.beust.jcommander.internal.Lists; import com.nis.domain.Page; import com.nis.domain.configuration.IpReusePolicyCfg; +import com.nis.domain.configuration.UserManage; 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.StringUtils; import com.nis.web.dao.configuration.IpMultiplexDao; import com.nis.web.security.UserUtils; import com.nis.web.service.BaseService; @@ -56,8 +58,8 @@ public class IpMultiplexService extends BaseService{ setAreaEffectiveIds(entity); // 获取用户/账号类型 - if(entity.getUserId() != null){ - String userType = ipMultiplexDao.getUserType(entity.getUserId()); + if(StringUtils.isNotBlank(entity.getUserName())){ + String userType = ipMultiplexDao.getUserType(entity.getUserName()); entity.setUserType(userType); } @@ -119,7 +121,7 @@ public class IpMultiplexService extends BaseService{ cfg.setIsAudit(isAudit); cfg.setAuditorId(UserUtils.getUser().getId()); cfg.setAuditTime(auditTime); - cfg.setDoLog(null);; + cfg.setDoLog(null); ipMultiplexDao.updatePolicyCfg(cfg); SysDictInfoService sysDictInfoService = SpringContextHolder.getBean(SysDictInfoService.class); @@ -132,7 +134,7 @@ public class IpMultiplexService extends BaseService{ params.put("configId", cfg.getCompileId()); params.put("addrPoolId", cfg.getAddrPoolId()); params.put("userType", cfg.getUserType()); - params.put("userId", cfg.getUserId()); + params.put("userId", keywordsEscape(cfg.getUserName())); params.put("doLog", cfg.getDoLog()); params.put("action", cfg.getAction()); params.put("service", cfg.getServiceId()); @@ -163,7 +165,7 @@ public class IpMultiplexService extends BaseService{ params.put("configId", cfg.getCompileId()); params.put("addrPoolId", cfg.getAddrPoolId()); params.put("userType", cfg.getUserType()); - params.put("userId", cfg.getUserId()); + params.put("userId", keywordsEscape(cfg.getUserName())); params.put("doLog", cfg.getDoLog()); params.put("action", cfg.getAction()); params.put("service", cfg.getServiceId()); diff --git a/src/main/resources/sql/20181205/update_ip_reuse_policy_cfg.sql b/src/main/resources/sql/20181205/update_ip_reuse_policy_cfg.sql new file mode 100644 index 000000000..c22c1d3b8 --- /dev/null +++ b/src/main/resources/sql/20181205/update_ip_reuse_policy_cfg.sql @@ -0,0 +1 @@ +ALTER TABLE ip_reuse_policy_cfg CHANGE user_id user_name VARCHAR(255) NOT NULL COMMENT '用户标识'; \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp index 2523bc36a..22384e74d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp @@ -134,14 +134,14 @@ $(function(){
- - +
-
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp index 34db2e1b2..c391c8551 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp @@ -317,7 +317,7 @@ - +