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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
fangshunjian
2018-08-21 10:47:23 +08:00
parent 57ef37c743 049b2aa893
commit d52178a510
26 changed files with 316 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml
View File

@@ -22,12 +22,13 @@
<result column="config_port_pattern" property="configPortPattern" jdbcType="VARCHAR" />
<result column="config_direction" property="configDirection" jdbcType="VARCHAR" />
<result column="config_protocol" property="configProtocol" jdbcType="VARCHAR" />
<result column="config_region_sort" property="configRegionSort" jdbcType="INTEGER" />
</resultMap>
<sql id="Base_Column_List" >
dict_id, function_id, config_region_value,config_region_code, config_district, config_desc, is_valid,is_maat,region_type
,config_multi_keywords,config_hex,config_expr_type,config_match_method,config_service_type,config_ip_port_show,config_ip_type,
config_ip_pattern,config_port_pattern,config_direction,config_protocol
config_ip_pattern,config_port_pattern,config_direction,config_protocol,config_region_sort
</sql>
<select id="getList" resultMap="BaseResultMap" >
select
@@ -43,7 +44,10 @@
<if test="configRegionCode != null">
AND config_region_code=#{configRegionCode,jdbcType=VARCHAR}
</if>
order by dict_id,config_region_code
<if test="configRegionSort != null">
AND config_region_sort=#{configRegionSort,jdbcType=VARCHAR}
</if>
order by dict_id,config_region_sort
</select>
</mapper>

2
src/main/java/com/nis/web/dao/FunctionServiceDictDao.xml
View File

@@ -11,7 +11,7 @@
<result column="service_name" property="serviceName" jdbcType="VARCHAR" />
<result column="service_desc" property="serviceDesc" jdbcType="VARCHAR" />
<result column="is_valid" property="isValid" jdbcType="INTEGER" />
<result column="region_code" property="regionCode" jdbcType="INTEGER" />
<result column="region_code" property="regionCode" jdbcType="VARCHAR" />
</resultMap>
<sql id="Base_Column_List" >