99import org .slf4j .LoggerFactory ;
1010
1111import com .google .gson .JsonObject ;
12- import com .google .gson .JsonParser ;
13- import com .google .gson .reflect .TypeToken ;
1412
1513import me .chanjar .weixin .common .exception .WxErrorException ;
1614import me .chanjar .weixin .mp .api .WxMpDataCubeService ;
2119import me .chanjar .weixin .mp .bean .datacube .WxDataCubeMsgResult ;
2220import me .chanjar .weixin .mp .bean .datacube .WxDataCubeUserCumulate ;
2321import 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 ("\n url:{}\n params:{}\n response:{}" ,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 ("\n url:{}\n params:{}\n response:{}" ,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 ("\n url:{}\n params:{}\n response:{}" ,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 ("\n url:{}\n params:{}\n response:{}" ,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 ("\n url:{}\n params:{}\n response:{}" ,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 ("\n url:{}\n params:{}\n response:{}" ,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 ("\n url:{}\n params:{}\n response:{}" ,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 ("\n url:{}\n params:{}\n response:{}" ,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 ("\n url:{}\n params:{}\n response:{}" ,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 ("\n url:{}\n params:{}\n response:{}" ,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 ("\n url:{}\n params:{}\n response:{}" ,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 ("\n url:{}\n params:{}\n response:{}" ,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 ("\n url:{}\n params:{}\n response:{}" ,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 ("\n url:{}\n params:{}\n response:{}" ,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 ("\n url:{}\n params:{}\n response:{}" ,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 ("\n url:{}\n params:{}\n response:{}" ,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 ("\n url:{}\n params:{}\n response:{}" ,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}
0 commit comments