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

(1)app策略修改dao.xml，update操作除了creatorId，creatorTime,editorId,editTime,auditor,aduitTime之外，去掉if

Browse Source 
null的判断
(2)app策略，基础协议页面ratelimit字段提交表单时如果atction不为限速，置空
This commit is contained in:
wangxin
2018-07-25 12:41:54 +08:00
parent b670ef811f
commit fe2c7df204
3 changed files with 61 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1180,96 +1180,96 @@
update app_policy_cfg update app_policy_cfg
<set > <set >
<trim suffixOverrides=","> <trim suffixOverrides=",">
<if test="cfgDesc != null and cfgDesc != ''" > <!-- <if test="cfgDesc != null and cfgDesc != ''" > -->
cfg_desc = #{cfgDesc,jdbcType=VARCHAR}, cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
</if> <!-- </if>
<if test="appCode != null"> <if test="appCode != null"> -->
APP_CODE = #{appCode,jdbcType=INTEGER}, APP_CODE = #{appCode,jdbcType=INTEGER},
</if> <!-- </if>
<if test="behavCode != null"> <if test="behavCode != null"> -->
BEHAV_CODE = #{behavCode,jdbcType=INTEGER}, BEHAV_CODE = #{behavCode,jdbcType=INTEGER},
</if> <!-- </if>
<if test="specServiceId != null"> <if test="specServiceId != null"> -->
SPEC_SERVICE_ID = #{specServiceId,jdbcType=INTEGER}, SPEC_SERVICE_ID = #{specServiceId,jdbcType=INTEGER},
</if> <!-- </if>
<if test="action != null" > <if test="action != null" > -->
action = #{action,jdbcType=INTEGER}, action = #{action,jdbcType=INTEGER},
</if> <!-- </if>
<if test="isValid != null" > <if test="isValid != null" > -->
is_valid = #{isValid,jdbcType=INTEGER}, is_valid = #{isValid,jdbcType=INTEGER},
</if> <!-- </if>
<if test="isAudit != null" > <if test="isAudit != null" > -->
is_audit = #{isAudit,jdbcType=INTEGER}, is_audit = #{isAudit,jdbcType=INTEGER},
</if> <!-- </if> -->
<if test="creatorId != null" > <if test="creatorId != null" >
creator_id = #{creatorId,jdbcType=INTEGER}, creator_id = #{creatorId,jdbcType=INTEGER},
</if> </if>
<if test="createTime != null and createTime != ''" > <if test="createTime != null and createTime != ''" >
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="editorId != null" > <if test="editorId != null" >
editor_id = #{editorId,jdbcType=INTEGER}, editor_id = #{editorId,jdbcType=INTEGER},
</if> </if>
<if test="editTime != null and editTime != ''" > <if test="editTime != null and editTime != ''" >
edit_time = #{editTime,jdbcType=TIMESTAMP}, edit_time = #{editTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="auditorId != null" > <if test="auditorId != null" > -->
auditor_id = #{auditorId,jdbcType=INTEGER}, auditor_id = #{auditorId,jdbcType=INTEGER},
</if> </if>
<if test="auditTime != null and auditTime != ''" > <if test="auditTime != null and auditTime != ''" >
audit_time = #{auditTime,jdbcType=TIMESTAMP}, audit_time = #{auditTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="serviceId != null" > <!-- <if test="serviceId != null" > -->
service_id = #{serviceId,jdbcType=INTEGER}, service_id = #{serviceId,jdbcType=INTEGER},
</if> <!-- </if>
<if test="requestId != null" > <if test="requestId != null" > -->
request_id = #{requestId,jdbcType=INTEGER}, request_id = #{requestId,jdbcType=INTEGER},
</if> <!-- </if>
<if test="compileId != null" > <if test="compileId != null" > -->
compile_id = #{compileId,jdbcType=INTEGER}, compile_id = #{compileId,jdbcType=INTEGER},
</if> <!-- </if>
<if test="isAreaEffective != null" > <if test="isAreaEffective != null" > -->
is_area_effective = #{isAreaEffective,jdbcType=INTEGER}, is_area_effective = #{isAreaEffective,jdbcType=INTEGER},
</if> <!-- </if>
<if test="classify != null and classify != ''" > <if test="classify != null and classify != ''" > -->
classify = #{classify,jdbcType=VARCHAR}, classify = #{classify,jdbcType=VARCHAR},
</if> <!-- </if>
<if test="attribute != null and attribute != ''" > <if test="attribute != null and attribute != ''" > -->
attribute = #{attribute,jdbcType=VARCHAR}, attribute = #{attribute,jdbcType=VARCHAR},
</if> <!-- </if>
<if test="lable != null and lable != ''" > <if test="lable != null and lable != ''" > -->
lable = #{lable,jdbcType=VARCHAR}, lable = #{lable,jdbcType=VARCHAR},
</if> <!-- </if>
<if test="areaEffectiveIds != null" > <if test="areaEffectiveIds != null" > -->
area_effective_ids = #{areaEffectiveIds,jdbcType=VARCHAR}, area_effective_ids = #{areaEffectiveIds,jdbcType=VARCHAR},
</if> <!-- </if>
<if test="functionId != null" > <if test="functionId != null" > -->
function_id = #{functionId,jdbcType=INTEGER}, function_id = #{functionId,jdbcType=INTEGER},
</if> <!-- </if>
<if test="ratelimit != null"> <if test="ratelimit != null"> -->
RATELIMIT=#{ratelimit,jdbcType=INTEGER}, RATELIMIT=#{ratelimit,jdbcType=INTEGER},
</if> <!-- </if>
<if test="cfgRegionCode != null"> <if test="cfgRegionCode != null"> -->
CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
</if> <!-- </if>
<if test="cfgType != null and cfgType != ''"> <if test="cfgType != null and cfgType != ''"> -->
CFG_TYPE =#{cfgType,jdbcType=VARCHAR}, CFG_TYPE =#{cfgType,jdbcType=VARCHAR},
</if> <!-- </if>
<if test="userRegion1 != null and userRegion1 != ''"> <if test="userRegion1 != null and userRegion1 != ''"> -->
USER_REGION1 =#{userRegion1,jdbcType=VARCHAR}, USER_REGION1 =#{userRegion1,jdbcType=VARCHAR},
</if> <!-- </if>
<if test="userRegion2 != null and userRegion2 != ''"> <if test="userRegion2 != null and userRegion2 != ''"> -->
USER_REGION2 =#{userRegion2,jdbcType=VARCHAR}, USER_REGION2 =#{userRegion2,jdbcType=VARCHAR},
</if> <!-- </if>
<if test="userRegion3 != null and userRegion3 != ''"> <if test="userRegion3 != null and userRegion3 != ''"> -->
USER_REGION1 =#{userRegion3,jdbcType=VARCHAR}, USER_REGION1 =#{userRegion3,jdbcType=VARCHAR},
</if> <!-- </if>
<if test="userRegion4 != null and userRegion4 != ''"> <if test="userRegion4 != null and userRegion4 != ''"> -->
USER_REGION1 =#{userRegion4,jdbcType=VARCHAR}, USER_REGION1 =#{userRegion4,jdbcType=VARCHAR},
</if> <!-- </if>
<if test="userRegion5 != null and userRegion5 != ''"> <if test="userRegion5 != null and userRegion5 != ''"> -->
USER_REGION1 =#{userRegion5,jdbcType=VARCHAR}, USER_REGION1 =#{userRegion5,jdbcType=VARCHAR},
</if> <!-- </if> -->
</trim> </trim>
</set> </set>
where cfg_id = #{cfgId,jdbcType=BIGINT} where cfg_id = #{cfgId,jdbcType=BIGINT}

