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

区域IP部分修改提交

Browse Source
This commit is contained in:
wangxin
2018-05-22 17:24:26 +08:00
parent c6a9ac126d
commit 62eca58e7f
4 changed files with 88 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,16 +15,5 @@ import com.nis.web.dao.MyBatisDao;
*/
@MyBatisDao
public interface AreaIpCfgDao extends CrudDao<AreaIpCfg>{
public AreaIpCfg getById(@Param("cfgId")Long id) ;
public List<AreaIpCfg> findList(AreaIpCfg entity) ;
public List<AreaIpCfg> getByCompileId(@Param("compileId") int compileId) ;
public int insert(AreaIpCfg entity) ;
public int updateByPrimaryKeySelective(AreaIpCfg entity) ;
public int updateValid(AreaIpCfg entity) ;
public int audit(AreaIpCfg entity) ;
public int getIsValid(@Param("cfgId")Long id);
public int getIsValid(AreaIpCfg entity);
public int getIsAudit(@Param("cfgId")Long id);
public int getIsAudit(AreaIpCfg entity);
public int deleteByCompileId(AreaIpCfg entity);
}

58
src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml
View File

@@ -4,15 +4,15 @@
<resultMap id="BaseIpMap" type="com.nis.domain.configuration.AreaIpCfg" >
<id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
<result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
<result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
<result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
<result column="ip_type" property="ipType" jdbcType="INTEGER" />
<result column="src_ip" property="srcIp" jdbcType="VARCHAR" />
<result column="src_ip_mask" property="srcIpMask" jdbcType="VARCHAR" />
<result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
<result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
<result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
<result column="port_pattern" property="portPattern" jdbcType="INTEGER" />
<result column="src_port" property="srcPort" jdbcType="VARCHAR" />
<result column="src_port_mask" property="srcPortMask" jdbcType="VARCHAR" />
<result column="dst_ip" property="dstIp" jdbcType="VARCHAR" />
<result column="dst_ip_mask" property="dstIpMask" jdbcType="VARCHAR" />
<result column="dst_port" property="dstPort" jdbcType="VARCHAR" />
<result column="dst_port_mask" property="dstPortMask" jdbcType="VARCHAR" />
<result column="dest_port" property="destPort" jdbcType="VARCHAR" />
<result column="direction" property="direction" jdbcType="INTEGER" />
<result column="protocol" property="protocol" jdbcType="INTEGER" />
<result column="protocol_id" property="protocolId" jdbcType="INTEGER" />
@@ -33,50 +33,14 @@
<result column="attribute" property="attribute" jdbcType="VARCHAR" />
<result column="lable" property="lable" jdbcType="VARCHAR" />
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
<result column="function_id" property="functionId" jdbcType="INTEGER" />
</resultMap>
<resultMap id="BaseIpMapWithUser" type="com.nis.domain.configuration.AreaIpCfg" >
<id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
<result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
<result column="ip_type" property="ipType" jdbcType="INTEGER" />
<result column="src_ip" property="srcIp" jdbcType="VARCHAR" />
<result column="src_ip_mask" property="srcIpMask" jdbcType="VARCHAR" />
<result column="src_port" property="srcPort" jdbcType="VARCHAR" />
<result column="src_port_mask" property="srcPortMask" jdbcType="VARCHAR" />
<result column="dst_ip" property="dstIp" jdbcType="VARCHAR" />
<result column="dst_ip_mask" property="dstIpMask" jdbcType="VARCHAR" />
<result column="dst_port" property="dstPort" jdbcType="VARCHAR" />
<result column="dst_port_mask" property="dstPortMask" jdbcType="VARCHAR" />
<result column="direction" property="direction" jdbcType="INTEGER" />
<result column="protocol" property="protocol" jdbcType="INTEGER" />
<result column="protocol_id" property="protocolId" jdbcType="INTEGER" />
<result column="action" property="action" jdbcType="INTEGER" />
<result column="is_valid" property="isValid" jdbcType="INTEGER" />
<result column="is_audit" property="isAudit" jdbcType="INTEGER" />
<result column="creator_id" property="creatorId" jdbcType="INTEGER" />
<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
<result column="editor_id" property="editorId" jdbcType="INTEGER" />
<result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
<result column="auditor_id" property="auditorId" jdbcType="INTEGER" />
<result column="audit_time" property="auditTime" jdbcType="TIMESTAMP" />
<result column="service_id" property="serviceId" jdbcType="INTEGER" />
<result column="request_id" property="requestId" jdbcType="INTEGER" />
<result column="compile_id" property="compileId" jdbcType="INTEGER" />
<result column="is_area_effective" property="isAreaEffective" jdbcType="INTEGER" />
<result column="classify" property="classify" jdbcType="VARCHAR" />
<result column="attribute" property="attribute" jdbcType="VARCHAR" />
<result column="lable" property="lable" jdbcType="VARCHAR" />
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
<result column="creator_name" property="creatorName" jdbcType="VARCHAR" />
<result column="auditor_name" property="auditorName" jdbcType="VARCHAR" />
<result column="editor_name" property="editorName" jdbcType="VARCHAR" />
</resultMap>
<sql id="AreaIpCfg_Column_List_with_id" >
CFG_ID, CFG_DESC, IP_TYPE, SRC_IP, SRC_IP_MASK, SRC_PORT,
SRC_PORT_MASK ,DST_IP ,DST_IP_MASK, DST_PORT, DST_PORT_MASK,
DIRECTION,PROTOCOL,PROTOCOL_ID,ACTION,IS_VALID,IS_AUDIT,
CFG_ID,CFG_DESC,CFG_REGION_CODE,CFG_TYPE, IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,
DEST_PORT,DIRECTION,PROTOCOL,PROTOCOL_ID,ACTION,IS_VALID,IS_AUDIT,
CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS
ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,FUNCTION_ID
</sql>
<select id="getByCompileId" resultMap="BaseIpMap" >
SELECT

