Skip to content

Commit a1d5b3d

Browse files
committed
重构统计接口代码
1 parent 82d71ea commit a1d5b3d

7 files changed

Lines changed: 112 additions & 63 deletions

File tree

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpDataCubeServiceImpl.java‎

Lines changed: 17 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import org.slf4j.LoggerFactory;
1010

1111
import com.google.gson.JsonObject;
12-
import com.google.gson.JsonParser;
13-
import com.google.gson.reflect.TypeToken;
1412

1513
import me.chanjar.weixin.common.exception.WxErrorException;
1614
import me.chanjar.weixin.mp.api.WxMpDataCubeService;
@@ -21,7 +19,6 @@
2119
import me.chanjar.weixin.mp.bean.datacube.WxDataCubeMsgResult;
2220
import me.chanjar.weixin.mp.bean.datacube.WxDataCubeUserCumulate;
2321
import me.chanjar.weixin.mp.bean.datacube.WxDataCubeUserSummary;
24-
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
2522

2623
/**
2724
* Created by Binary Wang on 2016/8/23.
@@ -48,9 +45,7 @@ public List<WxDataCubeUserSummary> getUserSummary(Date beginDate, Date endDate)
4845
param.addProperty("end_date", this.dateFormat.format(endDate));
4946
String responseContent = this.wxMpService.post(url, param.toString());
5047
this.log.debug("\nurl:{}\nparams:{}\nresponse:{}",url, param, responseContent);
51-
return WxMpGsonBuilder.INSTANCE.create().fromJson(new JsonParser().parse(responseContent).getAsJsonObject().get("list"),
52-
new TypeToken<List<WxDataCubeUserSummary>>() {
53-
}.getType());
48+
return WxDataCubeUserSummary.fromJson(responseContent);
5449
}
5550

5651
@Override
@@ -61,9 +56,7 @@ public List<WxDataCubeUserCumulate> getUserCumulate(Date beginDate, Date endDate
6156
param.addProperty("end_date", this.dateFormat.format(endDate));
6257
String responseContent = this.wxMpService.post(url, param.toString());
6358
this.log.debug("\nurl:{}\nparams:{}\nresponse:{}",url, param, responseContent);
64-
return WxMpGsonBuilder.INSTANCE.create().fromJson(new JsonParser().parse(responseContent).getAsJsonObject().get("list"),
65-
new TypeToken<List<WxDataCubeUserCumulate>>() {
66-
}.getType());
59+
return WxDataCubeUserCumulate.fromJson(responseContent);
6760
}
6861

6962
@Override
@@ -74,9 +67,7 @@ public List<WxDataCubeArticleResult> getArticleSummary(Date beginDate, Date endD
7467
param.addProperty("end_date", this.dateFormat.format(endDate));
7568
String responseContent = this.wxMpService.post(url, param.toString());
7669
this.log.debug("\nurl:{}\nparams:{}\nresponse:{}",url, param, responseContent);
77-
return WxMpGsonBuilder.INSTANCE.create().fromJson(new JsonParser().parse(responseContent).getAsJsonObject().get("list"),
78-
new TypeToken<List<WxDataCubeArticleResult>>() {
79-
}.getType());
70+
return WxDataCubeArticleResult.fromJson(responseContent);
8071
}
8172

8273
@Override
@@ -87,9 +78,7 @@ public List<WxDataCubeArticleTotal> getArticleTotal(Date beginDate, Date endDate
8778
param.addProperty("end_date", this.dateFormat.format(endDate));
8879
String responseContent = this.wxMpService.post(url, param.toString());
8980
this.log.debug("\nurl:{}\nparams:{}\nresponse:{}",url, param, responseContent);
90-
return WxMpGsonBuilder.INSTANCE.create().fromJson(new JsonParser().parse(responseContent).getAsJsonObject().get("list"),
91-
new TypeToken<List<WxDataCubeArticleTotal>>() {
92-
}.getType());
81+
return WxDataCubeArticleTotal.fromJson(responseContent);
9382
}
9483

9584
@Override
@@ -100,9 +89,7 @@ public List<WxDataCubeArticleResult> getUserRead(Date beginDate, Date endDate) t
10089
param.addProperty("end_date", this.dateFormat.format(endDate));
10190
String responseContent = this.wxMpService.post(url, param.toString());
10291
this.log.debug("\nurl:{}\nparams:{}\nresponse:{}",url, param, responseContent);
103-
return WxMpGsonBuilder.INSTANCE.create().fromJson(new JsonParser().parse(responseContent).getAsJsonObject().get("list"),
104-
new TypeToken<List<WxDataCubeArticleResult>>() {
105-
}.getType());
92+
return WxDataCubeArticleResult.fromJson(responseContent);
10693
}
10794

10895
@Override
@@ -113,9 +100,7 @@ public List<WxDataCubeArticleResult> getUserReadHour(Date beginDate, Date endDat
113100
param.addProperty("end_date", this.dateFormat.format(endDate));
114101
String responseContent = this.wxMpService.post(url, param.toString());
115102
this.log.debug("\nurl:{}\nparams:{}\nresponse:{}",url, param, responseContent);
116-
return WxMpGsonBuilder.INSTANCE.create().fromJson(new JsonParser().parse(responseContent).getAsJsonObject().get("list"),
117-
new TypeToken<List<WxDataCubeArticleResult>>() {
118-
}.getType());
103+
return WxDataCubeArticleResult.fromJson(responseContent);
119104
}
120105

121106
@Override
@@ -126,9 +111,7 @@ public List<WxDataCubeArticleResult> getUserShare(Date beginDate, Date endDate)
126111
param.addProperty("end_date", this.dateFormat.format(endDate));
127112
String responseContent = this.wxMpService.post(url, param.toString());
128113
this.log.debug("\nurl:{}\nparams:{}\nresponse:{}",url, param, responseContent);
129-
return WxMpGsonBuilder.INSTANCE.create().fromJson(new JsonParser().parse(responseContent).getAsJsonObject().get("list"),
130-
new TypeToken<List<WxDataCubeArticleResult>>() {
131-
}.getType());
114+
return WxDataCubeArticleResult.fromJson(responseContent);
132115
}
133116

134117
@Override
@@ -139,9 +122,7 @@ public List<WxDataCubeArticleResult> getUserShareHour(Date beginDate, Date endDa
139122
param.addProperty("end_date", this.dateFormat.format(endDate));
140123
String responseContent = this.wxMpService.post(url, param.toString());
141124
this.log.debug("\nurl:{}\nparams:{}\nresponse:{}",url, param, responseContent);
142-
return WxMpGsonBuilder.INSTANCE.create().fromJson(new JsonParser().parse(responseContent).getAsJsonObject().get("list"),
143-
new TypeToken<List<WxDataCubeArticleResult>>() {
144-
}.getType());
125+
return WxDataCubeArticleResult.fromJson(responseContent);
145126
}
146127

147128
@Override
@@ -153,9 +134,7 @@ public List<WxDataCubeMsgResult> getUpstreamMsg(Date beginDate, Date endDate)
153134
param.addProperty("end_date", this.dateFormat.format(endDate));
154135
String responseContent = this.wxMpService.post(url, param.toString());
155136
this.log.debug("\nurl:{}\nparams:{}\nresponse:{}",url, param, responseContent);
156-
return WxMpGsonBuilder.INSTANCE.create().fromJson(new JsonParser().parse(responseContent).getAsJsonObject().get("list"),
157-
new TypeToken<List<WxDataCubeMsgResult>>() {
158-
}.getType());
137+
return WxDataCubeMsgResult.fromJson(responseContent);
159138
}
160139

161140
@Override
@@ -167,9 +146,7 @@ public List<WxDataCubeMsgResult> getUpstreamMsgHour(Date beginDate,
167146
param.addProperty("end_date", this.dateFormat.format(endDate));
168147
String responseContent = this.wxMpService.post(url, param.toString());
169148
this.log.debug("\nurl:{}\nparams:{}\nresponse:{}",url, param, responseContent);
170-
return WxMpGsonBuilder.INSTANCE.create().fromJson(new JsonParser().parse(responseContent).getAsJsonObject().get("list"),
171-
new TypeToken<List<WxDataCubeMsgResult>>() {
172-
}.getType());
149+
return WxDataCubeMsgResult.fromJson(responseContent);
173150
}
174151

175152
@Override
@@ -181,9 +158,7 @@ public List<WxDataCubeMsgResult> getUpstreamMsgWeek(Date beginDate,
181158
param.addProperty("end_date", this.dateFormat.format(endDate));
182159
String responseContent = this.wxMpService.post(url, param.toString());
183160
this.log.debug("\nurl:{}\nparams:{}\nresponse:{}",url, param, responseContent);
184-
return WxMpGsonBuilder.INSTANCE.create().fromJson(new JsonParser().parse(responseContent).getAsJsonObject().get("list"),
185-
new TypeToken<List<WxDataCubeMsgResult>>() {
186-
}.getType());
161+
return WxDataCubeMsgResult.fromJson(responseContent);
187162
}
188163

189164
@Override
@@ -195,9 +170,7 @@ public List<WxDataCubeMsgResult> getUpstreamMsgMonth(Date beginDate,
195170
param.addProperty("end_date", this.dateFormat.format(endDate));
196171
String responseContent = this.wxMpService.post(url, param.toString());
197172
this.log.debug("\nurl:{}\nparams:{}\nresponse:{}",url, param, responseContent);
198-
return WxMpGsonBuilder.INSTANCE.create().fromJson(new JsonParser().parse(responseContent).getAsJsonObject().get("list"),
199-
new TypeToken<List<WxDataCubeMsgResult>>() {
200-
}.getType());
173+
return WxDataCubeMsgResult.fromJson(responseContent);
201174
}
202175

203176
@Override
@@ -209,9 +182,7 @@ public List<WxDataCubeMsgResult> getUpstreamMsgDist(Date beginDate,
209182
param.addProperty("end_date", this.dateFormat.format(endDate));
210183
String responseContent = this.wxMpService.post(url, param.toString());
211184
this.log.debug("\nurl:{}\nparams:{}\nresponse:{}",url, param, responseContent);
212-
return WxMpGsonBuilder.INSTANCE.create().fromJson(new JsonParser().parse(responseContent).getAsJsonObject().get("list"),
213-
new TypeToken<List<WxDataCubeMsgResult>>() {
214-
}.getType());
185+
return WxDataCubeMsgResult.fromJson(responseContent);
215186
}
216187

217188
@Override
@@ -223,9 +194,7 @@ public List<WxDataCubeMsgResult> getUpstreamMsgDistWeek(Date beginDate,
223194
param.addProperty("end_date", this.dateFormat.format(endDate));
224195
String responseContent = this.wxMpService.post(url, param.toString());
225196
this.log.debug("\nurl:{}\nparams:{}\nresponse:{}",url, param, responseContent);
226-
return WxMpGsonBuilder.INSTANCE.create().fromJson(new JsonParser().parse(responseContent).getAsJsonObject().get("list"),
227-
new TypeToken<List<WxDataCubeMsgResult>>() {
228-
}.getType());
197+
return WxDataCubeMsgResult.fromJson(responseContent);
229198
}
230199

231200
@Override
@@ -237,9 +206,7 @@ public List<WxDataCubeMsgResult> getUpstreamMsgDistMonth(Date beginDate,
237206
param.addProperty("end_date", this.dateFormat.format(endDate));
238207
String responseContent = this.wxMpService.post(url, param.toString());
239208
this.log.debug("\nurl:{}\nparams:{}\nresponse:{}",url, param, responseContent);
240-
return WxMpGsonBuilder.INSTANCE.create().fromJson(new JsonParser().parse(responseContent).getAsJsonObject().get("list"),
241-
new TypeToken<List<WxDataCubeMsgResult>>() {
242-
}.getType());
209+
return WxDataCubeMsgResult.fromJson(responseContent);
243210
}
244211

245212
@Override
@@ -251,9 +218,7 @@ public List<WxDataCubeInterfaceResult> getInterfaceSummary(Date beginDate,
251218
param.addProperty("end_date", this.dateFormat.format(endDate));
252219
String responseContent = this.wxMpService.post(url, param.toString());
253220
this.log.debug("\nurl:{}\nparams:{}\nresponse:{}",url, param, responseContent);
254-
return WxMpGsonBuilder.INSTANCE.create().fromJson(new JsonParser().parse(responseContent).getAsJsonObject().get("list"),
255-
new TypeToken<List<WxDataCubeInterfaceResult>>() {
256-
}.getType());
221+
return WxDataCubeInterfaceResult.fromJson(responseContent);
257222
}
258223

259224
@Override
@@ -265,8 +230,6 @@ public List<WxDataCubeInterfaceResult> getInterfaceSummaryHour(Date beginDate,
265230
param.addProperty("end_date", this.dateFormat.format(endDate));
266231
String responseContent = this.wxMpService.post(url, param.toString());
267232
this.log.debug("\nurl:{}\nparams:{}\nresponse:{}",url, param, responseContent);
268-
return WxMpGsonBuilder.INSTANCE.create().fromJson(new JsonParser().parse(responseContent).getAsJsonObject().get("list"),
269-
new TypeToken<List<WxDataCubeInterfaceResult>>() {
270-
}.getType());
233+
return WxDataCubeInterfaceResult.fromJson(responseContent);
271234
}
272235
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleResult.java‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
package me.chanjar.weixin.mp.bean.datacube;
22

3+
import java.util.List;
4+
5+
import com.google.gson.JsonParser;
36
import com.google.gson.annotations.SerializedName;
7+
import com.google.gson.reflect.TypeToken;
8+
9+
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
410

511
/**
612
* 图文分析数据接口返回结果对象
@@ -9,6 +15,8 @@
915
*/
1016
public class WxDataCubeArticleResult extends WxDataCubeBaseResult {
1117

18+
private static final JsonParser JSON_PARSER = new JsonParser();
19+
1220
/**
1321
* ref_hour
1422
* 数据的小时,包括从000到2300,分别代表的是[000,100)到[2300,2400),即每日的第1小时和最后1小时
@@ -203,5 +211,11 @@ public Integer getUserSource() {
203211
public void setUserSource(Integer userSource) {
204212
this.userSource = userSource;
205213
}
206-
214+
215+
public static List<WxDataCubeArticleResult> fromJson(String json) {
216+
return WxMpGsonBuilder.INSTANCE.create().fromJson(
217+
JSON_PARSER.parse(json).getAsJsonObject().get("list"),
218+
new TypeToken<List<WxDataCubeArticleResult>>() {
219+
}.getType());
220+
}
207221
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotal.java‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
package me.chanjar.weixin.mp.bean.datacube;
22

3+
import java.util.List;
4+
5+
import com.google.gson.JsonParser;
36
import com.google.gson.annotations.SerializedName;
7+
import com.google.gson.reflect.TypeToken;
48

5-
import java.util.List;
9+
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
610

711
/**
812
* 图文分析数据接口返回结果对象
@@ -11,6 +15,8 @@
1115
*/
1216
public class WxDataCubeArticleTotal extends WxDataCubeBaseResult {
1317

18+
private static final JsonParser JSON_PARSER = new JsonParser();
19+
1420
/**
1521
* msgid
1622
* 请注意:这里的msgid实际上是由msgid(图文消息id,这也就是群发接口调用后返回的msg_data_id)和index(消息次序索引)组成, 例如12003_3, 其中12003是msgid,即一次群发的消息的id; 3为index,假设该次群发的图文消息共5个文章(因为可能为多图文),3表示5个中的第3个
@@ -55,5 +61,11 @@ public List<WxDataCubeArticleTotalDetail> getDetails() {
5561
public void setDetails(List<WxDataCubeArticleTotalDetail> details) {
5662
this.details = details;
5763
}
58-
64+
65+
public static List<WxDataCubeArticleTotal> fromJson(String json) {
66+
return WxMpGsonBuilder.INSTANCE.create().fromJson(
67+
JSON_PARSER.parse(json).getAsJsonObject().get("list"),
68+
new TypeToken<List<WxDataCubeArticleTotal>>() {
69+
}.getType());
70+
}
5971
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeInterfaceResult.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
package me.chanjar.weixin.mp.bean.datacube;
22

3+
import java.util.List;
4+
5+
import com.google.gson.JsonParser;
36
import com.google.gson.annotations.SerializedName;
7+
import com.google.gson.reflect.TypeToken;
8+
9+
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
410

511
/**
612
* 接口分析数据接口返回结果对象
@@ -9,6 +15,8 @@
915
*/
1016
public class WxDataCubeInterfaceResult extends WxDataCubeBaseResult {
1117

18+
private static final JsonParser JSON_PARSER = new JsonParser();
19+
1220
/**
1321
* ref_hour
1422
* 数据的小时,包括从000到2300,分别代表的是[000,100)到[2300,2400),即每日的第1小时和最后1小时
@@ -83,5 +91,12 @@ public Integer getMaxTimeCost() {
8391
public void setMaxTimeCost(Integer maxTimeCost) {
8492
this.maxTimeCost = maxTimeCost;
8593
}
94+
95+
public static List<WxDataCubeInterfaceResult> fromJson(String json) {
96+
return WxMpGsonBuilder.INSTANCE.create().fromJson(
97+
JSON_PARSER.parse(json).getAsJsonObject().get("list"),
98+
new TypeToken<List<WxDataCubeInterfaceResult>>() {
99+
}.getType());
100+
}
86101

87102
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeMsgResult.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
package me.chanjar.weixin.mp.bean.datacube;
22

3+
import java.util.List;
4+
5+
import com.google.gson.JsonParser;
36
import com.google.gson.annotations.SerializedName;
7+
import com.google.gson.reflect.TypeToken;
8+
9+
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
410

511
/**
612
* 消息分析数据接口返回结果对象
@@ -9,6 +15,8 @@
915
*/
1016
public class WxDataCubeMsgResult extends WxDataCubeBaseResult {
1117

18+
private static final JsonParser JSON_PARSER = new JsonParser();
19+
1220
/**
1321
* ref_hour
1422
* 数据的小时,包括从000到2300,分别代表的是[000,100)到[2300,2400),即每日的第1小时和最后1小时
@@ -114,4 +122,11 @@ public void setOriPageReadUser(Integer oriPageReadUser) {
114122
this.oriPageReadUser = oriPageReadUser;
115123
}
116124

125+
public static List<WxDataCubeMsgResult> fromJson(String json) {
126+
return WxMpGsonBuilder.INSTANCE.create().fromJson(
127+
JSON_PARSER.parse(json).getAsJsonObject().get("list"),
128+
new TypeToken<List<WxDataCubeMsgResult>>() {
129+
}.getType());
130+
}
131+
117132
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeUserCumulate.java‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,27 @@
11
package me.chanjar.weixin.mp.bean.datacube;
22

3+
import java.io.Serializable;
4+
import java.util.Date;
5+
import java.util.List;
6+
37
import org.apache.commons.lang3.builder.ToStringBuilder;
48
import org.apache.commons.lang3.builder.ToStringStyle;
59

6-
import java.io.Serializable;
7-
import java.util.Date;
10+
import com.google.gson.JsonParser;
11+
import com.google.gson.reflect.TypeToken;
12+
13+
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
814

915
/**
1016
* <pre>
1117
* 累计用户数据接口的返回JSON数据包
12-
* http://mp.weixin.qq.com/wiki/3/ecfed6e1a0a03b5f35e5efac98e864b7.html
18+
* 详情查看文档:<a href="http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141082&token=&lang=zh_CN">用户分析数据接口</a>
1319
* </pre>
1420
*/
1521
public class WxDataCubeUserCumulate implements Serializable {
1622

23+
private static final JsonParser JSON_PARSER = new JsonParser();
24+
1725
private static final long serialVersionUID = -3570981300225093657L;
1826

1927
private Date refDate;
@@ -40,4 +48,11 @@ public void setCumulateUser(Integer cumulateUser) {
4048
public String toString() {
4149
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
4250
}
51+
52+
public static List<WxDataCubeUserCumulate> fromJson(String json) {
53+
return WxMpGsonBuilder.INSTANCE.create().fromJson(
54+
JSON_PARSER.parse(json).getAsJsonObject().get("list"),
55+
new TypeToken<List<WxDataCubeUserCumulate>>() {
56+
}.getType());
57+
}
4358
}

0 commit comments

Comments
 (0)