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:
duandongmei
2019-01-08 21:29:48 +06:00
parent 65728f0254
commit e853c1d360
14 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/nis/web/service/LogService.java
View File

@@ -17,7 +17,11 @@ public class LogService extends CrudService<SysLogDao, SysLog> {
public Page<SysLog> findPage(Page<SysLog> page, SysLog sysLog) { public Page<SysLog> findPage(Page<SysLog> page, SysLog sysLog) {
// 设置默认时间范围，默认当前月 // 设置默认时间范围，默认当前月
if (sysLog.getEndDate() == null){ if (sysLog.getEndDate() == null){
sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDate())); sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDate("yyyy-MM-dd HH:mm:ss")));
}else{
sysLog.setEndDate(DateUtils.setHours(sysLog.getEndDate(), 23));
sysLog.setEndDate(DateUtils.setMinutes(sysLog.getEndDate(), 59));
sysLog.setEndDate(DateUtils.setSeconds(sysLog.getEndDate(), 59));
} }
if (sysLog.getBeginDate() == null){ if (sysLog.getBeginDate() == null){
sysLog.setBeginDate(DateUtils.addMonths(sysLog.getEndDate(), -1)); sysLog.setBeginDate(DateUtils.addMonths(sysLog.getEndDate(), -1));
@@ -29,7 +33,11 @@ public class LogService extends CrudService<SysLogDao, SysLog> {
public Page<SysLog> findCfgOperationLogPage(Page<SysLog> page, SysLog sysLog) { public Page<SysLog> findCfgOperationLogPage(Page<SysLog> page, SysLog sysLog) {
// 设置默认时间范围，默认当前月 // 设置默认时间范围，默认当前月
if (sysLog.getEndDate() == null){ if (sysLog.getEndDate() == null){
sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDate())); sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDate("yyyy-MM-dd HH:mm:ss")));
}else{
sysLog.setEndDate(DateUtils.setHours(sysLog.getEndDate(), 23));
sysLog.setEndDate(DateUtils.setMinutes(sysLog.getEndDate(), 59));
sysLog.setEndDate(DateUtils.setSeconds(sysLog.getEndDate(), 59));
} }
if (sysLog.getBeginDate() == null){ if (sysLog.getBeginDate() == null){
sysLog.setBeginDate(DateUtils.addMonths(sysLog.getEndDate(), -1)); sysLog.setBeginDate(DateUtils.addMonths(sysLog.getEndDate(), -1));

1
src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileForm.jsp
View File

@@ -108,7 +108,6 @@ $(function(){
<div class="col-md-6"> <div class="col-md-6">
<input class="form-control required" type="text" name="cfgDesc" value="${_cfg.cfgDesc}"> <input class="form-control required" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
</div> </div>
<div for="cfgDesc"></div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">

1
src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
View File

@@ -97,7 +97,6 @@ $(function(){
name="cfgDesc" name="cfgDesc"
value="${_cfg.cfgDesc}"> value="${_cfg.cfgDesc}">
</div> </div>
<div for="cfgDesc"></div>
</div> </div>
</div> </div>
</div> </div>

1
src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
View File

@@ -96,7 +96,6 @@ $(function(){
name="cfgDesc" name="cfgDesc"
value="${_cfg.cfgDesc}"> value="${_cfg.cfgDesc}">
</div> </div>
<div for="cfgDesc"></div>
</div> </div>
</div> </div>
</div> </div>

1
src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
View File

@@ -118,7 +118,6 @@ $(function(){
name="cfgDesc" name="cfgDesc"
value="${_cfg.cfgDesc}"> value="${_cfg.cfgDesc}">
</div> </div>
<div for="cfgDesc"></div>
</div> </div>
</div> </div>
</div> </div>

1
src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
View File

@@ -117,7 +117,6 @@ $(function(){
name="cfgDesc" name="cfgDesc"
value="${_cfg.cfgDesc}"> value="${_cfg.cfgDesc}">
</div> </div>
<div for="cfgDesc"></div>
</div> </div>
</div> </div>
</div> </div>

1
src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
View File

@@ -125,7 +125,6 @@ function changeDistrict(obj){
name="cfgDesc" name="cfgDesc"
value="${_cfg.cfgDesc}"> value="${_cfg.cfgDesc}">
</div> </div>
<div for="cfgDesc"></div>
</div> </div>
</div> </div>
</div> </div>

1
src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
View File

@@ -106,7 +106,6 @@ $(function(){
name="cfgDesc" name="cfgDesc"
value="${_cfg.cfgDesc}"> value="${_cfg.cfgDesc}">
</div> </div>
<div for="cfgDesc"></div>
</div> </div>
</div> </div>
</div> </div>

1
src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp
View File

@@ -196,7 +196,6 @@ $(function(){
name="cfgDesc" name="cfgDesc"
value="${_cfg.cfgDesc}"> value="${_cfg.cfgDesc}">
</div> </div>
<div for="cfgDesc"></div>
</div> </div>
</div> </div>
</div> </div>

1
src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
View File

@@ -116,7 +116,6 @@ $(function(){
<div class="col-md-6"> <div class="col-md-6">
<input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}"> <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
</div> </div>
<div for="cfgDesc"></div>
</div> </div>
</div> </div>
<c:if test="${isContainFeaturesCfg}"> <c:if test="${isContainFeaturesCfg}">

9
src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
View File

@@ -231,11 +231,10 @@ function privateFileValidate(){
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="keyring_name"/></label> <label class="control-label col-md-3"><spring:message code="keyring_name"/></label>
<div class="col-md-6"> <div class="col-md-6">
<input class="form-control required" type="text" name="cfgDesc" value="${_cfg.cfgDesc}"> <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
</div> </div>
<div for="cfgDesc"></div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
@@ -249,8 +248,8 @@ function privateFileValidate(){
</c:forEach> </c:forEach>
</select> </select>
</div> </div>
<div for="keyringType"></div>
</div> </div>
<div for="keyringType"></div>
</div> </div>
</div> </div>
@@ -280,6 +279,7 @@ function privateFileValidate(){
<div id="publicInfo"></div> <div id="publicInfo"></div>
<div for="publicKeyFileInfo"></div> <div for="publicKeyFileInfo"></div>
</div> </div>
<div for="publicKeyFileInfo"></div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
@@ -306,6 +306,7 @@ function privateFileValidate(){
&nbsp;&nbsp;<label ><i class='fa fa-info-circle'></i>&nbsp;<spring:message code='private_certificate'/></label> &nbsp;&nbsp;<label ><i class='fa fa-info-circle'></i>&nbsp;<spring:message code='private_certificate'/></label>
<div for="privateKeyFileInfo"></div> <div for="privateKeyFileInfo"></div>
</div> </div>
<div for="privateKeyFileInfo"></div>
</div> </div>
</div> </div>
<div class="row "> <div class="row ">

5
src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertForm.jsp
View File

@@ -139,11 +139,10 @@ function certFileValidate(){
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="cert_name"/></label> <label class="control-label col-md-3"><spring:message code="cert_name"/></label>
<div class="col-md-6"> <div class="col-md-6">
<input class="form-control required" type="text" name="cfgDesc" value="${_cfg.cfgDesc}"> <input class="form-control required" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
</div> </div>
<div for="cfgDesc"></div>
</div> </div>
</div> </div>
</div> </div>
@@ -171,8 +170,8 @@ function certFileValidate(){
</div> </div>
</div> </div>
<div id="certInfo"></div> <div id="certInfo"></div>
<div for="certFileInfo"></div>
</div> </div>
<div for="certFileInfo"></div>
</div> </div>
<div class="col-md-6 <c:if test="${isAdd }">hidden</c:if>"> <div class="col-md-6 <c:if test="${isAdd }">hidden</c:if>">
<div class="form-group"> <div class="form-group">

13
src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
View File

@@ -116,11 +116,10 @@ $(function(){
</div> --%> </div> --%>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="policy_name"/></label> <label class="control-label col-md-3"><spring:message code="policy_name"/></label>
<div class="col-md-6"> <div class="col-md-6">
<input class="form-control required" type="text" name="cfgDesc" value="${_cfg.cfgDesc}"> <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
</div> </div>
<div for="cfgDesc"></div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
@@ -135,9 +134,9 @@ $(function(){
<div class="col-md-2"> <div class="col-md-2">
<input class="form-control required number" placeholder="<spring:message code="ttl_unit" />" type="text" name="maxTtl" value="${_cfg.maxTtl}" min="0"> <input class="form-control required number" placeholder="<spring:message code="ttl_unit" />" type="text" name="maxTtl" value="${_cfg.maxTtl}" min="0">
</div> </div>
<div for="minTtl"></div>
<div for="maxTtl"></div>
</div> </div>
<div for="minTtl"></div>
<div for="maxTtl"></div>
</div> </div>
<div class="col-md-6 hidden"> <div class="col-md-6 hidden">
<div class="form-group"> <div class="form-group">
@@ -177,8 +176,8 @@ $(function(){
</c:forEach> </c:forEach>
</select> </select>
</div> </div>
<div for="resGroup1Id"></div>
</div> </div>
<div for="resGroup1Id"></div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
@@ -186,8 +185,8 @@ $(function(){
<div class="col-md-6"> <div class="col-md-6">
<input class="form-control number required" range=[1,128] type="text" name="resGroup1Num" value="${_cfg.resGroup1Num}"> <input class="form-control number required" range=[1,128] type="text" name="resGroup1Num" value="${_cfg.resGroup1Num}">
</div> </div>
<div for="resGroup1Num"></div>
</div> </div>
<div for="resGroup1Num"></div>
</div> </div>
</div> </div>
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>

3
src/main/webapp/static/global/scripts/common.js
View File

@@ -30,6 +30,9 @@ $(function(){
//增加描述新增时的文字长度限制 //增加描述新增时的文字长度限制
$("form input[name='cfgDesc']").attr("maxlength","128"); $("form input[name='cfgDesc']").attr("maxlength","128");
$("form input[name='cfgDesc']").addClass("required");
$("form input[name='cfgDesc']").parent().prev(".control-label").html("<font color='red'>*</font>"+$("form input[name='cfgDesc']").parent().prev(".control-label").text());
$("form input[name='cfgDesc']").parent().append("<div for='cfgDesc'></div>");
$("form input[name$='cfgKeywords']").attr("maxlength","1024"); $("form input[name$='cfgKeywords']").attr("maxlength","1024");
$("form input[name$='cfgKeywords']").attr("minlength","4"); $("form input[name$='cfgKeywords']").attr("minlength","4");
$("form input[class~='domainCheck']").attr("maxlength","1024"); $("form input[class~='domainCheck']").attr("maxlength","1024");