提交 9603d950 authored 作者: renjiancai's avatar renjiancai

--no commit message

上级 07bf31c5
......@@ -40,7 +40,7 @@ public class DataLogController {
return CallBack.success(service.loadTrend(form));
}
@ApiOperation("来源分析")
@PostMapping("/behavior1")
@PostMapping("/source")
public CallBack<JSONObject> getSource(QuerySourceForm form) {
return CallBack.success(service.loadSource(form));
}
......
......@@ -673,15 +673,17 @@ public class DataLogServiceImpl extends BaseServiceImpl<DataLog, String> impleme
BaiduStatisticsBody body = null;
if (StringUtils.isNotBlank(form.getAreaType()) && TABLE.equals(form.getAreaType())) {
body = new BaiduStatisticsBody(
form.getViewType(),
form.getVisitor(),
form.getStart_date(),
form.getEnd_date(),
FuncEnum.TREND_TABLE.getSupportParams(),
FuncEnum.TREND_TABLE.getFuncName(),
FuncEnum.SOURCE_TABLE.getSupportParams(),
FuncEnum.SOURCE_TABLE.getFuncName(),
form.getClientDevice()
);
} else if (StringUtils.isNotBlank(form.getAreaType()) && MAP.equals(form.getAreaType())) {
body = new BaiduStatisticsBody(
form.getViewType(),
form.getVisitor(),
form.getStart_date(),
form.getEnd_date(),
......
......@@ -16,6 +16,8 @@ public class QuerySourceForm {
@ApiModelProperty("结束时间")
private String end_date;
@ApiModelProperty("来源类型")
private String viewType="type";
/*
* @ApiModelProperty("按来源类型:type,来源网站:site") private String viewType;
*/
......
......@@ -33,6 +33,7 @@ public class BaiduStatisticsBody {
private String start_date2;
private String end_date2;
private String clientDevice;
private String viewType;
public BaiduStatisticsBody() {
this.site_id = BaiduConfig.SITEID;
......@@ -102,14 +103,16 @@ public class BaiduStatisticsBody {
* @param end_date2 对比日期
* @param clientDevice 设备
*/
public BaiduStatisticsBody(String visitor, String start_date, String end_date, String[] metrics, String method,String clientDevice) {
this.visitor = visitor;
public BaiduStatisticsBody(String viewType,String visitor, String start_date, String end_date, String[] metrics, String method,String clientDevice) {
this.viewType = viewType;
this.visitor = visitor;
this.site_id = BaiduConfig.SITEID;
this.start_date = start_date;
this.end_date = end_date;
this.metrics = getStringFromArray(metrics);
this.method = method;
this.clientDevice = clientDevice;
}
/**
* 忠诚度RequestBody
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论