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

1.修改APP特征列表查询条件 2.修改配置导出action列title

Browse Source
This commit is contained in:
zhangwq
2018-11-06 19:03:44 +08:00
parent c1b0a62802
commit 8978cf0353
4 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/domain/configuration/BaseCfg.java
View File

@@ -72,7 +72,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
* GK类型 * GK类型
*/ */
@Expose @Expose
@ExcelField(title="action",dictType="SERVICE_ACTION",sort=2) @ExcelField(title="block_type",dictType="SERVICE_ACTION",sort=2)
protected Integer action; protected Integer action;
/** /**
* 有效标识 * 有效标识

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

@@ -982,7 +982,7 @@
AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%')
</if> </if>
<if test="cfgKeywords != null and cfgKeywords != ''"> <if test="cfgKeywords != null and cfgKeywords != ''">
AND r.CFG_KEYWORDS like concat(concat('%',#{cfgKeywords,jdbcType=VARCHAR}),'%') AND REPLACE(r.CFG_KEYWORDS,'***and***','|') like concat(concat('%',#{cfgKeywords,jdbcType=VARCHAR}),'%')
</if> </if>
<if test="district != null and district != ''"> <if test="district != null and district != ''">
AND r.DISTRICT =#{district,jdbcType=VARCHAR} AND r.DISTRICT =#{district,jdbcType=VARCHAR}
@@ -1481,7 +1481,7 @@
AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%')
</if> </if>
<if test="cfgKeywords != null and cfgKeywords != ''"> <if test="cfgKeywords != null and cfgKeywords != ''">
AND r.CFG_KEYWORDS like concat(concat('%',#{cfgKeywords,jdbcType=VARCHAR}),'%') AND REPLACE(r.CFG_KEYWORDS,'***and***','|') like concat(concat('%',#{cfgKeywords,jdbcType=VARCHAR}),'%')
</if> </if>
<if test="district != null and district != ''"> <if test="district != null and district != ''">
AND r.DISTRICT =#{district,jdbcType=VARCHAR} AND r.DISTRICT =#{district,jdbcType=VARCHAR}

21
src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml
View File

@@ -271,25 +271,28 @@
AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%') AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
</if> </if>
<if test="complexStrCfg!=null"> <if test="complexStrCfg!=null">
AND a.compile_id in (select f.compile_id from app_complex_feature_cfg f AND r.compile_id in (select f.compile_id from app_complex_feature_cfg f
<where> <where>
<if test="complexStrCfg.cfgKeywords != null and complexStrCfg.cfgKeywords != ''"> <if test="complexStrCfg.cfgKeywords != null and complexStrCfg.cfgKeywords != ''">
and f.cfg_keywords like concat(concat('%',#{complexStrCfg.cfgKeywords,jdbcType=VARCHAR}),'%') REPLACE(f.cfg_keywords ,'***and***','|') like concat(concat('%',#{complexStrCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
</if>
<if test="complexStrCfg.district != null and complexStrCfg.district != ''">
and f.district like concat(concat('%',#{complexStrCfg.district,jdbcType=VARCHAR}),'%')
</if> </if>
</where> </where>
) )
</if> </if>
<if test="strCfg!=null"> <if test="strCfg!=null">
AND a.compile_id in (select f.compile_id from app_string_feature_cfg f AND r.compile_id in (select f.compile_id from app_string_feature_cfg f
<where> <where>
<if test="strCfg.cfgKeywords != null and strCfg.cfgKeywords != ''"> <if test="strCfg.cfgKeywords != null and strCfg.cfgKeywords != ''">
and f.cfg_keywords like concat(concat('%',#{strCfg.cfgKeywords,jdbcType=VARCHAR}),'%') REPLACE(f.cfg_keywords ,'***and***','|') like concat(concat('%',#{strCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
</if> </if>
<if test="strCfg.district != null and strCfg.district != ''"> </where>
and f.district like concat(concat('%',#{strCfg.district,jdbcType=VARCHAR}),'%') )
</if>
<if test="ipCfg!=null">
AND r.compile_id in (select f.compile_id from app_ip_range_cfg f
<where>
<if test="ipCfg.destIpAddress != null and ipCfg.destIpAddress != ''">
f.dest_ip_address = #{ipCfg.destIpAddress,jdbcType=VARCHAR}
</if> </if>
</where> </where>
) )

15
src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp
View File

@@ -12,6 +12,12 @@
$("#intype").val("${cfg.cfgDesc}"); $("#intype").val("${cfg.cfgDesc}");
}else if("${cfg.compileId}"){ }else if("${cfg.compileId}"){
$("#intype").val("${cfg.compileId}"); $("#intype").val("${cfg.compileId}");
}else if("${cfg.ipCfg.destIpAddress}"){
$("#intype").val("${cfg.ipCfg.destIpAddress}");
}else if("${cfg.strCfg.cfgKeywords}"){
$("#intype").val("${cfg.strCfg.cfgKeywords}");
}else if("${cfg.complexStrCfg.cfgKeywords}"){
$("#intype").val("${cfg.complexStrCfg.cfgKeywords}");
}else{ }else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text()); $("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
} }
@@ -152,6 +158,15 @@
<form:select path="seltype" class="selectpicker select2 input-small" > <form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option> <form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option> <form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
<c:if test="${cfg.functionId ne 564 && cfg.functionId ne 567}">
<form:option value="ipCfg.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
</c:if>
<c:if test="${cfg.functionId ne 567}">
<form:option value="complexStrCfg.cfgKeywords"><spring:message code="keywords"></spring:message></form:option>
</c:if>
<c:if test="${cfg.functionId eq 567}">
<form:option value="strCfg.cfgKeywords"><spring:message code="keywords"></spring:message></form:option>
</c:if>
<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option> <form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
</form:select> </form:select>