Browse Source

Merge remote-tracking branch 'origin/test-track' into test-track

# Conflicts:
#	jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java
yumeng 4 years ago
parent
commit
456d93e848

+ 6 - 39
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java

@@ -109,22 +109,20 @@ public class TestController {
         list.add(7882996L);
         list.add(7883032L);
         list.add(7922257L);*/
-/*        list.add(9538319L);
+        list.add(9538319L);
         list.add(9643738L);
         list.add(9664230L);
         list.add(9643754L);
         list.add(9538300L);
-        list.add(9643726L);*/
-
-
-        list.add(9845239L);
+        list.add(9643726L);
+        //  list.add(9556344L);
 
 
         for (int i = 0; i < list.size(); i++) {
             Long accountId = list.get(i);
             CtopOauthToken oauthToken = oauthTokenService.getTokenByAccountId(accountId);
-            //  kuaishouInterfaceService.getCampaignList(oauthToken, null, null);
-            kuaishouInterfaceService.getGroupList(oauthToken, null, null);
+            kuaishouInterfaceService.getCampaignList(oauthToken, null, null);
+            //   kuaishouInterfaceService.getGroupList(oauthToken, null, null);
         }
 
     }
@@ -169,38 +167,7 @@ public class TestController {
     @GetMapping(value = "/updateUnit")
     public void updateUnit() throws Exception {
         List<Long> list = new ArrayList();
-       /* list.add(9556344L);
-        list.add(9743738L);
-        list.add(9743727L);
-        list.add(9812671L);
-        list.add(9838554L);
-        list.add(9743746L);
-        list.add(9767055L);
-        list.add(9556274L);
-        list.add(9767096L);
-        list.add(9792538L);
-        list.add(9766952L);
-        list.add(9677440L);
-        list.add(9677334L);
-        list.add(9556465L);
-        list.add(9677236L);
-        list.add(9556227L);
-        list.add(9556188L);
-        list.add(9556431L);
-        list.add(9677408L);
-        list.add(9677284L);
-        list.add(9677304L);
-        list.add(9677344L);
-        list.add(9812668L);
-        list.add(9774008L);
-        list.add(9767003L);
-        list.add(9792526L);
-        list.add(9774099L);
-        list.add(9743751L);
-        list.add(9743701L);
-        list.add(9743804L);
-        list.add(9743691L);*/
-        list.add(9845239L);
+        list.add(9556344L);
         for (int i = 0; i < list.size(); i++) {
             Long accountId = list.get(i);
             CtopOauthToken oauthToken = oauthTokenService.getTokenByAccountId(accountId);

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -1302,7 +1302,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
         String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.GROUP_LIST;
         JSONObject param = new JSONObject();
         param.put("advertiser_id", token.getAccountId());
-        param.put("page_size", 200);
+        param.put("page_size", 500);
         param.put("page", page);
         if (startDate != null && endDate != null) {
             param.put("start_date", DateUtils.formatDate(startDate));
@@ -1380,7 +1380,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
             }
             if (!Check.isNull(groups)) {
                 try {
-                    Thread.sleep(200L);
+                    Thread.sleep(1000L);
                     groupMapper.replaceBatch(groups);
                 } catch (InterruptedException e) {
                     e.printStackTrace();