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

合并develop分支定时器功能

Browse Source 
Conflicts:
	src/main/java/com/nis/domain/configuration/BaseCfg.java
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
This commit is contained in:
zhangwei
2019-01-26 18:02:44 +06:00
parent c1c5c8f5bb
commit 2db43e69d9
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,6 +70,17 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
*/ */
protected ScheduleCfg schedule; protected ScheduleCfg schedule;
private String commonGroupIds; //公共组织id(考虑一个compile存在多个asn组织的情况)
public String getCommonGroupIds() {
return commonGroupIds;
}
public void setCommonGroupIds(String commonGroupIds) {
this.commonGroupIds = commonGroupIds;
}
public String getExType() { public String getExType() {
return exType; return exType;
} }
@@ -128,13 +139,13 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
/** /**
* 有效标识 * 有效标识
*/ */
@ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER",sort=90) @ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER",sort=109)
@Expose @Expose
protected Integer isValid; protected Integer isValid;
/** /**
* 是否审核 * 是否审核
*/ */
@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=25) @ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=37)
protected Integer isAudit; protected Integer isAudit;
/** /**
* 创建人员 * 创建人员

6
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
View File

@@ -371,7 +371,7 @@
<th column="userregion2" ><spring:message code="ratelimit"/></th> <th column="userregion2" ><spring:message code="ratelimit"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th> <th column="is_audit" ><spring:message code="is_audit"/></th>
<th column="valid_identifier" class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th> <th column="valid_identifier" class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<%-- <th><spring:message code="is_schduler"/></th> --%> <th><spring:message code="is_schduler"/></th>
<th column="do_log" ><spring:message code="do_log"/></th> <th column="do_log" ><spring:message code="do_log"/></th>
<th column="do_blacklist" ><spring:message code="do_blacklist"/></th> <th column="do_blacklist" ><spring:message code="do_blacklist"/></th>
<th column="log_total" ><spring:message code="log_total"/></th> <th column="log_total" ><spring:message code="log_total"/></th>
@@ -426,7 +426,7 @@
<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if> <c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if> <c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
</td> </td>
<%-- <td class="schedulerFlag"> <td class="schedulerFlag">
<c:choose> <c:choose>
<c:when test="${not empty indexCfg.schedule }"> <c:when test="${not empty indexCfg.schedule }">
<span isScheduler="yes"> <span isScheduler="yes">
@@ -439,7 +439,7 @@
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</td> --%> </td>
<td> <td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict"> <c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doLog and indexCfg.action!=64 and indexCfg.action!=32}"> <c:if test="${dict.itemCode eq indexCfg.doLog and indexCfg.action!=64 and indexCfg.action!=32}">