62
src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
View File

@@ -8,9 +8,11 @@
<result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
<result column="ip_type" property="ipType" jdbcType="INTEGER" />
<result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
<result column="ip_address" property="ipAddress" jdbcType="VARCHAR" />
<result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
<result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
<result column="port_pattern" property="portPattern" jdbcType="INTEGER" />
<result column="port" property="port" jdbcType="VARCHAR" />
<result column="src_port" property="srcPort" jdbcType="VARCHAR" />
<result column="dest_port" property="destPort" jdbcType="VARCHAR" />
<result column="direction" property="direction" jdbcType="INTEGER" />
<result column="protocol" property="protocol" jdbcType="INTEGER" />
<result column="protocol_id" property="protocolId" jdbcType="INTEGER" />
@@ -42,7 +44,7 @@
</resultMap>
<sql id="BaseIpCfg_Column_List_with_id" >
CFG_ID, CFG_DESC,CFG_REGION_CODE,CFG_TYPE, IP_TYPE, IP_PATTERN, IP_ADDRESS, PORT_PATTERN,PORT,
CFG_ID, CFG_DESC,CFG_REGION_CODE,CFG_TYPE, IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT,
DIRECTION,PROTOCOL,PROTOCOL_ID,ACTION,IS_VALID,IS_AUDIT,
CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
@@ -52,7 +54,7 @@
<choose>
<when test="page !=null and page.alias != null and page.alias != ''">
${page.alias}.CFG_ID as cfgId, ${page.alias}.CFG_DESC as cfgDesc,${page.alias}.CFG_REGION_CODE as cfgRegionCode,${page.alias}.CFG_TYPE as cfgType, ${page.alias}.IP_TYPE as ipType,
${page.alias}.IP_PATTERN as ipPattern, ${page.alias}.IP_ADDRESS as ipAddress, ${page.alias}.PORT_PATTERN as portPattern,${page.alias}.PORT as port,
${page.alias}.IP_PATTERN as ipPattern, ${page.alias}.SRC_IP_ADDRESS as srcIpAddress, ${page.alias}.DEST_IP_ADDRESS as destIpAddress, ${page.alias}.PORT_PATTERN as portPattern,${page.alias}.SRC_PORT as srcPort,${page.alias}.DEST_PORT as destPort,
${page.alias}.DIRECTION as direction,${page.alias}.PROTOCOL as protocol,${page.alias}.PROTOCOL_ID as protocolId,${page.alias}.ACTION as action,${page.alias}.IS_VALID as isValid,${page.alias}.IS_AUDIT as isAudit,
${page.alias}.CREATOR_ID as creatorId,${page.alias}.CREATE_TIME AS createTime,${page.alias}.EDITOR_ID as editorId,${page.alias}.EDIT_TIME AS editTime,${page.alias}.AUDITOR_ID as auditorId,${page.alias}.AUDIT_TIME AS auditTime,
${page.alias}.SERVICE_ID as serviceId,${page.alias}.REQUEST_ID AS requestId,${page.alias}.COMPILE_ID AS compileId,${page.alias}.IS_AREA_EFFECTIVE as isAreaEffective,${page.alias}.classify,
@@ -60,7 +62,7 @@
</when>
<otherwise>
r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc,r.CFG_REGION_CODE as cfgRegionCode,r.CFG_TYPE as cfgType, r.IP_TYPE as ipType,
r.IP_PATTERN as ipPattern, r.IP_ADDRESS as ipAddress, r.PORT_PATTERN as portPattern,r.PORT as port,
r.IP_PATTERN as ipPattern, r.SRC_IP_ADDRESS as srcIpAddress, r.DEST_IP_ADDRESS as destIpAddress, r.PORT_PATTERN as portPattern,r.SRC_PORT as srcPort,r.DEST_PORT as destPort,
r.DIRECTION as direction,r.PROTOCOL as protocol,r.PROTOCOL_ID as protocolId,r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit,
r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime,
r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify,
@@ -70,8 +72,8 @@
</sql>
<sql id="BaseIpCfg_Column_List" >
CFG_DESC,CFG_REGION_CODE,CFG_TYPE,
IP_TYPE,IP_PATTERN,IP_ADDRESS,
PORT_PATTERN,PORT,DIRECTION,
IP_TYPE,IP_PATTERN,SRC_IP_ADDRESS,DEST_IP_ADDRESS,
PORT_PATTERN,SRC_PORT,DEST_PORT,DIRECTION,
PROTOCOL,PROTOCOL_ID,ACTION,
IS_VALID,IS_AUDIT,CREATOR_ID,
CREATE_TIME,EDITOR_ID,EDIT_TIME,
@@ -82,8 +84,8 @@
</sql>
<sql id="BaseIpCfg_Value_List" >
#{cfgDesc,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER},#{cfgType,jdbcType=VARCHAR},
#{ipType,jdbcType=INTEGER}, #{ipPattern,jdbcType=INTEGER},#{ipAddress,jdbcType=VARCHAR},
#{portPattern,jdbcType=INTEGER},#{port,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER},
#{ipType,jdbcType=INTEGER}, #{ipPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
#{portPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER},
#{protocol,jdbcType=INTEGER},#{protocolId,jdbcType=INTEGER},#{action,jdbcType=INTEGER},
#{isValid,jdbcType=INTEGER},#{isAudit,jdbcType=INTEGER},#{creatorId,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP},#{editorId,jdbcType=INTEGER},#{editTime,jdbcType=TIMESTAMP},
@@ -166,14 +168,20 @@
<if test="ipPattern != null">
AND ${page.alias}.IP_PATTERN=#{ipPattern,jdbcType=INTEGER}
</if>
<if test="ipAddress != null and ipAddress != ''">
AND ${page.alias}.IP_ADDRESS=#{ipAddress,jdbcType=VARCHAR}
<if test="srcIpAddress != null and srcIpAddress != ''">
AND ${page.alias}.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR}
</if>
<if test="destIpAddress != null and destIpAddress != ''">
AND ${page.alias}.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR}
</if>
<if test="portPattern != null">
AND ${page.alias}.PORT_PATTERN=#{portPattern,jdbcType=INTEGER}
</if>
<if test="port != null and port !=''">
AND ${page.alias}.PORT=#{port,jdbcType=VARCHAR}
<if test="srcPort != null and srcPort !=''">
AND ${page.alias}.SRC_PORT=#{srcPort,jdbcType=VARCHAR}
</if>
<if test="destPort != null and destPort !=''">
AND ${page.alias}.DEST_PORT=#{destPort,jdbcType=VARCHAR}
</if>
<if test="direction != null">
AND ${page.alias}.DIRECTION=#{direction,jdbcType=INTEGER}
@@ -261,14 +269,20 @@
<if test="ipPattern != null">
AND r.IP_PATTERN=#{ipPattern,jdbcType=INTEGER}
</if>
<if test="ipAddress != null and ipAddress != ''">
AND r.IP_ADDRESS=#{ipAddress,jdbcType=VARCHAR}
<if test="srcIpAddress != null and srcIpAddress != ''">
AND r.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR}
</if>
<if test="destIpAddress != null and destIpAddress != ''">
AND r.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR}
</if>
<if test="portPattern != null">
AND r.PORT_PATTERN=#{portPattern,jdbcType=INTEGER}
</if>
<if test="port != null and port !=''">
AND r.PORT=#{port,jdbcType=VARCHAR}
<if test="srcPort != null and srcPort !=''">
AND r.SRC_PORT=#{srcPort,jdbcType=VARCHAR}
</if>
<if test="destPort != null and destPort !=''">
AND r.DEST_PORT=#{destPort,jdbcType=VARCHAR}
</if>
<if test="direction != null">
AND r.DIRECTION=#{direction,jdbcType=INTEGER}
@@ -404,14 +418,20 @@
<if test="ipPattern != null">
IP_PATTERN=#{ipPattern,jdbcType=INTEGER},
</if>
<if test="ipAddress != null and ipAddress != ''">
IP_ADDRESS=#{ipAddress,jdbcType=VARCHAR},
<if test="srcIpAddress != null and srcIpAddress != ''">
SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR},
</if>
<if test="destIpAddress != null and destIpAddress != ''">
DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR},
</if>
<if test="portPattern != null">
PORT_PATTERN=#{portPattern,jdbcType=INTEGER},
</if>
<if test="port != null and port !=''">
PORT=#{port,jdbcType=VARCHAR},
<if test="srcPort != null and srcPort !=''">
SRC_PORT=#{srcPort,jdbcType=VARCHAR},
</if>
<if test="destPort != null and destPort !=''">
DEST_PORT=#{destPort,jdbcType=VARCHAR},
</if>
<if test="direction != null" >
direction = #{direction,jdbcType=INTEGER},

