Bladeren bron

Merge branch 'test'

yumeng 5 jaren geleden
bovenliggende
commit
de5f17b6df

+ 27 - 18
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouCreateServiceImpl.java

@@ -41,6 +41,8 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
     private KuaiShouGroupCreateLogMapper groupCreateLogMapper;
     @Autowired
     private ICTopOauthTokenService oauthTokenService;
+    @Autowired
+    private KuaiShouCampaignCreateMapper campaignCreateMapper;
 
     @Override
     public Map<String, Object> createGroups(KuaiShouGroupCreateLog groupCreateTemplate) {
@@ -75,27 +77,38 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 returnMap.put("desc", "请选择广告计划模板");
                 return returnMap;
             }
+
             KuaiShouCampaignTemplate kuaiShouCampaignTemplate = campaignTemplateMapper.selectById(campaignTemplateId); // 广告计划信息
             if (Check.isNull(kuaiShouCampaignTemplate)) {
                 logger.error("查询广告计划为空:模板id:{}", campaignTemplateId);
                 throw new Exception("根据模板id查询创意模板信息为空");
             }
 
-            JSONObject campaignJson = new JSONObject();
-            campaignJson.put("campaign_name", kuaiShouCampaignTemplate.getCampaignName() + "_" + UUID.randomUUID().toString().substring(0, 6));
-            campaignJson.put("type", kuaiShouCampaignTemplate.getType());
-            campaignJson.put("day_budget", kuaiShouCampaignTemplate.getDayBudget());
-
-
-            Map<String, Object> campaignMap = kuaishouInterfaceService.campaignCreate(accessToken, accountId, campaignJson);
-            Integer code = (Integer) campaignMap.get("code");
-            if (code != 0) {
-                returnMap.put("code", -1);
-                returnMap.put("success", false);
-                returnMap.put("desc", "创建广告计划失败");
-                return returnMap;
+            QueryWrapper<KuaiShouCampaignCreate> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("account_id", accountId);
+            queryWrapper.eq("campaign_name", kuaiShouCampaignTemplate.getCampaignName());
+            queryWrapper.orderByDesc("create_time");
+            queryWrapper.last("limit 1");
+            KuaiShouCampaignCreate campaignCreate = campaignCreateMapper.selectOne(queryWrapper);
+            Long campaignId;
+            if (Check.isNull(campaignCreate) || Check.isNull(campaignCreate.getCampaignId())) {
+                JSONObject campaignJson = new JSONObject();
+                campaignJson.put("campaign_name", kuaiShouCampaignTemplate.getCampaignName());
+                campaignJson.put("type", kuaiShouCampaignTemplate.getType());
+                campaignJson.put("day_budget", kuaiShouCampaignTemplate.getDayBudget());
+                Map<String, Object> campaignMap = kuaishouInterfaceService.campaignCreate(accessToken, accountId, campaignJson);
+                Integer code = (Integer) campaignMap.get("code");
+                if (code != 0) {
+                    returnMap.put("code", -1);
+                    returnMap.put("success", false);
+                    returnMap.put("desc", "创建广告计划失败");
+                    return returnMap;
+                }
+                campaignId = (Long) campaignMap.get("campaign_id");
+            } else {
+                campaignId = campaignCreate.getCampaignId();
             }
-            Long campaignId = (Long) campaignMap.get("campaign_id");
+
             groupCreateTemplate.setCampaignId(campaignId);
 
             JSONObject groupJson = new JSONObject();
@@ -366,10 +379,6 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
      * @param loginId
      * @return
      */
-
-    @Autowired
-    private KuaiShouCampaignCreateMapper campaignCreateMapper;
-
     @Override
     public JSONArray getOptions(String loginId, Long accountId) {
         JSONArray result = new JSONArray();

+ 21 - 15
jeecg-boot-module-system/src/main/resources/application-test.yml

@@ -13,6 +13,10 @@ management:
         include: metrics,httptrace
 
 spring:
+  servlet:
+    multipart:
+      max-file-size: -1
+      max-request-size: -1
   mail:
     host: smtp.163.com
     username: jeecgos@163.com
@@ -57,7 +61,6 @@ spring:
   datasource:
     druid:
       stat-view-servlet:
-
         enabled: true
         loginUsername: admin
         loginPassword: 123456
@@ -67,6 +70,8 @@ spring:
       druid: # 全局druid参数,绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
         # 连接池的配置信息
         # 初始化大小,最小,最大
+        connection-init-sql: set names utf8mb4
+
         initial-size: 5
         min-idle: 5
         maxActive: 20
@@ -89,12 +94,13 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-          username: root
-          password: root
+          #          url: jdbc:mysql://192.168.0.23:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://39.106.184.70:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          username: hcst
+          password: hcst2019
           driver-class-name: com.mysql.jdbc.Driver
-          # 多数据源配置   
-          #multi-datasource1: 
+          # 多数据源配置
+          #multi-datasource1:
           #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
           #username: root
           #password: root
@@ -102,7 +108,7 @@ spring:
   #redis 配置
   redis:
     database: 0
-    host: 192.168.1.199
+    host: 127.0.0.1
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制
@@ -114,8 +120,7 @@ spring:
     port: 6379
 #mybatis plus 设置
 mybatis-plus:
-  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
-
+  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/kuaishou/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/crawler/modules/**/xml/*Mapper.xml
   global-config:
     # 关闭MP3.0自带的banner
     banner: false
@@ -124,9 +129,9 @@ mybatis-plus:
       id-type: 4
       # 默认数据库表下划线命名
       table-underline: true
-    #configuration:
-    # 这个配置会将执行的sql打印出来,在开发或测试的时候可以用
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    configuration:
+      # 这个配置会将执行的sql打印出来,在开发或测试的时候可以用
+      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 #jeecg专用配置
 jeecg:
   path:
@@ -134,6 +139,7 @@ jeecg:
     upload: D://upFiles
     #webapp文件路径
     webapp: D://webapp
-logging:
-  level:
-    org.jeecg.modules.system.mapper: debug
+    video-upload: D://upFiles//video//
+    image-upload: D://upFiles//image//
+    chrome-driver: D://chromedriver.exe
+    csv-upload: D://upFiles//csv//

+ 1 - 1
jeecg-boot-module-system/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
+    active: test
 swagger:
   production: false
   basic: