来文函号报表页面提交

src/main/java/com/nis/domain/log/NtcLwhhReportLog.java

@@ -0,0 +1,43 @@
+/**
+ *@Title: NtcServiceReportLog.java
+ *@Package com.nis.domain.log 
+ *@Description TODO
+ *@author dell
+ *@date 2018年7月9日 上午8:57:01
+ *@version  版本号
+ */
+package com.nis.domain.log;
+
+/**
+ * @ClassName: NtcServiceReportLog.java 
+ * @Description: TODO
+ * @author (dell)
+ * @date 2018年7月9日 上午8:57:01
+ * @version V1.0
+ */
+public class NtcLwhhReportLog extends BaseReportLog<NtcLwhhReportLog> {
+
+	/**
+	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
+	 *
+	 * @since 1.0.0
+	 */
+	
+	private static final long serialVersionUID = 2245672277797057001L;
+	private Integer lwhh;
+	/**
+	 * lwhh
+	 * @return  lwhh
+	*/
+	
+	public Integer getLwhh() {
+		return lwhh;
+	}
+	/**
+	 * @param lwhh the lwhh to set
+	 */
+	public void setLwhh(Integer lwhh) {
+		this.lwhh = lwhh;
+	}
+	
+}

src/main/java/com/nis/domain/log/SearchReport.java