51
src/main/webapp/WEB-INF/include/form/areaInfo.jsp
View File

@@ -242,41 +242,62 @@ function delAreaIsp(obj){
<select id="_areaCfg.ipPattern" class="show-tick form-control required">
<option value="1"><spring:message code="subnet"/></option>
<option value="2"><spring:message code="ip_range"/></option>
<option value="3"><spring:message code="ip"/></option>
</select>
</div>
<div for="_areaCfg.ipPattern"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_address"/></label>
<div class="col-md-6">
<input id="_areaCfg.ipAddress" class="form-control required" type="text" value="${_areaCfg.ipAddress}">
</div>
<div for="_areaCfg.ipAddress"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
<div class="col-md-6">
<select id="_areaCfg.portPattern" class="show-tick form-control required">
<option value="1"><spring:message code="subnet"/></option>
<option value="1"><spring:message code="port"/></option>
<option value="2"><spring:message code="port_range"/></option>
</select>
</div>
<div for="_areaCfg.portPattern"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
<div class="col-md-6">
<input id="_areaCfg.srcIpAddress" class="form-control required" type="text" value="${_areaCfg.srcIpAddress}">
</div>
<div for="_areaCfg.srcIpAddress"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="port"/></label>
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
<div class="col-md-6">
<input id="_areaCfg.port" class="form-control required" type="text" value="${_areaCfg.port}">
<input id="_areaCfg.srcPort" class="form-control required" type="text" value="${_areaCfg.srcPort}">
</div>
<div for="_areaCfg.port"></div>
<div for="_areaCfg.srcPort"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
<div class="col-md-6">
<input id="_areaCfg.destIpAddress" class="form-control required" type="text" value="${_areaCfg.destIpAddress}">
</div>
<div for="_areaCfg.destIpAddress"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
<div class="col-md-6">
<input id="_areaCfg.destPort" class="form-control required" type="text" value="${_areaCfg.destPort}">
</div>
<div for="_areaCfg.destPort"></div>
</div>
</div>
</div>