Skip to content

Commit eab885f

Browse files
author
黄悦麒
authored
Merge pull request #4 from Hyq0719/feature/hyq/2022/01/init
Feature/hyq/2022/01/init
2 parents 2cabb00 + ae2991f commit eab885f

File tree

43 files changed

+535
-527
lines changed

Some content is hidden

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

43 files changed

+535
-527
lines changed

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
public class CodeGenerator {
2121
public static final GeneratorConfigEntity GENERATOR_ENTITY = getConfig();
2222
public static final Map<String, String> TYPE_MAP = getTypeMap();
23-
public static final Set<String> OJBECT_TYPE_SET = getObjectTypeSet();
23+
public static final Set<String> OBJECT_TYPE_SET = getObjectTypeSet();
2424
public static final Set<String> LIST_TYPE_SET = getListTypeSet();
2525

2626
/**
@@ -144,7 +144,7 @@ public static void parseBaseEntity(Map<String, List<BaseEntity>> map, BaseEntity
144144
baseEntity.setType(TYPE_MAP.get(type));
145145
return;
146146
}
147-
if (OJBECT_TYPE_SET.contains(type)) {
147+
if (OBJECT_TYPE_SET.contains(type)) {
148148
String className = GeneratorUtils.toUpperCaseFirstOne(baseEntity.getCamelProperty() + "Struct");
149149

150150
baseEntity.setType(className);
@@ -170,7 +170,7 @@ public static void parseBaseEntity(Map<String, List<BaseEntity>> map, BaseEntity
170170
baseEntity.setType(TYPE_MAP.get(type));
171171
return;
172172
}
173-
if (OJBECT_TYPE_SET.contains(type)) {
173+
if (OBJECT_TYPE_SET.contains(type)) {
174174
String camelProperty = baseEntity.getCamelProperty();
175175
String className;
176176
if ("list".equals(camelProperty)) {
@@ -305,22 +305,25 @@ private static Set<String> getObjectTypeSet() {
305305
set.add("json");
306306
set.add("json[]");
307307
set.add("list");
308+
set.add("List");
308309
set.add("array");
310+
set.add("Array");
309311
return set;
310312
}
311313

312314
private static Set<String> getListTypeSet() {
313315
Set<String> set = new HashSet<>();
314316
set.add("[]");
315317
set.add("list");
318+
set.add("List");
316319
set.add("array");
320+
set.add("Array");
317321
return set;
318322
}
319323

320324
private static void setArrayBaseEntity(String type, BaseEntity baseEntity, String className) {
321325
if (isListType(type)) {
322326
baseEntity.setType("List<" + className + ">");
323-
return;
324327
}
325328
}
326329

‎marketing-api-oceanengine/src/main/java/com/hyq0719/mktapi/oceanengine/api/AdServingApi.java‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -215,19 +215,18 @@ public CreativeCustomCreativeUpdate creativeCustomCreativeUpdate() {
215215
}
216216

217217
@ApiRequestMapping(value = "/campaign/get", method = RequestConstants.GET, usePostBody = false,
218-
contentTypes = {
219-
RequestConstants.CONTENT_TYPE_TEXT_PLAIN})
220-
public class CampaignGet extends OceanApiRequest<ConfigRequest<CampaignsGetFilteringStruct>,
221-
OceanResponse<PageResponseData<CampaignsGetListStruct>>> {
218+
contentTypes = {RequestConstants.CONTENT_TYPE_TEXT_PLAIN})
219+
public class CampaignGet extends OceanApiRequest<ConfigRequest<CampaignGetFilteringStruct>,
220+
OceanResponse<PageResponseData<CampaignGetListStruct>>> {
222221

223222
@Override
224223
public void setRequestParam(List<Pair> localVarQueryParams, List<Pair> localVarCollectionQueryParams,
225-
ConfigRequest<CampaignsGetFilteringStruct> configRequest) {
224+
ConfigRequest<CampaignGetFilteringStruct> configRequest) {
226225
Long advertiserId = configRequest.getAdvertiserId();
227226
if (advertiserId != null) {
228227
localVarQueryParams.addAll(parameterToPair(ADVERTISER_ID, advertiserId));
229228
}
230-
CampaignsGetFilteringStruct filtering = configRequest.getFiltering();
229+
CampaignGetFilteringStruct filtering = configRequest.getFiltering();
231230
if (filtering != null) {
232231
localVarQueryParams.addAll(parameterToPair(FILTERING, JsonUtil.toJsonString(filtering)));
233232
}
@@ -248,30 +247,30 @@ public void setRequestParam(List<Pair> localVarQueryParams, List<Pair> localVarC
248247
}
249248

250249
@ApiRequestMapping(value = "/campaign/create/", method = RequestConstants.POST)
251-
public class CampaignCreate extends OceanApiRequest<CampaignsAddRequest, OceanResponse<CampaignsAddResponseData>> {
250+
public class CampaignCreate extends OceanApiRequest<CampaignCreateRequest, OceanResponse<CampaignCreateResponseData>> {
252251
}
253252

254253
@ApiRequestMapping(value = "/campaign/update/", method = RequestConstants.POST)
255-
public class CampaignUpdate extends OceanApiRequest<CampaignsUpdateRequest, OceanResponse<CampaignsUpdateResponseData>> {
254+
public class CampaignUpdate extends OceanApiRequest<CampaignUpdateRequest, OceanResponse<CampaignUpdateResponseData>> {
256255
}
257256

258257
@ApiRequestMapping(value = "/campaign/update/status/ ", method = RequestConstants.POST)
259258
public class CampaignUpdateStatus
260-
extends OceanApiRequest<CampaignsUpdateStatusRequest, OceanResponse<CampaignsUpdateStatusResponseData>> {
259+
extends OceanApiRequest<CampaignUpdateStatusRequest, OceanResponse<CampaignUpdateStatusResponseData>> {
261260
}
262261

263262
@ApiRequestMapping(value = "/ad/get/", method = RequestConstants.GET, usePostBody = false, contentTypes = {
264263
RequestConstants.CONTENT_TYPE_TEXT_PLAIN})
265-
public class AdGet extends OceanApiRequest<ConfigRequest<AdsGetFilteringStruct>,
266-
OceanResponse<PageResponseData<AdsGetResponseListStruct>>> {
264+
public class AdGet extends OceanApiRequest<ConfigRequest<AdGetFilteringStruct>,
265+
OceanResponse<PageResponseData<AdGetResponseListStruct>>> {
267266
@Override
268267
public void setRequestParam(List<Pair> localVarQueryParams, List<Pair> localVarCollectionQueryParams,
269-
ConfigRequest<AdsGetFilteringStruct> configRequest) {
268+
ConfigRequest<AdGetFilteringStruct> configRequest) {
270269
Long advertiserId = configRequest.getAdvertiserId();
271270
if (advertiserId != null) {
272271
localVarQueryParams.addAll(parameterToPair(ADVERTISER_ID, advertiserId));
273272
}
274-
AdsGetFilteringStruct filtering = configRequest.getFiltering();
273+
AdGetFilteringStruct filtering = configRequest.getFiltering();
275274
if (filtering != null) {
276275
localVarQueryParams.addAll(parameterToPair(FILTERING, JsonUtil.toJsonString(filtering)));
277276
}
@@ -292,16 +291,16 @@ public void setRequestParam(List<Pair> localVarQueryParams, List<Pair> localVarC
292291

293292
@ApiRequestMapping(value = "/ad/cost_protect_status/get/", method = RequestConstants.GET, usePostBody =
294293
false, contentTypes = {RequestConstants.CONTENT_TYPE_TEXT_PLAIN})
295-
public class AdCostProtectStatusGet extends OceanApiRequest<AdsGetCostProtectStatusRequest,
296-
OceanResponse<AdsGetCostProtectStatusResponseData>> {
294+
public class AdCostProtectStatusGet extends OceanApiRequest<AdCostProtectStatusGetRequest,
295+
OceanResponse<AdCostProtectStatusGetResponseData>> {
297296
@Override
298297
public void setRequestParam(List<Pair> localVarQueryParams, List<Pair> localVarCollectionQueryParams,
299-
AdsGetCostProtectStatusRequest adsGetCostProtectStatusRequest) {
300-
Long advertiserId = adsGetCostProtectStatusRequest.getAdvertiserId();
298+
AdCostProtectStatusGetRequest request) {
299+
Long advertiserId = request.getAdvertiserId();
301300
if (advertiserId != null) {
302301
localVarQueryParams.addAll(parameterToPair(ADVERTISER_ID, advertiserId));
303302
}
304-
List<Long> adIds = adsGetCostProtectStatusRequest.getAdIds();
303+
List<Long> adIds = request.getAdIds();
305304
if (adIds != null) {
306305
localVarQueryParams.addAll(parameterToPair("ad_ids", JsonUtil.toJsonString(adIds)));
307306
}
@@ -311,56 +310,55 @@ public void setRequestParam(List<Pair> localVarQueryParams, List<Pair> localVarC
311310
@ApiRequestMapping(value = "/ad/reject_reason/", method = RequestConstants.GET, usePostBody = false,
312311
contentTypes = {RequestConstants.CONTENT_TYPE_TEXT_PLAIN})
313312
public class AdRejectReason
314-
extends OceanApiRequest<AdsGetRejectReasonRequest, OceanResponse<AdsGetRejectReasonResponseData>> {
313+
extends OceanApiRequest<AdRejectReasonRequest, OceanResponse<AdRejectReasonResponseData>> {
315314
@Override
316315
public void setRequestParam(List<Pair> localVarQueryParams, List<Pair> localVarCollectionQueryParams,
317-
AdsGetRejectReasonRequest adsGetRejectReasonRequest) {
318-
Long advertiserId = adsGetRejectReasonRequest.getAdvertiserId();
316+
AdRejectReasonRequest request) {
317+
Long advertiserId = request.getAdvertiserId();
319318
if (advertiserId != null) {
320319
localVarQueryParams.addAll(parameterToPair(ADVERTISER_ID, advertiserId));
321320
}
322-
List<Long> adIds = adsGetRejectReasonRequest.getAdIds();
321+
List<Long> adIds = request.getAdIds();
323322
if (adIds != null) {
324323
localVarQueryParams.addAll(parameterToPair("ad_ids", JsonUtil.toJsonString(adIds)));
325324
}
326325
}
327326
}
328327

329328
@ApiRequestMapping(value = "/ad/create/", method = RequestConstants.POST)
330-
public class AdCreate extends OceanApiRequest<AdsAddRequest, OceanResponse<AdsAddResponseData>> {
329+
public class AdCreate extends OceanApiRequest<AdCreateRequest, OceanResponse<AdCreateResponseData>> {
331330
}
332331

333332
@ApiRequestMapping(value = "/ad/update/", method = RequestConstants.POST)
334-
public class AdUpdateApi extends OceanApiRequest<AdsUpdateRequest, OceanResponse<AdsUpdateResponseData>> {
333+
public class AdUpdateApi extends OceanApiRequest<AdUpdateRequest, OceanResponse<AdUpdateResponseData>> {
335334
}
336335

337336
@ApiRequestMapping(value = "/ad/update/status/", method = RequestConstants.POST)
338337
public class AdUpdateStatus
339-
extends OceanApiRequest<AdsUpdateStatusRequest, OceanResponse<AdsUpdateStatusResponseData>> {
338+
extends OceanApiRequest<AdUpdateStatusRequest, OceanResponse<AdUpdateStatusResponseData>> {
340339
}
341340

342341
@ApiRequestMapping(value = "/ad/update/budget/", method = RequestConstants.POST)
343342
public class AdUpdateBudget
344-
extends OceanApiRequest<AdsUpdateBudgetRequest, OceanResponse<AdsUpdateBudgetResponseData>> {
343+
extends OceanApiRequest<AdUpdateBudgetRequest, OceanResponse<AdUpdateBudgetResponseData>> {
345344
}
346345

347346
@ApiRequestMapping(value = "/ad/update/bid/", method = RequestConstants.POST)
348-
public class AdUpdateBid extends OceanApiRequest<AdsUpdateBidRequest, OceanResponse<AdsUpdateBidResponseData>> {
347+
public class AdUpdateBid extends OceanApiRequest<AdUpdateBidRequest, OceanResponse<AdUpdateBidResponseData>> {
349348
}
350349

351350
@ApiRequestMapping(value = "/creative/get/", method = RequestConstants.GET, usePostBody = false,
352351
contentTypes = {RequestConstants.CONTENT_TYPE_TEXT_PLAIN})
353-
public class CreativeGet
354-
extends OceanApiRequest<ConfigRequest<AdcreativesGetFilteringStruct>,
355-
OceanResponse<PageResponseData<AdcreativesGetListStruct>>> {
352+
public class CreativeGet extends OceanApiRequest<ConfigRequest<CreativeGetFilteringStruct>,
353+
OceanResponse<PageResponseData<CreativeGetListStruct>>> {
356354
@Override
357355
public void setRequestParam(List<Pair> localVarQueryParams, List<Pair> localVarCollectionQueryParams,
358-
ConfigRequest<AdcreativesGetFilteringStruct> configRequest) {
356+
ConfigRequest<CreativeGetFilteringStruct> configRequest) {
359357
Long advertiserId = configRequest.getAdvertiserId();
360358
if (advertiserId != null) {
361359
localVarQueryParams.addAll(parameterToPair(ADVERTISER_ID, advertiserId));
362360
}
363-
AdcreativesGetFilteringStruct filtering = configRequest.getFiltering();
361+
CreativeGetFilteringStruct filtering = configRequest.getFiltering();
364362
if (filtering != null) {
365363
localVarQueryParams.addAll(parameterToPair(FILTERING, JsonUtil.toJsonString(filtering)));
366364
}
@@ -382,12 +380,14 @@ public void setRequestParam(List<Pair> localVarQueryParams, List<Pair> localVarC
382380

383381
@ApiRequestMapping(value = "/creative/custom_creative/create/", method = RequestConstants.POST)
384382
public class CreativeCustomCreativeCreate
385-
extends OceanApiRequest<AdcreativesCustomAddRequest, OceanResponse<AdcreativesCustomAddResponseData>> {
383+
extends OceanApiRequest<CreativeCustomCreativeCreateRequest,
384+
OceanResponse<CreativeCustomCreativeCreateResponseData>> {
386385
}
387386

388387
@ApiRequestMapping(value = "/creative/custom_creative/update/", method = RequestConstants.POST)
389388
public class CreativeCustomCreativeUpdate
390-
extends OceanApiRequest<AdcreativesCustomUpdateRequest, OceanResponse<AdcreativesCustomUpdateResponseData>> {
389+
extends OceanApiRequest<CreativeCustomCreativeUpdateRequest,
390+
OceanResponse<CreativeCustomCreativeUpdateResponseData>> {
391391
}
392392

393393
}

‎marketing-api-oceanengine/src/main/java/com/hyq0719/mktapi/oceanengine/api/DataReportApi.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ public ReportCreativeGet reportCreativeGet() {
8585

8686
@ApiRequestMapping(value = "/report/agent/get_v2/", method = RequestConstants.GET, usePostBody = false,
8787
contentTypes = {RequestConstants.CONTENT_TYPE_TEXT_PLAIN})
88-
public class ReportAgentGetV2 extends OceanApiRequest<ReportAgentGetRequest,
89-
OceanResponse<PageResponseData<ReportAgentGetResponseStruct>>> {
88+
public class ReportAgentGetV2 extends OceanApiRequest<ReportAgentGetV2Request,
89+
OceanResponse<PageResponseData<ReportAgentGetV2ResponseStruct>>> {
9090
@Override
9191
public void setRequestParam(List<Pair> localVarQueryParams, List<Pair> localVarCollectionQueryParams,
92-
ReportAgentGetRequest reportRequest) {
92+
ReportAgentGetV2Request reportRequest) {
9393
Long agentId = reportRequest.getAgentId();
9494
if (agentId != null) {
9595
localVarQueryParams.addAll(parameterToPair("agent_id", agentId));

marketing-api-oceanengine/src/main/java/com/hyq0719/mktapi/oceanengine/bean/ad/AdsGetCostProtectStatusRequest.java renamed to marketing-api-oceanengine/src/main/java/com/hyq0719/mktapi/oceanengine/bean/ad/AdCostProtectStatusGetRequest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
import java.util.List;
99

1010
@Data
11-
public class AdsGetCostProtectStatusRequest implements TokenKey {
11+
public class AdCostProtectStatusGetRequest implements TokenKey {
1212
@SerializedName("advertiser_id")
1313
private Long advertiserId = null;
1414

1515
@SerializedName("ad_ids")
1616
private List<Long> adIds = null;
1717

18-
public AdsGetCostProtectStatusRequest advertiserId(Long advertiserId) {
18+
public AdCostProtectStatusGetRequest advertiserId(Long advertiserId) {
1919
this.advertiserId = advertiserId;
2020
return this;
2121
}
2222

23-
public AdsGetCostProtectStatusRequest adIds(List<Long> adIds) {
23+
public AdCostProtectStatusGetRequest adIds(List<Long> adIds) {
2424
this.adIds = adIds;
2525
return this;
2626
}

marketing-api-oceanengine/src/main/java/com/hyq0719/mktapi/oceanengine/bean/ad/AdsGetCostProtectStatusResponseData.java renamed to marketing-api-oceanengine/src/main/java/com/hyq0719/mktapi/oceanengine/bean/ad/AdCostProtectStatusGetResponseData.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
import java.util.List;
88

99
@Data
10-
public class AdsGetCostProtectStatusResponseData {
10+
public class AdCostProtectStatusGetResponseData {
1111
@SerializedName("list")
1212
private List<AdsGetCostProtectStatusResponseListStruct> list = null;
1313

14-
public AdsGetCostProtectStatusResponseData list(List<AdsGetCostProtectStatusResponseListStruct> list) {
14+
public AdCostProtectStatusGetResponseData list(List<AdsGetCostProtectStatusResponseListStruct> list) {
1515
this.list = list;
1616
return this;
1717
}

0 commit comments

Comments
 (0)