5
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
View File

@@ -53,6 +53,9 @@ $(function(){
if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){ if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){
$("input[name$='exprType']").val(1); $("input[name$='exprType']").val(1);
} }
if($("input[name='ratelimit']").is(":hidden")){
$("input[name='ratelimit']").val("");
}
/* $("#appCode").val($("#specServiceIdId").val()); */ /* $("#appCode").val($("#specServiceIdId").val()); */
loading('onloading...'); loading('onloading...');
form.submit(); form.submit();
@@ -190,12 +193,14 @@ var delContent = function(contentClassName, addBtnClassName) {
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="behaviour_type"/></label> <label class="control-label col-md-3"><spring:message code="behaviour_type"/></label>
<div class="col-md-6" id="behaviour"> <div class="col-md-6" id="behaviour">
<select name="behavCode" data-live-search="true" class="selectpicker form-control"> <select name="behavCode" data-live-search="true" class="selectpicker form-control">
<option value=""><spring:message code="select"/></option> <option value=""><spring:message code="select"/></option>
</select> </select>
</div> </div>
</div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">

3
src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
View File

@@ -53,6 +53,9 @@ $(function(){
if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){ if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){
$("input[name$='exprType']").val(1); $("input[name$='exprType']").val(1);
} }
if($("input[name='ratelimit']").is(":hidden")){
$("input[name='ratelimit']").val("");
}
/* $("#appCode").val($("#specServiceIdId").val()); */ /* $("#appCode").val($("#specServiceIdId").val()); */
loading('onloading...'); loading('onloading...');
form.submit(); form.submit();