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 
Conflicts:
	src/main/resources/messages/message_en.properties
This commit is contained in:
duandongmei
2018-07-11 16:18:23 +08:00
parent 89ec630a33 f067b24fba
commit 4466b9c1e1
17 changed files with 493 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml
View File

@@ -297,7 +297,8 @@
SRC_URL,SAMPLE_URL, SRC_MD5,SAMPLE_MD5,LEVEL,CFG_DESC,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,function_id,cfg_type,cfg_region_code,src_path,sample_path
ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,function_id,cfg_type,cfg_region_code,src_path,sample_path,
is_sample_created
)values (
#{srcUrl,jdbcType=VARCHAR},#{sampleUrl,jdbcType=VARCHAR},#{srcMd5,jdbcType=VARCHAR},
#{sampleMd5,jdbcType=VARCHAR},#{level,jdbcType=INTEGER},#{cfgDesc,jdbcType=VARCHAR},#{action,jdbcType=INTEGER},
@@ -307,7 +308,8 @@
#{requestId,jdbcType=INTEGER},#{compileId,jdbcType=INTEGER},#{isAreaEffective,jdbcType=INTEGER},
#{classify,jdbcType=VARCHAR},#{attribute,jdbcType=VARCHAR},#{lable,jdbcType=VARCHAR},
#{areaEffectiveIds,jdbcType=VARCHAR},#{functionId,jdbcType=INTEGER},
#{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER},#{srcPath,jdbcType=VARCHAR},#{samplePath,jdbcType=VARCHAR}
#{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER},#{srcPath,jdbcType=VARCHAR},#{samplePath,jdbcType=VARCHAR},
#{isSampleCreated,jdbcType=INTEGER}
)
</insert>
@@ -403,6 +405,15 @@
<if test="samplePath != null and samplePath != ''">
sample_path = #{samplePath,jdbcType=VARCHAR},
</if>
<if test="isSampleCreated != null" >
is_sample_created = #{isSampleCreated,jdbcType=INTEGER},
</if>
<if test="srcMd5 != null and srcMd5 != ''">
src_md5 = #{srcMd5,jdbcType=VARCHAR},
</if>
<if test="sampleMd5 != null and sampleMd5 != ''">
sample_md5 = #{sampleMd5,jdbcType=VARCHAR},
</if>
</trim>
</set>
where cfg_id = #{cfgId,jdbcType=BIGINT}