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

(1)域名拦截提交

Browse Source 
(2)IP类配置列表分类性质来函显示调整
(3)配置文件keyword_expr字段调整,java中*有正则表达式含义，这里用双斜杠转义一下
This commit is contained in:
wangxin
2018-06-22 16:30:59 +08:00
parent b6d0ece058
commit 1b456bec41
14 changed files with 1020 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,8 +18,8 @@ public interface IpCfgDao extends CrudDao<BaseIpCfg>{
public BaseIpCfg getById(@Param("tableName")String tableName,@Param("cfgId")Long id) ;
public BaseIpCfg get(BaseIpCfg entity) ;
public List<BaseIpCfg> findList(BaseIpCfg entity) ;
public List<BaseIpCfg> getListByCfgId(@Param("tableName")String tableName,@Param("ids")String ids) ;
public List<BaseIpCfg> getListByComileId(@Param("tableName")String tableName,@Param("ids")String ids) ;
public List<BaseIpCfg> getListByCfgId(@Param("tableName")String tableName,@Param("functionId")int functionId,@Param("ids")String ids) ;
public List<BaseIpCfg> getListByComileId(@Param("tableName")String tableName,@Param("functionId")int functionId,@Param("ids")String ids) ;
public int insert(BaseIpCfg entity) ;
public int update(BaseIpCfg entity) ;
public int updateValid(BaseIpCfg entity) ;

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

@@ -118,12 +118,12 @@
<select id="getListByComileId" resultMap="BaseIpMap" >
SELECT
<include refid="BaseIpCfg_Column_List_with_id" />
FROM ${tableName} WHERE IS_VALID!=-1 AND COMPILE_ID in (${ids})
FROM ${tableName} WHERE IS_VALID!=-1 AND FUNCTION_ID=#{functionId,jdbcType=INTEGER} AND COMPILE_ID in (${ids})
</select>
<select id="getListByCfgId" resultMap="BaseIpMap" >
SELECT
<include refid="BaseIpCfg_Column_List_with_id" />
FROM ${tableName} WHERE IS_VALID!=-1 AND CFG_ID in (${ids})
FROM ${tableName} WHERE IS_VALID!=-1 AND FUNCTION_ID=#{functionId,jdbcType=INTEGER} AND CFG_ID in (${ids})
</select>
<select id="getList" resultMap="BaseIpMap" >
SELECT

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

@@ -29,4 +29,15 @@ public interface StringCfgDao extends CrudDao<BaseStringCfg>{
public int deleteByCompileId(BaseStringCfg entity);
public List<BaseStringCfg> getListByCfgId(@Param("tableName")String tableName, @Param("ids")String ids);
public List<BaseStringCfg> getListByCompileId(@Param("tableName")String tableName, @Param("ids")String ids);
/**
* deleteByCompileIds(这里用一句话描述这个方法的作用)
* (这里描述这个方法适用条件 – 可选)
* @param id
* @param tablename
* @param compileIds
*void
* @exception
* @since 1.0.0
*/
public void deleteByCompileIds(@Param("user")long user,@Param("tableName")String tableName,@Param("compileIds")String compileIds);
}

5
src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
View File

@@ -54,7 +54,7 @@
${page.alias}.CFG_ID as cfgId, ${page.alias}.CFG_DESC as cfgDesc, ${page.alias}.CFG_KEYWORDS as cfgKeywords,${page.alias}.CFG_TYPE as cfgType,${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,
${page.alias}.ATTRIBUTE AS attribute,${page.alias}.LABLE AS lable,${page.alias}.AREA_EFFECTIVE_IDS AS areaEffectiveIds,${page.alias}.FUNCTION_ID AS functionId,${page.alias}.CFG_REGION_CODE as cfgRegionCode
${page.alias}.ATTRIBUTE AS attribute,${page.alias}.LABLE AS lable,${page.alias}.EXPR_TYPE as exprType,${page.alias}.MATCH_METHOD as matchMethod,${page.alias}.IS_HEXBIN as isHexbin,${page.alias}.AREA_EFFECTIVE_IDS AS areaEffectiveIds,${page.alias}.FUNCTION_ID AS functionId,${page.alias}.CFG_REGION_CODE as cfgRegionCode
</when>
<otherwise>
r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.CFG_KEYWORDS as cfgKeywords,r.CFG_TYPE as cfgType, r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit,
@@ -457,4 +457,7 @@
</if>
</trim>
</update>
<update id="deleteByCompileIds" parameterType="com.nis.domain.configuration.BaseStringCfg" >
update ${tableName} set is_valid = -1, editor_id = #{user,jdbcType=INTEGER} , edit_time = NOW() where compile_id in (${compileIds})
</update>
</mapper>