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

新建package report,所有报表的pojo放入其中

Browse Source
This commit is contained in:
wangxin
2018-07-10 09:30:56 +08:00
parent bdc2a88d5b
commit 7b915cb717
12 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/controller/log/ntc/NtcPzReportController.java
View File

@@ -22,8 +22,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
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.domain.report.LogReport;
import com.nis.domain.report.ReportResult;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;

6
src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
View File

@@ -19,9 +19,9 @@ 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.domain.report.NtcLwhhReport;
import com.nis.domain.report.ReportResult;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.web.controller.BaseController;
@@ -52,7 +52,7 @@ public class NtcLwhhReportController extends BaseController {
bean.setSearchService(serviceId.toString());
}
bean.setSearchBusinessType("1");
ReportResultLog<NtcLwhhReportLog> result=new ReportResultLog<>();
ReportResult<NtcLwhhReport> result=new ReportResult<>();
StringBuffer url=new StringBuffer(Constants.LOG_BASE_URL+Constants.NTC_SERVICE_REPORT+"?");
bean.setPageSize(-1);
bean.setFields("lwhh,sum,reportTime");

8
src/main/java/com/nis/web/controller/report/NtcServiceReportController.java
View File

@@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import com.nis.domain.Page;
import com.nis.domain.log.NtcServiceReportLog;
import com.nis.domain.log.ReportResultLog;
import com.nis.domain.log.SearchReport;
import com.nis.domain.report.NtcServiceReport;
import com.nis.domain.report.ReportResult;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.web.controller.BaseController;
@@ -24,7 +24,7 @@ public class NtcServiceReportController extends BaseController {
@RequestMapping("/ntcLabelReport")
public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
initReportCondition(model, bean);
ReportResultLog<NtcServiceReportLog> result=new ReportResultLog<>();
ReportResult<NtcServiceReport> result=new ReportResult<>();
StringBuffer url=new StringBuffer(Constants.LOG_BASE_URL+Constants.NTC_SERVICE_REPORT+"?");
try {
result=result.getReport(url.toString(), bean);
@@ -35,7 +35,7 @@ public class NtcServiceReportController extends BaseController {
// TODO Auto-generated catch block
e.printStackTrace();
}
Page<NtcServiceReportLog> page=result.getData();
Page<NtcServiceReport> page=result.getData();
model.addAttribute("page", page);
return "/report/list";
}

6
src/main/java/com/nis/web/controller/report/NtcTagReportController.java
View File

@@ -19,9 +19,9 @@ 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.log.NtcTagReportLog;
import com.nis.domain.log.ReportResultLog;
import com.nis.domain.log.SearchReport;
import com.nis.domain.report.NtcTagReport;
import com.nis.domain.report.ReportResult;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.web.controller.BaseController;
@@ -52,7 +52,7 @@ public class NtcTagReportController extends BaseController {
bean.setSearchService(serviceId.toString());
}
bean.setSearchBusinessType("1");
ReportResultLog<NtcTagReportLog> result=new ReportResultLog<>();
ReportResult<NtcTagReport> result=new ReportResult<>();
StringBuffer url=new StringBuffer(Constants.LOG_BASE_URL+Constants.NTC_SERVICE_REPORT+"?");
bean.setPageSize(-1);
bean.setFields("tag,sum,reportTime");

4
src/main/java/com/nis/web/controller/report/TestBean.java
View File

@@ -8,7 +8,7 @@
*/
package com.nis.web.controller.report;
import com.nis.domain.log.BaseReportLog;
import com.nis.domain.report.BaseReport;
/**
* @ClassName: TestBean.java
@@ -17,7 +17,7 @@ import com.nis.domain.log.BaseReportLog;
* @date 2018年7月6日 上午9:20:48
* @version V1.0
*/
public class TestBean extends BaseReportLog<TestBean> {
public class TestBean extends BaseReport<TestBean> {
/**
* @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）