可信证书内置证书功能添加

src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml

@@ -66,6 +66,7 @@
 	    <result column="compile_id" property="compileId" jdbcType="INTEGER" />
 	    <result column="cancel_request_id" property="cancelRequestId" jdbcType="INTEGER" />
 	      <result column="do_log" property="doLog" jdbcType="INTEGER" />
+	      <result column="built_in" property="builtIn" jdbcType="INTEGER" />
 	  </resultMap>
 	  <resultMap id="PxyObjTrustedCaCrlMap" type="com.nis.domain.configuration.PxyObjTrustedCaCrl" >
 	    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -102,7 +103,7 @@
 		,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
 		,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id
 		,r.is_area_effective,r.classify,r.attribute,r.lable
-		,r.area_effective_ids,r.function_id,r.cfg_region_code,r.compile_id,r.cancel_request_id,r.do_log
+		,r.area_effective_ids,r.function_id,r.cfg_region_code,r.compile_id,r.cancel_request_id,r.do_log,r.built_in
 	</sql>
     <sql id="PxyObjTrustedCaCrlColumns">
 		 r.cfg_id,r.cfg_desc
@@ -270,10 +271,14 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="builtIn != null">
+	    		AND r.built_in=#{builtIn,jdbcType=INTEGER}
+	    	</if>
 	    	<choose>
 	    		<!-- 判断是否批量操作 -->
 				<when test="batchValidValue != null and batchValidValue != ''">
 					AND  r.IS_VALID in (${batchValidValue})
+					AND r.built_in !=1
 				</when>
 				<otherwise>
 					<if test="isValid != null">
@@ -525,13 +530,14 @@
 	cfg_type,
 	compile_Id,
     cfg_region_code,
+    built_in,
     do_log
     )values (
    		#{cfgId,jdbcType=VARCHAR},
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
-    	0,
-    	0,
+    	#{isValid,jdbcType=INTEGER}, 
+    	#{isAudit,jdbcType=INTEGER}, 
     	#{creatorId,jdbcType=INTEGER}, 
    		#{createTime,jdbcType=TIMESTAMP},
    		#{editorId,jdbcType=INTEGER},
@@ -551,6 +557,7 @@
     	#{cfgType,jdbcType=VARCHAR},
     	#{compileId,jdbcType=INTEGER},
     	#{cfgRegionCode,jdbcType=INTEGER},
+    	#{builtIn,jdbcType=INTEGER},
     	#{doLog,jdbcType=INTEGER}
     )
   </insert>