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

地址池配置取消后新增同名配置bug修改.

Browse Source
This commit is contained in:
zhangwq
2018-12-11 21:49:31 +08:00
parent c66feefe3e
commit 71003be6c0
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -837,7 +837,7 @@ public class BaseController {
if (StringUtils.isNotBlank(entry.getIsLogTotalSearch())) { if (StringUtils.isNotBlank(entry.getIsLogTotalSearch())) {
Calendar time = Calendar.getInstance(); Calendar time = Calendar.getInstance();
String searchEndTime = DateUtils.formatDateTime(time.getTime()); String searchEndTime = DateUtils.formatDateTime(time.getTime());
time.add(Calendar.MINUTE, -5); time.add(Calendar.MINUTE, -(Constants.LOG_TIME_RANGE/1000/60));
String searchStartTime = DateUtils.formatDateTime(time.getTime()); String searchStartTime = DateUtils.formatDateTime(time.getTime());
params.put("searchFoundStartTime", searchStartTime); params.put("searchFoundStartTime", searchStartTime);

2
src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml
View File

@@ -1091,7 +1091,7 @@
AND a.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') AND a.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%')
</if> </if>
<if test="cfdsLevel != null"> <if test="cfdsLevel != null">
AND (a.CFDS_LEVEL=#{cfdsLevel,jdbcType=INTEGER} OR a.CFDS_LEVEL=${cfdsLevel/10}) AND a.CFDS_LEVEL=#{cfdsLevel,jdbcType=INTEGER}
</if> </if>
<if test="action != null"> <if test="action != null">
AND a.ACTION=#{action,jdbcType=INTEGER} AND a.ACTION=#{action,jdbcType=INTEGER}

2
src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml
View File

@@ -475,7 +475,7 @@
FROM FROM
ip_reuse_addr_pool r ip_reuse_addr_pool r
WHERE WHERE
r.addr_pool_name = #{addrPoolName} AND r.is_valid != -1 r.addr_pool_name = #{addrPoolName} AND r.is_valid != -1 AND r.is_audit != 3
</select> </select>
<select id="checkAddrPoolIp" resultType="com.nis.domain.basics.IpReuseIpCfg"> <select id="checkAddrPoolIp" resultType="com.nis.domain.basics.IpReuseIpCfg">

2
src/main/resources/nis.properties
View File

@@ -522,7 +522,7 @@ app_id_region=APP_ID
app_spec_service_code_max_val=310000 app_spec_service_code_max_val=310000
app_spec_service_code_min_val=300001 app_spec_service_code_min_val=300001
groupReuseSources=groupReuseSources groupReuseSources=groupReuseSources
log_time_range=3600000 log_time_range=300000
log_time_start=2018-08-01 00:00:00 log_time_start=2018-08-01 00:00:00
log_time_end=2018-10-01 00:00:00 log_time_end=2018-10-01 00:00:00
area_tag=location area_tag=location