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

(1)实时报表reportTime字段修改为字符串格式

Browse Source 
(2)实时报表回传结果解析不再使用Gson,gson会将long转为double
This commit is contained in:
wangxin
2018-07-30 14:41:27 +08:00
parent cdd83323c0
commit 235db08afb
12 changed files with 264 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/nis/domain/report/BaseReport.java
View File

@@ -8,8 +8,6 @@
*/
package com.nis.domain.report;
import java.util.Date;
import com.nis.domain.BaseEntity;
/**
@@ -19,7 +17,7 @@ import com.nis.domain.BaseEntity;
* @date 2018年7月5日 上午11:12:48
* @version V1.0
*/
public class BaseReport<T> extends BaseEntity<T> {
public class BaseReport<T> extends BaseEntity<T>{
/**
* @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
*
@@ -29,7 +27,7 @@ public class BaseReport<T> extends BaseEntity<T> {
private static final long serialVersionUID = -6190203013788730697L;
protected Long sum;
protected Integer service;
protected Date reportTime;
protected String reportTime;
/**
* sum
* @return sum
@@ -63,13 +61,13 @@ public class BaseReport<T> extends BaseEntity<T> {
* @return reportTime
*/
public Date getReportTime() {
public String getReportTime() {
return reportTime;
}
/**
* @param reportTime the reportTime to set
*/
public void setReportTime(Date reportTime) {
public void setReportTime(String reportTime) {
this.reportTime = reportTime;
}
}

88
src/main/java/com/nis/domain/report/ReportResult.java
View File

@@ -8,38 +8,8 @@
*/
package com.nis.domain.report;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Type;
import java.net.URI;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map.Entry;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.Invocation.Builder;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriBuilder;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import com.nis.domain.Page;
import com.nis.domain.RestfulResult;
import com.nis.domain.log.SearchReport;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.StringUtils;
import com.nis.util.httpclient.ClientUtil;
/**
* @ClassName: ReportResultLog.java
@@ -48,9 +18,9 @@ import com.nis.util.httpclient.ClientUtil;
* @date 2018年6月11日 下午2:04:09
* @version V1.0
*/
public class ReportResult<T extends BaseReport> extends RestfulResult{
public class ReportResult extends RestfulResult{
private Integer logSource;
private Page<T> data;
private Page data;
/**
* logSource
* @return logSource
@@ -70,63 +40,13 @@ public class ReportResult<T extends BaseReport> extends RestfulResult{
* @return data
*/
public Page<T> getData() {
public Page getData() {
return data;
}
/**
* @param data the data to set
*/
public void setData(Page<T> data) {
public void setData(Page data) {
this.data = data;
}
public String getReport(String reportUrl, SearchReport searchCondition) throws MaatConvertException, UnsupportedEncodingException{
// if(StringUtils.isBlank(searchCondition.getSearchService())){
// throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
// }
String result = null;
ReportResult<T> bean = null;
UriBuilder builder=UriBuilder.fromPath(reportUrl);
builder.queryParam("searchBusinessType",searchCondition.getSearchBusinessType());
if(StringUtils.isNotBlank(searchCondition.getSearchService())) {
builder.queryParam("searchService",searchCondition.getSearchService());
}
if(searchCondition.getSearchCondition()!=null){
for(Entry<String, Object> e:searchCondition.getSearchCondition().entrySet()){
builder.queryParam(e.getKey(),e.getValue());
}
}
if(StringUtils.isNotBlank(searchCondition.getSearchReportStartTime())){
builder.queryParam("searchReportStartTime",searchCondition.getSearchReportStartTime());
}
if(StringUtils.isNotBlank(searchCondition.getSearchReportEndTime())){
builder.queryParam("searchReportEndTime",searchCondition.getSearchReportEndTime());
}
if(searchCondition.getPageNo()!=null){
builder.queryParam("pageNo",searchCondition.getPageNo());
}
if(searchCondition.getPageSize()!=null){
builder.queryParam("pageSize",searchCondition.getPageSize());
}
if(StringUtils.isNotBlank(searchCondition.getOrderBy())){
builder.queryParam("orderBy",searchCondition.getOrderBy());
}
if(StringUtils.isNotBlank(searchCondition.getFields())){
builder.queryParam("fields",searchCondition.getFields());
}
URI uri=builder.build();
//创建连接
ClientUtil.initClient();
Client client=ClientUtil.getClient();
WebTarget wt = client.target(uri);
Builder header = wt.request();
Response response= header.get();
if( response.getStatus() == 200){
result= response.readEntity(String.class);
}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+response.readEntity(String.class));
}
return result;
}
}

67
src/main/java/com/nis/util/ConfigServiceUtil.java
View File

@@ -1,9 +1,11 @@
package com.nis.util;
import java.io.File;
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.Entity;
@@ -18,10 +20,9 @@ import org.glassfish.jersey.media.multipart.file.FileDataBodyPart;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.nis.domain.log.SearchReport;
import com.nis.domain.maat.ToMaatResult;
import com.nis.domain.report.NtcPzReport;
import com.nis.domain.report.ReportResult;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.httpclient.ClientUtil;
@@ -319,18 +320,17 @@ public class ConfigServiceUtil {
* @exception
* @since 1.0.0
*/
public static ReportResult<NtcPzReport> getReport(int type,String ids,String serviceIds,String searchReportStartTime,String searchReportEndTime) throws MaatConvertException{
public static String getReport(int type,String ids,String serviceIds,String searchReportStartTime,String searchReportEndTime) throws MaatConvertException{
if(StringUtils.isBlank(ids)||StringUtils.isBlank(serviceIds)){
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
String result = null;
ReportResult<NtcPzReport> bean = null;
UriBuilder builder=UriBuilder.fromPath(Constants.LOG_BASE_URL+Constants.NTC_PZ_REPORT);
builder.queryParam("searchBusinessType",type);
builder.queryParam("searchService",serviceIds);
builder.queryParam("searchCfgId",ids);
// builder.queryParam("searchReportStartTime",searchReportStartTime);
// builder.queryParam("searchReportEndTime",searchReportEndTime);
builder.queryParam("searchReportStartTime",searchReportStartTime);
builder.queryParam("searchReportEndTime",searchReportEndTime);
URI uri=builder.build();
//创建连接
ClientUtil.initClient();
@@ -341,13 +341,60 @@ public class ConfigServiceUtil {
Response response= header.get();
if( response.getStatus() == 200){
result= response.readEntity(String.class);
Gson gson=Constants.gsonbuilder.create();
bean = gson.fromJson(result, new TypeToken<ReportResult<NtcPzReport>>(){
private static final long serialVersionUID = 7963055764864141968L;}.getType());
}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+response.readEntity(String.class));
}
return bean;
return result;
}
public static String getReport(String reportUrl, SearchReport searchCondition) throws MaatConvertException, UnsupportedEncodingException{
// if(StringUtils.isBlank(searchCondition.getSearchService())){
// throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
// }
String result = null;
UriBuilder builder=UriBuilder.fromPath(reportUrl);
builder.queryParam("searchBusinessType",searchCondition.getSearchBusinessType());
if(StringUtils.isNotBlank(searchCondition.getSearchService())) {
builder.queryParam("searchService",searchCondition.getSearchService());
}
if(searchCondition.getSearchCondition()!=null){
for(Entry<String, Object> e:searchCondition.getSearchCondition().entrySet()){
builder.queryParam(e.getKey(),e.getValue());
}
}
if(StringUtils.isNotBlank(searchCondition.getSearchReportStartTime())){
builder.queryParam("searchReportStartTime",searchCondition.getSearchReportStartTime());
}
if(StringUtils.isNotBlank(searchCondition.getSearchReportEndTime())){
builder.queryParam("searchReportEndTime",searchCondition.getSearchReportEndTime());
}
if(searchCondition.getPageNo()!=null){
builder.queryParam("pageNo",searchCondition.getPageNo());
}
if(searchCondition.getPageSize()!=null){
builder.queryParam("pageSize",searchCondition.getPageSize());
}
if(StringUtils.isNotBlank(searchCondition.getOrderBy())){
builder.queryParam("orderBy",searchCondition.getOrderBy());
}
if(StringUtils.isNotBlank(searchCondition.getFields())){
builder.queryParam("fields",searchCondition.getFields());
}
URI uri=builder.build();
logger.info("report url:"+uri.toString());
//创建连接
ClientUtil.initClient();
Client client=ClientUtil.getClient();
WebTarget wt = client.target(uri);
Builder header = wt.request();
Response response= header.get();
if( response.getStatus() == 200){
result= response.readEntity(String.class);
}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+response.readEntity(String.class));
}
return result;
}
public static void main(String[] args) {
try {

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

@@ -40,20 +40,18 @@ import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.ComplexStringCfgTemplate;
import com.nis.domain.configuration.template.IpCfgTemplate;
import com.nis.domain.configuration.RequestInfo;
import com.nis.domain.configuration.StringCfgTemplate;
import com.nis.domain.configuration.template.IpCfgTemplate;
import com.nis.domain.log.BaseLogEntity;
import com.nis.domain.log.SearchReport;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Configurations;
//import com.nis.main.ConvertTool;
import com.nis.util.Constants;
import com.nis.util.DateUtil;
import com.nis.util.DateUtils;
import com.nis.util.DictUtils;
import com.nis.util.JsonMapper;
import com.nis.util.StringUtil;
import com.nis.util.excel.ExportExcel;
import com.nis.web.service.ArchiveServcie;
import com.nis.web.service.AreaService;

42
src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
View File

@@ -1,7 +1,6 @@
package com.nis.web.controller.report;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -16,17 +15,18 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.log.SearchReport;
import com.nis.domain.report.NtcDestIpReport;
import com.nis.domain.report.ReportResult;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.web.controller.BaseController;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import net.sf.json.JsonConfig;
@Controller
@RequestMapping("${adminPath}/report")
public class NtcDestIpReportController extends BaseController {
@@ -67,29 +67,23 @@ public class NtcDestIpReportController extends BaseController {
List<String> titles=this.getDateTitiles(bean);
model.addAttribute("titles", titles);
try {
ReportResult<NtcDestIpReport> result=new ReportResult<>();
StringBuffer url=new StringBuffer(Constants.LOG_BASE_URL+Constants.NTC_NTC_DESTIP_REPORT);
Gson gson=Constants.gsonbuilder.create();
String json=result.getReport(url.toString(), bean);
result = gson.fromJson(json, new TypeToken<ReportResult<NtcDestIpReport>>() {
}.getType());
Page<NtcDestIpReport> page=result.getData();
List<NtcDestIpReport> list=page.getList();
String json=ConfigServiceUtil.getReport(url.toString(), bean);
HashMap<String,Long> trimData=new HashMap<>();//数据累加去重
SimpleDateFormat sdf=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT);
for(NtcDestIpReport report:list){
// SimpleDateFormat sdf=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT);
for(NtcDestIpReport report:getList(json)){
String trimStr="";
if(bean.getReportType()==Constants.REPORT_TYPE_HOUR){
trimStr=report.getDestCountry().trim()+Constants.REPORT_TRIM_CONNECTOR+
sdf.format(report.getReportTime()).substring(0,13);
report.getReportTime().substring(0,13);
}else if(bean.getReportType()==Constants.REPORT_TYPE_DAY){
trimStr=report.getDestCountry().trim()+Constants.REPORT_TRIM_CONNECTOR+
sdf.format(report.getReportTime()).substring(0,10);
report.getReportTime().substring(0,10);
}else if(bean.getReportType()==Constants.REPORT_TYPE_MONTH){
trimStr=report.getDestCountry().trim()+Constants.REPORT_TRIM_CONNECTOR+
sdf.format(report.getReportTime()).substring(0,7);
report.getReportTime().substring(0,7);
}
if(trimData.containsKey(trimStr)){
trimData.put(trimStr, trimData.get(trimStr)+report.getSum().longValue());
@@ -137,4 +131,18 @@ public class NtcDestIpReportController extends BaseController {
// model.addAttribute("datas", showData);
return "/report/destIp";
}
public List<NtcDestIpReport> getList(String json){
JSONObject obj=JSONObject.fromObject(json);
if(obj.containsKey("data")) {
JSONObject data= obj.getJSONObject("data");
if(data.containsKey("list")) {
Object list=data.get("list");
JSONArray array=JSONArray.fromObject(list);
List<NtcDestIpReport> result=JSONArray.toList(array, new NtcDestIpReport(),new JsonConfig());
return result;
}
}
return new ArrayList<NtcDestIpReport>();
}
}

42
src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
View File

@@ -1,7 +1,6 @@
package com.nis.web.controller.report;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -16,17 +15,18 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.log.SearchReport;
import com.nis.domain.report.NtcEntranceReport;
import com.nis.domain.report.ReportResult;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.web.controller.BaseController;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import net.sf.json.JsonConfig;
@Controller
@RequestMapping("${adminPath}/report")
public class NtcEntranceReportController extends BaseController {
@@ -67,29 +67,23 @@ public class NtcEntranceReportController extends BaseController {
List<String> titles=this.getDateTitiles(bean);
model.addAttribute("titles", titles);
try {
ReportResult<NtcEntranceReport> result=new ReportResult<>();
StringBuffer url=new StringBuffer(Constants.LOG_BASE_URL+Constants.NTC_NTC_ENTRANCE_REPORT);
Gson gson=Constants.gsonbuilder.create();
String json=result.getReport(url.toString(), bean);
result = gson.fromJson(json, new TypeToken<ReportResult<NtcEntranceReport>>() {
}.getType());
Page<NtcEntranceReport> page=result.getData();
List<NtcEntranceReport> list=page.getList();
String json=ConfigServiceUtil.getReport(url.toString(), bean);
HashMap<String,Long> trimData=new HashMap<>();//数据累加去重
SimpleDateFormat sdf=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT);
for(NtcEntranceReport report:list){
// SimpleDateFormat sdf=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT);
for(NtcEntranceReport report:getList(json)){
String trimStr="";
if(bean.getReportType()==Constants.REPORT_TYPE_HOUR){
trimStr=report.getEntranceId().intValue()+Constants.REPORT_TRIM_CONNECTOR+
sdf.format(report.getReportTime()).substring(0,13);
report.getReportTime().substring(0,13);
}else if(bean.getReportType()==Constants.REPORT_TYPE_DAY){
trimStr=report.getEntranceId().intValue()+Constants.REPORT_TRIM_CONNECTOR+
sdf.format(report.getReportTime()).substring(0,10);
report.getReportTime().substring(0,10);
}else if(bean.getReportType()==Constants.REPORT_TYPE_MONTH){
trimStr=report.getEntranceId().intValue()+Constants.REPORT_TRIM_CONNECTOR+
sdf.format(report.getReportTime()).substring(0,7);
report.getReportTime().substring(0,7);
}
if(trimData.containsKey(trimStr)){
trimData.put(trimStr, trimData.get(trimStr)+report.getSum().longValue());
@@ -137,4 +131,18 @@ public class NtcEntranceReportController extends BaseController {
// model.addAttribute("datas", showData);
return "/report/entranceId";
}
public List<NtcEntranceReport> getList(String json){
JSONObject obj=JSONObject.fromObject(json);
if(obj.containsKey("data")) {
JSONObject data= obj.getJSONObject("data");
if(data.containsKey("list")) {
Object list=data.get("list");
JSONArray array=JSONArray.fromObject(list);
List<NtcEntranceReport> result=JSONArray.toList(array, new NtcEntranceReport(),new JsonConfig());
return result;
}
}
return new ArrayList<NtcEntranceReport>();
}
}

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

@@ -1,7 +1,6 @@
package com.nis.web.controller.report;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -15,18 +14,19 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.configuration.RequestInfo;
import com.nis.domain.log.SearchReport;
import com.nis.domain.report.NtcLwhhReport;
import com.nis.domain.report.ReportResult;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.web.controller.BaseController;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import net.sf.json.JsonConfig;
@Controller
@RequestMapping("${adminPath}/report")
public class NtcLwhhReportController extends BaseController {
@@ -64,29 +64,23 @@ public class NtcLwhhReportController extends BaseController {
List<String> titles=this.getDateTitiles(bean);
model.addAttribute("titles", titles);
try {
ReportResult<NtcLwhhReport> result=new ReportResult<>();
StringBuffer url=new StringBuffer(Constants.LOG_BASE_URL+Constants.NTC_NTC_LWHH_REPORT);
Gson gson=Constants.gsonbuilder.create();
String json=result.getReport(url.toString(), bean);
result = gson.fromJson(json, new TypeToken<ReportResult<NtcLwhhReport>>() {
}.getType());
Page<NtcLwhhReport> page=result.getData();
List<NtcLwhhReport> list=page.getList();
String json=ConfigServiceUtil.getReport(url.toString(), bean);
HashMap<String,Long> trimData=new HashMap<>();//数据累加去重
SimpleDateFormat sdf=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT);
for(NtcLwhhReport report:list){
// SimpleDateFormat sdf=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT);
for(NtcLwhhReport report:getList(json)){
String trimStr="";
if(bean.getReportType()==Constants.REPORT_TYPE_HOUR){
trimStr=report.getLwhh().intValue()+Constants.REPORT_TRIM_CONNECTOR+
sdf.format(report.getReportTime()).substring(0,13);
report.getReportTime().substring(0,13);
}else if(bean.getReportType()==Constants.REPORT_TYPE_DAY){
trimStr=report.getLwhh().intValue()+Constants.REPORT_TRIM_CONNECTOR+
sdf.format(report.getReportTime()).substring(0,10);
report.getReportTime().substring(0,10);
}else if(bean.getReportType()==Constants.REPORT_TYPE_MONTH){
trimStr=report.getLwhh().intValue()+Constants.REPORT_TRIM_CONNECTOR+
sdf.format(report.getReportTime()).substring(0,7);
report.getReportTime().substring(0,7);
}
if(trimData.containsKey(trimStr)){
trimData.put(trimStr, trimData.get(trimStr)+report.getSum().longValue());
@@ -132,4 +126,18 @@ public class NtcLwhhReportController extends BaseController {
// model.addAttribute("datas", showData);
return "/report/lwhh";
}
public List<NtcLwhhReport> getList(String json){
JSONObject obj=JSONObject.fromObject(json);
if(obj.containsKey("data")) {
JSONObject data= obj.getJSONObject("data");
if(data.containsKey("list")) {
Object list=data.get("list");
JSONArray array=JSONArray.fromObject(list);
List<NtcLwhhReport> result=JSONArray.toList(array, new NtcLwhhReport(),new JsonConfig());
return result;
}
}
return new ArrayList<NtcLwhhReport>();
}
}

41
src/main/java/com/nis/web/controller/report/NtcPzReportController.java
View File

@@ -9,6 +9,7 @@
package com.nis.web.controller.report;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -24,19 +25,19 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.basics.ServiceDictInfo;
import com.nis.domain.log.SearchReport;
import com.nis.domain.report.NtcPzReport;
import com.nis.domain.report.ReportResult;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.web.controller.BaseController;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import net.sf.json.JsonConfig;
/**
* @ClassName: NtcPzReportController.java
* @Description: TODO
@@ -64,9 +65,11 @@ public class NtcPzReportController extends BaseController{
}
}
data.put("compileId", compileId.intValue());
ReportResult<NtcPzReport> result=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, String.valueOf(compileId), String.valueOf(serviceId), sdf.format(startDate), sdf.format(endDate));
if(result.getData()!=null&&result.getData().getList()!=null&&result.getData().getList().size()>0){
data.put("sum", result.getData().getList().get(0).getSum().longValue());
String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, String.valueOf(compileId), String.valueOf(serviceId), sdf.format(startDate), sdf.format(endDate));
List<NtcPzReport> list=getList(json);
System.out.println("list size "+list.size());
if(list!=null&&list.size()>0){
data.put("sum",list.get(0).getSum().longValue());
}else {
data.put("sum", 0);
}
@@ -95,23 +98,31 @@ public class NtcPzReportController extends BaseController{
}
bean.setSearchService(serviceId.toString());
}
ReportResult<NtcPzReport> result=new ReportResult<>();
StringBuffer url=new StringBuffer(Constants.LOG_BASE_URL+Constants.NTC_PZ_REPORT);
List<String> titles=this.getDateTitiles(bean);
model.addAttribute("titles", titles);
try {
Gson gson=Constants.gsonbuilder.create();
String json=result.getReport(url.toString(), bean);
result = gson.fromJson(json, new TypeToken<ReportResult<NtcPzReport>>() {
}.getType());
Page<NtcPzReport> page=result.getData();
List<NtcPzReport> list=page.getList();
model.addAttribute("datas", list);
String json=ConfigServiceUtil.getReport(url.toString(), bean);
model.addAttribute("datas", getList(json));
} catch (Exception e) {
// TODO: handle exception
e.printStackTrace();
}
return "/report/pz";
}
public List<NtcPzReport> getList(String json){
JSONObject obj=JSONObject.fromObject(json);
if(obj.containsKey("data")) {
JSONObject data= obj.getJSONObject("data");
if(data.containsKey("list")) {
Object list=data.get("list");
JSONArray array=JSONArray.fromObject(list);
List<NtcPzReport> result=JSONArray.toList(array, new NtcPzReport(),new JsonConfig());
return result;
}
}
return new ArrayList<NtcPzReport>();
}
}

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

@@ -1,6 +1,7 @@
package com.nis.web.controller.report;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -14,17 +15,18 @@ import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.log.SearchReport;
import com.nis.domain.report.NtcServiceReport;
import com.nis.domain.report.ReportResult;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.web.controller.BaseController;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import net.sf.json.JsonConfig;
@Controller
@RequestMapping("${adminPath}/report")
public class NtcServiceReportController extends BaseController {
@@ -58,15 +60,10 @@ public class NtcServiceReportController extends BaseController {
// TODO Auto-generated catch block
e1.printStackTrace();
}
ReportResult<NtcServiceReport> result=new ReportResult<>();
StringBuffer url=new StringBuffer(Constants.LOG_BASE_URL+Constants.NTC_SERVICE_REPORT);
try {
Gson gson=Constants.gsonbuilder.create();
String json=result.getReport(url.toString(), bean);
result = gson.fromJson(json, new TypeToken<ReportResult<NtcServiceReport>>() {
}.getType());
Page<NtcServiceReport> page=result.getData();
List<NtcServiceReport> data=page.getList();
String json=ConfigServiceUtil.getReport(url.toString(), bean);
List<NtcServiceReport> data=getList(json);
for(NtcServiceReport report:data){
if(datas.containsKey(report.getService().toString())){
datas.put(report.getService().toString(), datas.get(report.getService().toString())+report.getSum().longValue());
@@ -83,4 +80,18 @@ public class NtcServiceReportController extends BaseController {
// }
return datas;
}
public List<NtcServiceReport> getList(String json){
JSONObject obj=JSONObject.fromObject(json);
if(obj.containsKey("data")) {
JSONObject data= obj.getJSONObject("data");
if(data.containsKey("list")) {
Object list=data.get("list");
JSONArray array=JSONArray.fromObject(list);
List<NtcServiceReport> result=JSONArray.toList(array, new NtcServiceReport(),new JsonConfig());
return result;
}
}
return new ArrayList<NtcServiceReport>();
}
}

39
src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java
View File

@@ -1,7 +1,6 @@
package com.nis.web.controller.report;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -16,16 +15,18 @@ import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.log.SearchReport;
import com.nis.domain.report.NtcSrcipDomesticReport;
import com.nis.domain.report.ReportResult;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.web.controller.BaseController;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import net.sf.json.JsonConfig;
@Controller
@RequestMapping("${adminPath}/report")
public class NtcSrcipDomesticReportController extends BaseController {
@@ -96,32 +97,28 @@ public class NtcSrcipDomesticReportController extends BaseController {
// e.printStackTrace();
// }
try {
ReportResult<NtcSrcipDomesticReport> result=new ReportResult<>();
StringBuffer url=new StringBuffer(Constants.LOG_BASE_URL+Constants.NTC_NTC_SRCIP_REPORT);
Gson gson=Constants.gsonbuilder.create();
String json=result.getReport(url.toString(), bean);
result = gson.fromJson(json, new TypeToken<ReportResult<NtcSrcipDomesticReport>>() {
}.getType());
Page<NtcSrcipDomesticReport> page=result.getData();
List<NtcSrcipDomesticReport> list=page.getList();
String json=ConfigServiceUtil.getReport(url.toString(), bean);
List<NtcSrcipDomesticReport> list=getList(json);
HashMap<String,Long> trimData=new HashMap<>();//数据累加去重
SimpleDateFormat sdf=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT);
// SimpleDateFormat sdf=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT);
for(NtcSrcipDomesticReport report:list){
String trimStr="";
if(bean.getReportType()==Constants.REPORT_TYPE_HOUR){
trimStr=report.getSrcProvince().trim()+Constants.REPORT_TRIM_CONNECTOR+
report.getSrcCity().trim()+Constants.REPORT_TRIM_CONNECTOR+
sdf.format(report.getReportTime()).substring(0,13);
report.getReportTime().substring(0,13);
}else if(bean.getReportType()==Constants.REPORT_TYPE_DAY){
trimStr=report.getSrcProvince().trim()+Constants.REPORT_TRIM_CONNECTOR+
report.getSrcCity().trim()+Constants.REPORT_TRIM_CONNECTOR+
sdf.format(report.getReportTime()).substring(0,10);
report.getReportTime().substring(0,10);
}else if(bean.getReportType()==Constants.REPORT_TYPE_MONTH){
trimStr=report.getSrcProvince().trim()+Constants.REPORT_TRIM_CONNECTOR+
report.getSrcCity().trim()+Constants.REPORT_TRIM_CONNECTOR+
sdf.format(report.getReportTime()).substring(0,7);
report.getReportTime().substring(0,7);
}
if(trimData.containsKey(trimStr)){
trimData.put(trimStr, trimData.get(trimStr)+report.getSum().longValue());
@@ -171,4 +168,18 @@ public class NtcSrcipDomesticReportController extends BaseController {
// model.addAttribute("datas", showData);
return "/report/srcIp";
}
public List<NtcSrcipDomesticReport> getList(String json){
JSONObject obj=JSONObject.fromObject(json);
if(obj.containsKey("data")) {
JSONObject data= obj.getJSONObject("data");
if(data.containsKey("list")) {
Object list=data.get("list");
JSONArray array=JSONArray.fromObject(list);
List<NtcSrcipDomesticReport> result=JSONArray.toList(array, new NtcSrcipDomesticReport(),new JsonConfig());
return result;
}
}
return new ArrayList<NtcSrcipDomesticReport>();
}
}

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

@@ -1,7 +1,6 @@
package com.nis.web.controller.report;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -15,18 +14,19 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.basics.ServiceDictInfo;
import com.nis.domain.log.SearchReport;
import com.nis.domain.report.NtcTagReport;
import com.nis.domain.report.ReportResult;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.web.controller.BaseController;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import net.sf.json.JsonConfig;
@Controller
@RequestMapping("${adminPath}/report")
public class NtcTagReportController extends BaseController {
@@ -65,29 +65,24 @@ public class NtcTagReportController extends BaseController {
List<String> titles=this.getDateTitiles(bean);
model.addAttribute("titles", titles);
try {
ReportResult<NtcTagReport> result=new ReportResult<>();
StringBuffer url=new StringBuffer(Constants.LOG_BASE_URL+Constants.NTC_TAG_REPORT);
Gson gson=Constants.gsonbuilder.create();
String json=result.getReport(url.toString(), bean);
result = gson.fromJson(json, new TypeToken<ReportResult<NtcTagReport>>() {
}.getType());
Page<NtcTagReport> page=result.getData();
List<NtcTagReport> list=page.getList();
String json=ConfigServiceUtil.getReport(url.toString(), bean);
List<NtcTagReport> list=getList(json);
HashMap<String,Long> trimData=new HashMap<>();//数据累加去重
SimpleDateFormat sdf=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT);
//SimpleDateFormat sdf=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT);
for(NtcTagReport report:list){
String trimStr="";
if(bean.getReportType()==Constants.REPORT_TYPE_HOUR){
trimStr=report.getTag().intValue()+Constants.REPORT_TRIM_CONNECTOR+
sdf.format(report.getReportTime()).substring(0,13);
report.getReportTime().substring(0,13);
}else if(bean.getReportType()==Constants.REPORT_TYPE_DAY){
trimStr=report.getTag().intValue()+Constants.REPORT_TRIM_CONNECTOR+
sdf.format(report.getReportTime()).substring(0,10);
report.getReportTime().substring(0,10);
}else if(bean.getReportType()==Constants.REPORT_TYPE_MONTH){
trimStr=report.getTag().intValue()+Constants.REPORT_TRIM_CONNECTOR+
sdf.format(report.getReportTime()).substring(0,7);
report.getReportTime().substring(0,7);
}
if(trimData.containsKey(trimStr)){
trimData.put(trimStr, trimData.get(trimStr)+report.getSum().longValue());
@@ -133,4 +128,18 @@ public class NtcTagReportController extends BaseController {
// model.addAttribute("datas", showData);
return "/report/label";
}
public List<NtcTagReport> getList(String json){
JSONObject obj=JSONObject.fromObject(json);
if(obj.containsKey("data")) {
JSONObject data= obj.getJSONObject("data");
if(data.containsKey("list")) {
Object list=data.get("list");
JSONArray array=JSONArray.fromObject(list);
List<NtcTagReport> result=JSONArray.toList(array, new NtcTagReport(),new JsonConfig());
return result;
}
}
return new ArrayList<NtcTagReport>();
}
}

39
src/main/java/com/nis/web/controller/report/NtcXzReportController.java
View File

@@ -1,7 +1,6 @@
package com.nis.web.controller.report;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -16,17 +15,19 @@ import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.basics.ServiceDictInfo;
import com.nis.domain.log.SearchReport;
import com.nis.domain.report.NtcAttrTypeReport;
import com.nis.domain.report.ReportResult;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.web.controller.BaseController;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import net.sf.json.JsonConfig;
@Controller
@RequestMapping("${adminPath}/report")
public class NtcXzReportController extends BaseController {
@@ -67,29 +68,25 @@ public class NtcXzReportController extends BaseController {
List<String> titles=this.getDateTitiles(bean);
model.addAttribute("titles", titles);
try {
ReportResult<NtcAttrTypeReport> result=new ReportResult<>();
StringBuffer url=new StringBuffer(Constants.LOG_BASE_URL+Constants.NTC_ATTRTYPE_REPORT);
Gson gson=Constants.gsonbuilder.create();
String json=result.getReport(url.toString(), bean);
result = gson.fromJson(json, new TypeToken<ReportResult<NtcAttrTypeReport>>() {
}.getType());
Page<NtcAttrTypeReport> page=result.getData();
List<NtcAttrTypeReport> list=page.getList();
String json=ConfigServiceUtil.getReport(url.toString(), bean);
List<NtcAttrTypeReport> list=getList(json);
HashMap<String,Long> trimData=new HashMap<>();//数据累加去重
SimpleDateFormat sdf=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT);
// SimpleDateFormat sdf=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT);
for(NtcAttrTypeReport report:list){
String trimStr="";
if(bean.getReportType()==Constants.REPORT_TYPE_HOUR){
trimStr=report.getAttrType().intValue()+Constants.REPORT_TRIM_CONNECTOR+
sdf.format(report.getReportTime()).substring(0,13);
report.getReportTime().substring(0,13);
}else if(bean.getReportType()==Constants.REPORT_TYPE_DAY){
trimStr=report.getAttrType().intValue()+Constants.REPORT_TRIM_CONNECTOR+
sdf.format(report.getReportTime()).substring(0,10);
report.getReportTime().substring(0,10);
}else if(bean.getReportType()==Constants.REPORT_TYPE_MONTH){
trimStr=report.getAttrType().intValue()+Constants.REPORT_TRIM_CONNECTOR+
sdf.format(report.getReportTime()).substring(0,7);
report.getReportTime().substring(0,7);
}
if(trimData.containsKey(trimStr)){
trimData.put(trimStr, trimData.get(trimStr)+report.getSum().longValue());
@@ -135,4 +132,18 @@ public class NtcXzReportController extends BaseController {
// model.addAttribute("datas", showData);
return "/report/attrType";
}
public List<NtcAttrTypeReport> getList(String json){
JSONObject obj=JSONObject.fromObject(json);
if(obj.containsKey("data")) {
JSONObject data= obj.getJSONObject("data");
if(data.containsKey("list")) {
Object list=data.get("list");
JSONArray array=JSONArray.fromObject(list);
List<NtcAttrTypeReport> result=JSONArray.toList(array, new NtcAttrTypeReport(),new JsonConfig());
return result;
}
}
return new ArrayList<NtcAttrTypeReport>();
}
}