@@ -44,7 +44,23 @@ public class SearchReport extends BaseEntity<SearchReport>{
 	private Integer pageSize;
 	private String orderBy;
 	private String fields;
+	//界面查询的时间
+	private String reportTime;
 	
+	/**
+	 * reportTime
+	 * @return  reportTime
+	*/
+	
+	public String getReportTime() {
+		return reportTime;
+	}
+	/**
+	 * @param reportTime the reportTime to set
+	 */
+	public void setReportTime(String reportTime) {
+		this.reportTime = reportTime;
+	}
 	/**
 	 * pageNo
 	 * @return  pageNo

src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java

@@ -0,0 +1,158 @@
+package com.nis.web.controller.report;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.nis.domain.FunctionServiceDict;
+import com.nis.domain.Page;
+import com.nis.domain.basics.ServiceDictInfo;
+import com.nis.domain.configuration.RequestInfo;
+import com.nis.domain.log.NtcLwhhReportLog;
+import com.nis.domain.log.ReportResultLog;
+import com.nis.domain.log.SearchReport;
+import com.nis.util.Constants;
+import com.nis.util.DictUtils;
+import com.nis.web.controller.BaseController;
+
+@Controller
+@RequestMapping("${adminPath}/report")
+public class NtcLwhhReportController extends BaseController {
+	@RequestMapping("/ajaxNtcLwhhReport")
+	public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
+		List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
+		model.addAttribute("requestInfos", requestInfos);
+		if(bean.getAction()!=null){
+			for(FunctionServiceDict service:serviceList){
+				if(service.getAction().intValue()==bean.getAction().intValue()){
+					bean.setSearchService(service.getServiceId().toString());
+				}
+			}
+		}else{
+			StringBuffer serviceId=new StringBuffer();
+			for(int i=0;i<serviceList.size();i++){
+				if(i==0){
+					serviceId.append(serviceList.get(i).getServiceId().toString());
+				}else{
+					serviceId.append(","+serviceList.get(i).getServiceId().toString());
+				}
+			}
+			bean.setSearchService(serviceId.toString());
+		}
+		bean.setSearchBusinessType("1");
+		ReportResultLog<NtcLwhhReportLog> result=new ReportResultLog<>();
+		StringBuffer url=new StringBuffer(Constants.LOG_BASE_URL+Constants.NTC_SERVICE_REPORT+"?");
+		bean.setPageSize(-1);
+		bean.setFields("lwhh,sum,reportTime");
+		String format=Constants.SEARCH_DATEFORMAT;
+		SimpleDateFormat sdf=new SimpleDateFormat(format);
+		Date date=new Date();
+		bean.setSearchReportEndTime(sdf.format(date));
+		Calendar cal=Calendar.getInstance();
+		cal.set(Calendar.MINUTE, 0);
+		cal.set(Calendar.SECOND, 0);
+		cal.set(Calendar.MILLISECOND, 0);
+		if(bean.getReportType()==Constants.REPORT_TYPE_HOUR){
+			cal.set(Calendar.HOUR_OF_DAY, 0);
+		}else if(bean.getReportType()==Constants.REPORT_TYPE_DAY){
+			cal.set(Calendar.HOUR_OF_DAY, 0);
+			cal.set(Calendar.DAY_OF_MONTH, 1);
+		}else if(bean.getReportType()==Constants.REPORT_TYPE_MONTH){
+			cal.set(Calendar.HOUR_OF_DAY, 0);
+			cal.set(Calendar.DAY_OF_MONTH, 1);
+			cal.set(Calendar.MONTH, 0);
+		}
+		logger.info("search start time "+sdf.format(cal.getTime()));
+		logger.info("search end time "+sdf.format(date));
+		bean.setSearchReportStartTime(sdf.format(cal.getTime()));
+		List<String> titles=new ArrayList<String>();
+		while(cal.getTime().getTime()<date.getTime()){//构造标题
+			//报表时间单位加一
+			if(bean.getReportType()==Constants.REPORT_TYPE_HOUR){
+				titles.add(sdf.format(cal.getTime()).substring(0,13));
+				cal.add(Calendar.HOUR_OF_DAY, 1);
+			}else if(bean.getReportType()==Constants.REPORT_TYPE_DAY){
+				titles.add(sdf.format(cal.getTime()).substring(0,10));
+				cal.add(Calendar.DAY_OF_MONTH, 1);
+			}else if(bean.getReportType()==Constants.REPORT_TYPE_MONTH){
+				titles.add(sdf.format(cal.getTime()).substring(0,7));
+				cal.add(Calendar.MONTH, 1);
+			}
+		}
+		model.addAttribute("titles", titles);
+//		try {
+//			result=result.getReport(url.toString(), bean);
+//			Page<NtcLwhhReportLog> page=result.getData();
+//			List<NtcLwhhReportLog> list=page.getList();
+//			HashMap<String,Long> trimData=new HashMap<>();//数据累加去重
+//			for(NtcLwhhReportLog report:list){
+//				String trimStr="";
+//				if(bean.getReportType()==Constants.REPORT_TYPE_HOUR){
+//					trimStr=report.getLwhh().intValue()+Constants.REPORT_TRIM_CONNECTOR+
+//							sdf.format(cal.getTime()).substring(0,13);
+//					
+//				}else if(bean.getReportType()==Constants.REPORT_TYPE_DAY){
+//					trimStr=report.getLwhh().intValue()+Constants.REPORT_TRIM_CONNECTOR+
+//							sdf.format(cal.getTime()).substring(0,10);
+//					
+//				}else if(bean.getReportType()==Constants.REPORT_TYPE_MONTH){
+//					 trimStr=report.getLwhh().intValue()+Constants.REPORT_TRIM_CONNECTOR+
+//							sdf.format(cal.getTime()).substring(0,7);
+//				}
+//				if(trimData.containsKey(trimStr)){
+//					trimData.put(trimStr, trimData.get(trimStr)+report.getSum().longValue());	
+//				}else{
+//					trimData.put(trimStr, report.getSum().longValue());	
+//				}
+//			}
+//			HashMap<String,List<Long>> showData=new HashMap<>();//构造数据展示集合
+//			for(RequestInfo requestInfo:requestInfos){
+//				List<Long> line= new ArrayList<Long>();
+//				long total=0;
+//				for(String title:titles){
+//					if(trimData.containsKey(requestInfo.getId().longValue()+Constants.REPORT_TRIM_CONNECTOR+title)){
+//						line.add(trimData.get(requestInfo.getId().longValue()+Constants.REPORT_TRIM_CONNECTOR+title));
+//						total+=trimData.get(requestInfo.getId().longValue()+Constants.REPORT_TRIM_CONNECTOR+title).longValue();
+//					}else{
+//						line.add(0l);
+//					}
+//				}
+//				List<Long> _line= new ArrayList<Long>();
+//				_line.add(total);
+//				_line.addAll(line);
+//				showData.put(requestInfo.getId().toString(), _line);
+//			}
+//			model.addAttribute("datas", showData);
+//		} catch (Exception e) {
+//			// TODO: handle exception
+//			e.printStackTrace();
+//		}
+		HashMap<String,List<Long>> showData=new HashMap<>();//构造数据展示集合
+		for(RequestInfo requestInfo:requestInfos){
+			List<Long> line= new ArrayList<Long>();
+			long total=0l;
+			for(String title:titles){
+				line.add(10000l);
+				total+=10000l;
+			}
+			List<Long> _line= new ArrayList<Long>();
+			_line.add(total);
+			_line.addAll(line);
+			showData.put(requestInfo.getId().toString(), _line);
+		}
+		model.addAttribute("datas", showData);
+		return "/report/lwhh";
+	}
+}

src/main/java/com/nis/web/controller/report/NtcTagReportController.java

@@ -31,7 +31,6 @@ import com.nis.web.controller.BaseController;
 public class NtcTagReportController extends BaseController {
 	@RequestMapping("/ajaxNtcTagReport")
 	public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
-		initReportCondition(model, bean);
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
 		List<ServiceDictInfo> labels=serviceDictInfoService.findAllLableDict();
 		model.addAttribute("labels", labels);

src/main/webapp/WEB-INF/views/report/list.jsp

@@ -21,6 +21,8 @@
 			ajaxGetLabelReport();
 		}else if("${bean.reportBusinessType}"=="label_report"){
 			ajaxGetLabelReport();
+		}else if("${bean.reportBusinessType}"=="lwhh_report"){
+			ajaxGetLwhhReport();
 		}
 		$("input[name='reportType']").each(function(){
 			var type='${bean.reportType}';
@@ -36,6 +38,8 @@
 				var reportType=$('input[name="reportType"]:checked').val();
 				if($(this).data("bussiness")=="label_report"){
 					ajaxGetLabelReport();
+				}else if($(this).data("bussiness")=="lwhh_report"){
+					ajaxGetLwhhReport();
 				}
 			}
 		});
@@ -55,6 +59,21 @@ var ajaxGetLabelReport=function(){
 		}
 	});
 }
+var ajaxGetLwhhReport=function(){
+	$.ajax({
+		type:'post',
+		async:false,
+		url:'${ctx}/report/ajaxNtcLwhhReport',
+		data:{
+			"action":$('select[name="action"]').val(),
+			"reportType":$('input[name="reportType"]:checked').val()
+		},
+		dataType:"html",
+		success:function(data){
+			$("#lwhh").html(data);
+		}
+	});
+}
 </script>
 </head>
 <body>
@@ -177,9 +196,15 @@ var ajaxGetLabelReport=function(){
 							><a data-bussiness="isp_report" data-toggle="tab" href="#entranceId"><spring:message code="isp_report"/></a></li>
 						</ul>
 						<div class="tab-content">
-							<div id="label" class="tab-pane fade in active"></div>
+							<div id="label" class="tab-pane fade
+							<c:if test="${bean.reportBusinessType eq 'label_report' or bean.reportBusinessType ==null}">
+							 in active
+							</c:if>"></div>
 							<%@include file="/WEB-INF/views/report/attrType.jsp" %>
-							<%@include file="/WEB-INF/views/report/lwhh.jsp" %>
+							<div id="lwhh" class="tab-pane fade
+							<c:if test="${bean.reportBusinessType eq 'lwhh_report'}">
+							 in active
+							</c:if>"></div>
 							<%@include file="/WEB-INF/views/report/srcIp.jsp" %>
 							<%@include file="/WEB-INF/views/report/destIp.jsp" %>
 							<%@include file="/WEB-INF/views/report/entranceId.jsp" %>

src/main/webapp/WEB-INF/views/report/lwhh.jsp

@@ -4,39 +4,29 @@
 $(function(){
 });
 </script>
-<div id="lwhh" class="tab-pane fade">
+<table id="lwhhTable" class="table table-striped table-bordered table-condensed text-nowrap">
-	<table id="contentTable1" class="table table-striped table-bordered table-condensed text-nowrap">
 <thead>
 	<tr>
-				<th>性质</th>
+		<th><spring:message code="requestInfo"/></th>
-				<th>总量</th>
+		<th><spring:message code="log_total"/></th>
-				<th>0点</th>
+		<c:forEach items="${titles}" var="title">
-				<th>1点</th>
+		<th>${title}</th>
-				<th>2点</th>
+		</c:forEach>
-				<th>3点</th>
-				<th>4点</th>
-				<th>5点</th>
-				<th>6点</th>
-				<th>7点</th>
-				<th>8点</th>
-				<th>9点</th>
-				<th>10点</th>
-				<th>11点</th>
-				<th>12点</th>
-				<th>14点</th>
-				<th>15点</th>
-				<th>16点</th>
-				<th>17点</th>
-				<th>18点</th>
-				<th>19点</th>
-				<th>20点</th>
-				<th>21点</th>
-				<th>22点</th>
-				<th>23点</th>
 	</tr>
 </thead>
 <tbody>
+	<c:forEach items="${datas}" var="data">
+	<tr>
+		 <td>
+		 	<c:forEach items="${requestInfos}" var="lwhh">
+			<c:if test="${lwhh.id eq data.key}">${lwhh.requestTitle}</c:if>
+			</c:forEach>
+		</td> 
+		<c:forEach items="${data.value}" var="cloumn" varStatus="status">
+			<td>${cloumn}</td>
+		</c:forEach>
+	</tr>
+	</c:forEach>
 </tbody>
 </table>
 <div class="page">${page}</div>
-</div>