(1)加载中样式提交
(2)查询日志总量Controller提交 待接口可用后调整
This commit is contained in:
wangxin
91
src/main/java/com/nis/domain/log/ReportLog.java
Normal file
91
src/main/java/com/nis/domain/log/ReportLog.java
Normal file
@@ -0,0 +1,91 @@
|
||||
/**
|
||||
*@Title: ReportLog.java
|
||||
*@Package com.nis.domain.log
|
||||
*@Description TODO
|
||||
*@author dell
|
||||
*@date 2018年6月13日 下午2:21:04
|
||||
*@version 版本号
|
||||
*/
|
||||
package com.nis.domain.log;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import com.nis.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* @ClassName: ReportLog.java
|
||||
* @Description: TODO
|
||||
* @author (dell)
|
||||
* @date 2018年6月13日 下午2:21:04
|
||||
* @version V1.0
|
||||
*/
|
||||
public class ReportLog extends BaseEntity<ReportLog>{
|
||||
/**
|
||||
* @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
|
||||
*
|
||||
* @since 1.0.0
|
||||
*/
|
||||
|
||||
private static final long serialVersionUID = 7079305499220977782L;
|
||||
private Long configId;
|
||||
private Long sum;
|
||||
private Integer service;
|
||||
private Date statTime;
|
||||
/**
|
||||
* configId
|
||||
* @return configId
|
||||
*/
|
||||
|
||||
public Long getConfigId() {
|
||||
return configId;
|
||||
}
|
||||
/**
|
||||
* @param configId the configId to set
|
||||
*/
|
||||
public void setConfigId(Long configId) {
|
||||
this.configId = configId;
|
||||
}
|
||||
/**
|
||||
* sum
|
||||
* @return sum
|
||||
*/
|
||||
|
||||
public Long getSum() {
|
||||
return sum;
|
||||
}
|
||||
/**
|
||||
* @param sum the sum to set
|
||||
*/
|
||||
public void setSum(Long sum) {
|
||||
this.sum = sum;
|
||||
}
|
||||
/**
|
||||
* service
|
||||
* @return service
|
||||
*/
|
||||
|
||||
public Integer getService() {
|
||||
return service;
|
||||
}
|
||||
/**
|
||||
* @param service the service to set
|
||||
*/
|
||||
public void setService(Integer service) {
|
||||
this.service = service;
|
||||
}
|
||||
/**
|
||||
* statTime
|
||||
* @return statTime
|
||||
*/
|
||||
|
||||
public Date getStatTime() {
|
||||
return statTime;
|
||||
}
|
||||
/**
|
||||
* @param statTime the statTime to set
|
||||
*/
|
||||
public void setStatTime(Date statTime) {
|
||||
this.statTime = statTime;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -24,7 +24,7 @@ import com.nis.domain.RestfulResult;
|
||||
*/
|
||||
public class ReportResultLog extends RestfulResult{
|
||||
private Integer logSource;
|
||||
private List<Page<ReportLog>> data;
|
||||
private Page<ReportLog> data;
|
||||
/**
|
||||
* logSource
|
||||
* @return logSource
|
||||
@@ -44,84 +44,14 @@ public class ReportResultLog extends RestfulResult{
|
||||
* @return data
|
||||
*/
|
||||
|
||||
public List<Page<ReportLog>> getData() {
|
||||
public Page<ReportLog> getData() {
|
||||
return data;
|
||||
}
|
||||
/**
|
||||
* @param data the data to set
|
||||
*/
|
||||
public void setData(List<Page<ReportLog>> data) {
|
||||
public void setData(Page<ReportLog> data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
}
|
||||
class ReportLog extends BaseEntity<ReportLog>{
|
||||
/**
|
||||
* @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
|
||||
*
|
||||
* @since 1.0.0
|
||||
*/
|
||||
|
||||
private static final long serialVersionUID = 7079305499220977782L;
|
||||
private Long configId;
|
||||
private Long sum;
|
||||
private Integer service;
|
||||
private Date statTime;
|
||||
/**
|
||||
* configId
|
||||
* @return configId
|
||||
*/
|
||||
|
||||
public Long getConfigId() {
|
||||
return configId;
|
||||
}
|
||||
/**
|
||||
* @param configId the configId to set
|
||||
*/
|
||||
public void setConfigId(Long configId) {
|
||||
this.configId = configId;
|
||||
}
|
||||
/**
|
||||
* sum
|
||||
* @return sum
|
||||
*/
|
||||
|
||||
public Long getSum() {
|
||||
return sum;
|
||||
}
|
||||
/**
|
||||
* @param sum the sum to set
|
||||
*/
|
||||
public void setSum(Long sum) {
|
||||
this.sum = sum;
|
||||
}
|
||||
/**
|
||||
* service
|
||||
* @return service
|
||||
*/
|
||||
|
||||
public Integer getService() {
|
||||
return service;
|
||||
}
|
||||
/**
|
||||
* @param service the service to set
|
||||
*/
|
||||
public void setService(Integer service) {
|
||||
this.service = service;
|
||||
}
|
||||
/**
|
||||
* statTime
|
||||
* @return statTime
|
||||
*/
|
||||
|
||||
public Date getStatTime() {
|
||||
return statTime;
|
||||
}
|
||||
/**
|
||||
* @param statTime the statTime to set
|
||||
*/
|
||||
public void setStatTime(Date statTime) {
|
||||
this.statTime = statTime;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
/**
|
||||
*@Title: NtcPzReportController.java
|
||||
*@Package com.nis.web.controller.log.ntc
|
||||
*@Description TODO
|
||||
*@author dell
|
||||
*@date 2018年6月12日 下午2:09:41
|
||||
*@version 版本号
|
||||
*/
|
||||
package com.nis.web.controller.log.ntc;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
import com.nis.domain.FunctionServiceDict;
|
||||
import com.nis.domain.log.ReportLog;
|
||||
import com.nis.domain.log.ReportResultLog;
|
||||
import com.nis.util.ConfigServiceUtil;
|
||||
import com.nis.util.Constants;
|
||||
import com.nis.util.DictUtils;
|
||||
import com.nis.web.controller.BaseController;
|
||||
|
||||
/**
|
||||
* @ClassName: NtcPzReportController.java
|
||||
* @Description: TODO
|
||||
* @author (dell)
|
||||
* @date 2018年6月12日 下午2:09:41
|
||||
* @version V1.0
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("${adminPath}/logs")
|
||||
public class NtcPzReportController extends BaseController{
|
||||
@RequestMapping(value="ajaxGetLogTotal")
|
||||
@ResponseBody
|
||||
public String ajaxGetLogTotal(Model model,long endTime,int action,Integer functionId,String compileIds){
|
||||
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mi:ss");
|
||||
int interval=Constants.LOG_TIME_RANGE;
|
||||
Date endDate=new Date(endTime);
|
||||
Date startDate=new Date(endTime-interval);
|
||||
int serviceId=0;
|
||||
List<FunctionServiceDict> serviceList=DictUtils.getFunctionServiceDictList(functionId.intValue());
|
||||
for(FunctionServiceDict service:serviceList){
|
||||
if(service.getAction().intValue()==action){
|
||||
serviceId=service.getServiceId().intValue();
|
||||
break;
|
||||
}
|
||||
}
|
||||
ReportResultLog result=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, String.valueOf(serviceId), sdf.format(startDate), sdf.format(endDate));
|
||||
if(result.getData()!=null&&result.getData().getList()!=null){
|
||||
model.addAttribute("data", result.getData().getList());
|
||||
}
|
||||
return "success";
|
||||
}
|
||||
}
|
||||
@@ -311,7 +311,7 @@
|
||||
<c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'cancel'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:if>
|
||||
</c:forEach>
|
||||
</td>
|
||||
<td compileId="${cfg.compileId}">0</td>
|
||||
<td compileId="${cfg.compileId}" ><div class="loading-total"></div></td>
|
||||
<td>${cfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
<td>${cfg.editorName }</td>
|
||||
@@ -328,13 +328,5 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal fade" id="loadingModal">
|
||||
<div style="width:100%;height:100%; z-index:200000; position:absolute;text-align:center;left:50%;top:50%;margin-left:-100px;margin-top:-10px">
|
||||
<!-- <div class="progress progeress-striped active" style="margin-bottom: 0;">
|
||||
<div class="process-bar process-bar-info" role="processbar" style="width:100%"></div>
|
||||
</div>
|
||||
<h5><spring:message code="loading..."/></h5>-->
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -22569,4 +22569,12 @@ span[id^='open']{
|
||||
}
|
||||
span[id^='close']{
|
||||
cursor:pointer;
|
||||
}
|
||||
.loading-total{
|
||||
width:50px;
|
||||
height:10px;
|
||||
position:relative;
|
||||
background:url(../img/loading.gif) no-repeat center center;
|
||||
opacity:0.7;
|
||||
filter:progid:DXImageTransform.Microsoft.Alpha(opacity=70);
|
||||
}
|
||||
Reference in New Issue
Block a user