Skip to content

Commit 2cabb00

Browse files
author
黄悦麒
authored
Merge pull request #3 from Hyq0719/feature/hyq/2022/02/vivo
Feature/hyq/2022/02/vivo
2 parents 508fe2c + ed393ef commit 2cabb00

File tree

97 files changed

+12163
-15
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+12163
-15
lines changed

‎code-generators/vivo-code-generator/src/main/java/com/hyq0719/mktapi/generator/vivo/handler/CodeGenerator.java‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public static void parseBaseEntity(Map<String, List<BaseEntity>> map, BaseEntity
141141
baseEntity.setType(TYPE_MAP.get(type));
142142
return;
143143
}
144-
if (OBJECT_TYPE_SET.contains(type)) {
144+
if (OBJECT_TYPE_SET.contains(type) || type.endsWith("Dto")) {
145145
String className = GeneratorUtils.toUpperCaseFirstOne(baseEntity.getCamelProperty() + "Struct");
146146

147147
SingleFileEntity sfe = new SingleFileEntity();
@@ -171,7 +171,7 @@ public static void parseBaseEntity(Map<String, List<BaseEntity>> map, BaseEntity
171171
baseEntity.setType(TYPE_MAP.get(type));
172172
return;
173173
}
174-
if (OBJECT_TYPE_SET.contains(type)) {
174+
if (OBJECT_TYPE_SET.contains(type) || type.endsWith("Dto")) {
175175
String className;
176176
if ("items".equals(camelProperty)) {
177177
className = GeneratorUtils.toUpperCaseFirstOne(classPrefix + "ItemsStruct");
@@ -283,6 +283,7 @@ private static Map<String, String> getTypeMap() {
283283
map.put("double", "Double");
284284
map.put("Double", "Double");
285285
map.put("file", "File");
286+
map.put("Decimal", "BigDecimal");
286287

287288
// 集合
288289
map.put("number[]", "List<Long>");
@@ -318,6 +319,7 @@ private static Set<String> getObjectTypeSet() {
318319
set.add("list");
319320
set.add("List");
320321
set.add("对象列表");
322+
set.add("PageInfo");
321323
return set;
322324
}
323325

@@ -338,22 +340,30 @@ private static void addImportList(BaseEntity entity, SingleFileEntity sfe) {
338340
if (importList == null) {
339341
importList = new ArrayList<>();
340342
}
341-
if (importList.contains("import java.util.List")) {
342-
return;
343+
if (!importList.contains("import java.util.List")) {
344+
importList.add("import java.util.List");
345+
sfe.importList(importList);
343346
}
344-
importList.add("import java.util.List");
345-
sfe.importList(importList);
346347
}
347348
if (entity.getType().contains("file")) {
348349
List<String> importList = sfe.getImportList();
349350
if (importList == null) {
350351
importList = new ArrayList<>();
351352
}
352-
if (importList.contains("import java.io.File")) {
353-
return;
353+
if (!importList.contains("import java.io.File")) {
354+
importList.add("import java.io.File");
355+
sfe.importList(importList);
356+
}
357+
}
358+
if (entity.getType().contains("Decimal")) {
359+
List<String> importList = sfe.getImportList();
360+
if (importList == null) {
361+
importList = new ArrayList<>();
362+
}
363+
if (!importList.contains("import java.math.BigDecimal")) {
364+
importList.add("import java.math.BigDecimal;");
365+
sfe.importList(importList);
354366
}
355-
importList.add("import java.io.File");
356-
sfe.importList(importList);
357367
}
358368
}
359369

‎code-generators/vivo-code-generator/src/main/java/com/hyq0719/mktapi/generator/vivo/handler/EntityTableHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public static CrawlerResult handleRequestAndResponse(WebDriver driver) {
4848
crawlerResult.setClassPrefix(entityPrefix);
4949

5050
List<WebElement> tableElements = driver.findElements(By.tagName("table"));
51-
if (tableElements.size() < 2) {
51+
if (tableElements.size() < Math.max(requestTableLoc, responseTableLoc)) {
5252
throw new RuntimeException("Crawler <table> size error");
5353
}
5454
if (requestTableLoc != -1) {

‎marketing-api-vivo/src/main/java/com/hyq0719/mktapi/vivo/api/AccountServiceApi.java‎

Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
package com.hyq0719.mktapi.vivo.api;
2+
3+
import com.hyq0719.mktapi.common.ApiClient;
4+
import com.hyq0719.mktapi.common.RetryStrategy;
5+
import com.hyq0719.mktapi.common.annotation.ApiRequestMapping;
6+
import com.hyq0719.mktapi.common.constant.RequestConstants;
7+
import com.hyq0719.mktapi.common.executor.parameter.Pair;
8+
import com.hyq0719.mktapi.vivo.VivoApiRequest;
9+
import com.hyq0719.mktapi.vivo.bean.acoountService.*;
10+
import com.hyq0719.mktapi.vivo.bean.common.VivoResponse;
11+
12+
import java.util.List;
13+
14+
/**
15+
* @author hyq0719
16+
* @description vivo商业开放平台——账号服务
17+
*/
18+
public class AccountServiceApi extends AbstractVivoApi {
19+
private volatile AccountFetch accountFetch;
20+
private volatile AccountFetchAccount accountFetchAccount;
21+
private volatile AccountAdvertiserQuery accountAdvertiserQuery;
22+
private volatile AccountBalanceQuery accountBalanceQuery;
23+
private volatile FinanceUpdateDailyBudget financeUpdateDailyBudget;
24+
private volatile FinanceFundsQueryFounds financeFundsQueryFounds;
25+
private volatile FinanceTransferQueryTransfers financeTransferQueryTransfers;
26+
27+
public AccountServiceApi(ApiClient apiClient, RetryStrategy retryStrategy) {
28+
super(apiClient, retryStrategy);
29+
}
30+
31+
public AccountFetch accountFetch() {
32+
if (accountFetch == null) {
33+
synchronized (AccountFetch.class) {
34+
if (accountFetch == null) {
35+
accountFetch = (AccountFetch) init(AccountFetch.class);
36+
}
37+
}
38+
}
39+
return accountFetch;
40+
}
41+
42+
public AccountFetchAccount accountFetchAccount() {
43+
if (accountFetchAccount == null) {
44+
synchronized (AccountFetchAccount.class) {
45+
if (accountFetchAccount == null) {
46+
accountFetchAccount = (AccountFetchAccount) init(AccountFetchAccount.class);
47+
}
48+
}
49+
}
50+
return accountFetchAccount;
51+
}
52+
53+
public AccountAdvertiserQuery accountAdvertiserQuery() {
54+
if (accountAdvertiserQuery == null) {
55+
synchronized (AccountAdvertiserQuery.class) {
56+
if (accountAdvertiserQuery == null) {
57+
accountAdvertiserQuery = (AccountAdvertiserQuery) init(AccountAdvertiserQuery.class);
58+
}
59+
}
60+
}
61+
return accountAdvertiserQuery;
62+
}
63+
64+
public AccountBalanceQuery accountBalanceQuery() {
65+
if (accountBalanceQuery == null) {
66+
synchronized (AccountBalanceQuery.class) {
67+
if (accountBalanceQuery == null) {
68+
accountBalanceQuery = (AccountBalanceQuery) init(AccountBalanceQuery.class);
69+
}
70+
}
71+
}
72+
return accountBalanceQuery;
73+
}
74+
75+
public FinanceUpdateDailyBudget financeUpdateDailyBudget() {
76+
if (financeUpdateDailyBudget == null) {
77+
synchronized (FinanceUpdateDailyBudget.class) {
78+
if (financeUpdateDailyBudget == null) {
79+
financeUpdateDailyBudget = (FinanceUpdateDailyBudget) init(FinanceUpdateDailyBudget.class);
80+
}
81+
}
82+
}
83+
return financeUpdateDailyBudget;
84+
}
85+
86+
public FinanceFundsQueryFounds financeFundsQueryFounds() {
87+
if (financeFundsQueryFounds == null) {
88+
synchronized (FinanceFundsQueryFounds.class) {
89+
if (financeFundsQueryFounds == null) {
90+
financeFundsQueryFounds = (FinanceFundsQueryFounds) init(FinanceFundsQueryFounds.class);
91+
}
92+
}
93+
}
94+
return financeFundsQueryFounds;
95+
}
96+
97+
public FinanceTransferQueryTransfers financeTransferQueryTransfers() {
98+
if (financeTransferQueryTransfers == null) {
99+
synchronized (FinanceTransferQueryTransfers.class) {
100+
if (financeTransferQueryTransfers == null) {
101+
financeTransferQueryTransfers = (FinanceTransferQueryTransfers) init(FinanceTransferQueryTransfers.class);
102+
}
103+
}
104+
}
105+
return financeTransferQueryTransfers;
106+
}
107+
108+
@ApiRequestMapping(value = "/account/fetch", method = RequestConstants.GET, usePostBody =
109+
false, contentTypes = {RequestConstants.CONTENT_TYPE_TEXT_PLAIN})
110+
public class AccountFetch extends VivoApiRequest<AccountFetchRequest, VivoResponse<AccountFetchResponseData>> {
111+
@Override
112+
public void setRequestParam(List<Pair> localVarQueryParams, List<Pair> localVarCollectionQueryParams,
113+
AccountFetchRequest request) {
114+
String advertiserId = request.getAdvertiserId();
115+
if (advertiserId != null) {
116+
localVarQueryParams.addAll(parameterToPair(ADVERTISER_ID, advertiserId));
117+
}
118+
}
119+
}
120+
121+
@ApiRequestMapping(value = "/account/fetch/account", method = RequestConstants.GET, usePostBody =
122+
false, contentTypes = {RequestConstants.CONTENT_TYPE_TEXT_PLAIN})
123+
public class AccountFetchAccount extends VivoApiRequest<AccountFetchAccountRequest,
124+
VivoResponse<AccountFetchAccountResponseData>> {
125+
@Override
126+
public void setRequestParam(List<Pair> localVarQueryParams, List<Pair> localVarCollectionQueryParams,
127+
AccountFetchAccountRequest request) {
128+
String advertiserId = request.getAdvertiserId();
129+
if (advertiserId != null) {
130+
localVarQueryParams.addAll(parameterToPair(ADVERTISER_ID, advertiserId));
131+
}
132+
}
133+
}
134+
135+
@ApiRequestMapping(value = "/account/advertiser/query", method = RequestConstants.POST, contentTypes = {
136+
RequestConstants.CONTENT_TYPE_JSON})
137+
public class AccountAdvertiserQuery extends VivoApiRequest<AccountAdvertiserQueryRequest,
138+
VivoResponse<AccountAdvertiserQueryResponseData>> {
139+
@Override
140+
public void setRequestParam(List<Pair> localVarQueryParams, List<Pair> localVarCollectionQueryParams,
141+
AccountAdvertiserQueryRequest request) {
142+
String advertiserId = request.getAdvertiserId();
143+
if (advertiserId != null) {
144+
localVarQueryParams.addAll(parameterToPair(ADVERTISER_ID, advertiserId));
145+
}
146+
}
147+
}
148+
149+
@ApiRequestMapping(value = "/account/balance/query", method = RequestConstants.GET, usePostBody =
150+
false, contentTypes = {RequestConstants.CONTENT_TYPE_TEXT_PLAIN})
151+
public class AccountBalanceQuery extends VivoApiRequest<AccountBalanceQueryRequest,
152+
VivoResponse<AccountBalanceQueryResponseData>> {
153+
@Override
154+
public void setRequestParam(List<Pair> localVarQueryParams, List<Pair> localVarCollectionQueryParams,
155+
AccountBalanceQueryRequest request) {
156+
String advertiserId = request.getAdvertiserId();
157+
if (advertiserId != null) {
158+
localVarQueryParams.addAll(parameterToPair(ADVERTISER_ID, advertiserId));
159+
}
160+
}
161+
}
162+
163+
@ApiRequestMapping(value = "/finance/update/dailyBudget", method = RequestConstants.POST, contentTypes = {
164+
RequestConstants.CONTENT_TYPE_JSON})
165+
public class FinanceUpdateDailyBudget extends VivoApiRequest<FinanceUpdateDailyBudgetRequest,
166+
VivoResponse<String>> {
167+
@Override
168+
public void setRequestParam(List<Pair> localVarQueryParams, List<Pair> localVarCollectionQueryParams,
169+
FinanceUpdateDailyBudgetRequest request) {
170+
String advertiserId = request.getAdvertiserId();
171+
if (advertiserId != null) {
172+
localVarQueryParams.addAll(parameterToPair(ADVERTISER_ID, advertiserId));
173+
}
174+
}
175+
}
176+
177+
@ApiRequestMapping(value = "/finance/transfer/queryTransfers", method = RequestConstants.POST, contentTypes = {
178+
RequestConstants.CONTENT_TYPE_JSON})
179+
public class FinanceFundsQueryFounds extends VivoApiRequest<FinanceFundsQueryFoundsRequest,
180+
VivoResponse<FinanceFundsQueryFoundsResponseData>> {
181+
@Override
182+
public void setRequestParam(List<Pair> localVarQueryParams, List<Pair> localVarCollectionQueryParams,
183+
FinanceFundsQueryFoundsRequest request) {
184+
String advertiserId = request.getAdvertiserId();
185+
if (advertiserId != null) {
186+
localVarQueryParams.addAll(parameterToPair(ADVERTISER_ID, advertiserId));
187+
}
188+
}
189+
}
190+
191+
@ApiRequestMapping(value = "/finance/transfer/queryTransfers", method = RequestConstants.POST, contentTypes = {
192+
RequestConstants.CONTENT_TYPE_JSON})
193+
public class FinanceTransferQueryTransfers extends VivoApiRequest<FinanceTransferQueryTransfersRequest,
194+
VivoResponse<FinanceTransferQueryTransfersResponseData>> {
195+
@Override
196+
public void setRequestParam(List<Pair> localVarQueryParams, List<Pair> localVarCollectionQueryParams,
197+
FinanceTransferQueryTransfersRequest request) {
198+
String advertiserId = request.getAdvertiserId();
199+
if (advertiserId != null) {
200+
localVarQueryParams.addAll(parameterToPair(ADVERTISER_ID, advertiserId));
201+
}
202+
}
203+
}
204+
}

‎marketing-api-vivo/src/main/java/com/hyq0719/mktapi/vivo/api/DataAccessApi.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111

1212
import java.util.List;
1313

14+
/**
15+
* @author hyq0719
16+
* @description vivo商业开放平台——数据接入
17+
*/
1418
public class DataAccessApi extends AbstractVivoApi {
1519
private volatile AdvertiserBehaviorUpload advertiserBehaviorUpload;
1620

‎marketing-api-vivo/src/main/java/com/hyq0719/mktapi/vivo/api/DataQueryApi.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
import java.util.List;
1313

1414
/**
15-
* vivo商业开放平台——数据洞察api
15+
* @author hyq0719
16+
* @description vivo商业开放平台——数据洞察
1617
*/
1718
public class DataQueryApi extends AbstractVivoApi {
1819
private volatile AdstatementSummaryQuery adstatementSummaryQuery;

‎marketing-api-vivo/src/main/java/com/hyq0719/mktapi/vivo/api/DmpTagApi.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
import java.util.List;
1414
import java.util.Map;
1515

16+
/**
17+
* @author hyq0719
18+
* @description vivo商业开放平台——人群管理
19+
*/
1620
public class DmpTagApi extends AbstractVivoApi {
1721
private volatile AdDmpTagUpload adDmpTagUpload;
1822
private volatile AdDmpTagCreate adDmpTagCreate;

0 commit comments

Comments
 (0)