Переглянути джерело

Merge remote-tracking branch 'origin/master'

jiequan.bi 4 роки тому
батько
коміт
6091585a1b
15 змінених файлів з 138 додано та 107 видалено
  1. 0 19
      jeecg-boot-module-activiti/src/main/resources/static/activiti/editor-app/libs/es5-shim-15.3.4.5/LICENSE
  2. 0 20
      jeecg-boot-module-activiti/src/main/resources/static/activiti/editor-app/libs/json3_3.2.6/LICENSE
  3. 4 4
      jeecg-boot-module-system/src/main/resources/application-wps.yml
  4. 46 20
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  5. 2 3
      module-common/src/main/java/cn/com/ctop/common/module/utils/ExportExcelUtils.java
  6. 0 6
      module-job-bytedance/pom.xml
  7. 50 0
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/DeleteKuaishouCommentJob.java
  8. 5 4
      module-job-kuaishou/src/main/resources/application-prod.yml
  9. 0 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java
  10. 13 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/KuaishouReportDailyCampaign.java
  11. 12 12
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/AccountReportMapper.xml
  12. 1 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyCampaignMapper.xml
  13. 4 11
      module-kuaishou/src/main/resources/kuaishou_config.properties
  14. 0 1
      module-oa/src/main/java/cn/com/ctop/oa/modules/controller/WechatNoListController.java
  15. 1 1
      module-oa/src/main/java/cn/com/ctop/oa/modules/mapper/xml/WechatNoListMapper.xml

+ 0 - 19
jeecg-boot-module-activiti/src/main/resources/static/activiti/editor-app/libs/es5-shim-15.3.4.5/LICENSE

@@ -1,19 +0,0 @@
-
-Copyright 2009, 2010 Kristopher Michael Kowal. All rights reserved.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.

+ 0 - 20
jeecg-boot-module-activiti/src/main/resources/static/activiti/editor-app/libs/json3_3.2.6/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2012-2013 Kit Cambridge.
-http://kitcambridge.be/
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

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

@@ -56,9 +56,9 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: hcst
-    password: test@20190531
+    password: hcst@2020
     driver-class-name: com.mysql.jdbc.Driver
     druid:
       stat-view-servlet:
@@ -96,9 +96,9 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
-          password: test@20190531
+          password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver
   #redis 配置
   redis:

+ 46 - 20
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -12,10 +12,10 @@ import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouDailyReportTaskServic
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouHistoryReportTaskService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
-import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAccountMapper;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouCostGroupService;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyAgentService;
 import cn.com.ctop.oa.modules.service.IWechatCheckinDataService;
+import cn.com.ctop.oa.modules.service.IWechatDepartmentService;
 import cn.com.ctop.oa.modules.service.IWechatNoListService;
 import cn.com.ctop.oa.modules.service.IWechatUserListService;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
@@ -55,11 +55,8 @@ public class SampleTest {
     private IByteDanceAdvertiserDataService advertiserDataService;
     @Autowired
     private IKuaiShouHistoryReportTaskService kuaiShouHistoryReportTaskService;
-
     @Autowired
     private ICtopOauthTokenService tokenService;
-    @Autowired
-    private KuaishouReportDailyAccountMapper reportDailyAccountMapper;
 
     @Test
     public void loadBytedanceCreativeData() {
@@ -78,10 +75,7 @@ public class SampleTest {
 
     @Test
     public void loadKuaishouCookie() {
-        reportDailyAccountMapper.loadAccountDailyReport(23212L, "D://report2//8206288_1.csv");
-
-
-       /* List<BindAccountLogin> list = bindAccountLoginService.getListByParams(CtopAdConstant.PLATFORM_TYPE_KUAISHOU_PY, 1);
+        List<BindAccountLogin> list = bindAccountLoginService.getListByParams(CtopAdConstant.PLATFORM_TYPE_KUAISHOU_PY, 1);
         if (list != null && !list.isEmpty()) {
             int i = 0;
             for (BindAccountLogin login : list) {
@@ -90,11 +84,10 @@ public class SampleTest {
                     i++;
                 }
             }
-        }*/
+        }
     }
 
     static ExecutorService executorService = null;
-    //线程计数器/bytedance/bytedanceMaterialReport
     static CountDownLatch countDownLatch = null;
 
     @Test
@@ -141,11 +134,11 @@ public class SampleTest {
     }
 
     @Test
-    public void loadBytedancePlanData() {
-        CtopOauthToken token = tokenService.getTokenByAccountId(100198696723L);
-//        advertiserDataService.getAdvertiserPlan(token, "", null, null);
-        Date getDate = DateUtils.addDay(new Date(), 0);
-        reportService.getAdvertiserReport(token, getDate, getDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_HOURLY);
+    public void loadKuaishouPlanData() {
+        Date getDate = DateUtils.addDay(new Date(), -1);
+        //1:查询当日数据
+        List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
+        tokens.forEach(token -> kuaishouInterfaceService.getAdvertiserCampaignReportDaily(token, getDate, getDate));
     }
 
     @Autowired
@@ -218,20 +211,22 @@ public class SampleTest {
         System.out.println("素材数据获取完成");
 
     }
+
     @Autowired
     private IKuaishouReportDailyAgentService kuaishouReportDailyAgentService;
+
     @Test
-    public void testData(){
+    public void testData() {
         Date date = new Date();
         List<CtopOauthToken> tokens = tokenService.selectToutiaoToken();
         executorService = Executors.newFixedThreadPool(10);
         countDownLatch = new CountDownLatch(tokens.size());
-        tokens.forEach(token -> executorService.submit(()->{
+        tokens.forEach(token -> executorService.submit(() -> {
             try {
-                reportService.getAdvertiserPlanRuleData(token,date,date,CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
-            }catch (Exception e){
+                reportService.getAdvertiserPlanRuleData(token, date, date, CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
+            } catch (Exception e) {
 
-            }finally {
+            } finally {
                 countDownLatch.countDown();
             }
         }));
@@ -241,6 +236,7 @@ public class SampleTest {
             e.printStackTrace();
         }
     }
+
     @Test
     public void loadKuaishouAgentData() {
         kuaishouReportDailyAgentService.loginAgent();
@@ -253,6 +249,19 @@ public class SampleTest {
         }
     }
 
+    @Test
+    public void loadKuaishouHourlyReportData(){
+        Date getDate = new Date();
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH");
+        String hour = simpleDateFormat.format(getDate);
+        if ("00".equals(hour)) {
+            getDate = DateUtils.addDay(getDate, -1);
+        }
+        //1:查询当日数据
+        List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
+        Date finalGetDate = getDate;
+        tokens.forEach(token -> kuaishouInterfaceService.getAdvertiserReportHourly(token, finalGetDate, finalGetDate));
+    }
     @Autowired
     private IKuaishouInterfaceService kuaishouInterfaceService;
 
@@ -296,12 +305,29 @@ public class SampleTest {
         alarmEventSendService.matchAlarmRules("HOUR");
     }
 
+
     @Autowired
     private IWechatCheckinDataService wechatCheckinDataService;
     @Autowired
+    private IWechatDepartmentService wechatDepartmentService;
+    @Autowired
     private IWechatUserListService wechatUserInfoService;
     @Autowired
     private IWechatNoListService wechatNoListService;
 
+    @Test
+    public void getData() {
+        //汇创 人员
+//        wechatUserInfoService.getUserList();
+//        //考勤记录
+//        wechatCheckinDataService.getCheckinData("2020-11-01 00:00:00", "2020-12-01 23:59:59");
+        //异常记录
+//        wechatNoListService.getNoDateByNo("2020-11-01 00:00:00", "2020-12-01 23:59:59", "0");
+        //优容
+        wechatUserInfoService.getYRUserList();
+        wechatCheckinDataService.getYRCheckinData("2020-11-01 00:00:00", "2020-11-30 23:59:59");
+        wechatNoListService.getNoDateByNo("2020-11-01 00:00:00", "2020-12-01 23:59:59", "1");
+    }
+
 
 }

+ 2 - 3
module-common/src/main/java/cn/com/ctop/common/module/utils/ExportExcelUtils.java

@@ -158,7 +158,7 @@ public class ExportExcelUtils {
                 boolean changeColor = false;
                 if (m.contains("迟到")) {
                     String duration = String.valueOf(m.get(m.size() - 2));
-                    if (!Check.isNull(duration) && Integer.valueOf(duration.replace(" min", "")) - 15 > 0) {
+                    if (!Check.isNull(duration) && Integer.valueOf(duration.replace(" min", "")) - 10 > 0) {
                         changeColor = true;
                     }
                 }
@@ -188,8 +188,7 @@ public class ExportExcelUtils {
         }
     }
 
-    public void exportExcelForMediaReport(XSSFWorkbook workbook, int sheetNum,
-                                          String sheetTitle, String[] headers, List<List<Object>> result) {
+    public void exportExcelForMediaReport(XSSFWorkbook workbook, int sheetNum, String sheetTitle, String[] headers, List<List<Object>> result) {
         // 生成一个表格
         XSSFSheet sheet = workbook.createSheet();
         workbook.setSheetName(sheetNum, sheetTitle);

+ 0 - 6
module-job-bytedance/pom.xml

@@ -231,11 +231,5 @@
                 <activatedProperties>prod</activatedProperties>
             </properties>
         </profile>
-        <profile>
-            <id>jiaoyang</id>
-            <properties>
-                <activatedProperties>jiaoyang</activatedProperties>
-            </properties>
-        </profile>
     </profiles>
 </project>

+ 50 - 0
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/DeleteKuaishouCommentJob.java

@@ -0,0 +1,50 @@
+package cn.com.ctop.job.kuaishou.handler;
+
+import cn.com.ctop.common.module.entity.BindAccountLogin;
+import cn.com.ctop.common.module.service.IBindAccountLoginService;
+import cn.com.ctop.common.module.utils.CtopAdConstant;
+import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
+import com.xxl.job.core.context.XxlJobHelper;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+@Component
+public class DeleteKuaishouCommentJob {
+    @Autowired
+    private IBindAccountLoginService bindAccountLoginService;
+    @Autowired
+    private IKuaishouWebInterfaceService kuaishouWebInterfaceService;
+    static ExecutorService executorService = Executors.newFixedThreadPool(5);
+    static CountDownLatch countDownLatch = null;
+    @XxlJob("deleteKuaishouComment")
+    public void deleteKuaishouComment(){
+        Long start = System.currentTimeMillis();
+        List<BindAccountLogin> loginList = bindAccountLoginService.getListByParams(CtopAdConstant.PLATFORM_TYPE_KUAISHOU_PY, 1);
+        if (loginList != null && !loginList.isEmpty()) {
+            countDownLatch = new CountDownLatch(loginList.size());
+            loginList.forEach(login -> executorService.submit(() -> {
+                try {
+                    kuaishouWebInterfaceService.deleteAllComment(new HashMap<>(), login);
+                } catch (Exception e) {
+                    XxlJobHelper.log(e.getMessage(), e);
+                } finally {
+                    countDownLatch.countDown();
+                }
+            }));
+            try {
+                countDownLatch.await();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            Long end = System.currentTimeMillis();
+            XxlJobHelper.log("快手删评论所用时长:{}毫秒", end - start);
+        }
+    }
+}

+ 5 - 4
module-job-kuaishou/src/main/resources/application-prod.yml

@@ -52,7 +52,7 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://172.30.0.4:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: hcst
     password: hcst@2020
     driver-class-name: com.mysql.jdbc.Driver
@@ -91,7 +91,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://172.30.0.4:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
           password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver
@@ -176,10 +176,11 @@ xxl:
   job:
     accessToken:
     executor:
-      appname: module-job-kuaishou-v2
+      appname: module-job-kuaishou
       port: 9998
       ip:
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 30
     admin:
-      addresses: http://129.28.150.229:8090/xxl-job-admin
+#      addresses: http://129.28.150.229:8090/xxl-job-admin
+      addresses: http://139.186.29.76:8090/xxl-job-admin

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

@@ -184,8 +184,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
             kuaishouReportHourlyAccount.setUpdateTime(new Date());
             hourlyAccountService.saveOrUpdate(kuaishouReportHourlyAccount);
         }
-
-
     }
 
 
@@ -353,7 +351,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
 
         String result = HttpUtils.httpPostRequest(url, param, headers);
         JSONObject resultJson = JSONObject.parseObject(result);
-        System.err.println(resultJson);
         Integer code = resultJson.getInteger("code");
         String message = resultJson.getString("message");
         if (null == code || code != 0) {

+ 13 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/KuaishouReportDailyCampaign.java

@@ -34,9 +34,9 @@ public class KuaishouReportDailyCampaign implements Serializable {
     @JsonProperty
     private Long bclick;
     @JsonProperty("photo_share")
-    private Long share;
+    private Long photoShare;
     @JsonProperty("photo_comment")
-    private Long comment;
+    private Long photoComment;
     @JsonProperty
     private Long photoLike;
     @JsonProperty
@@ -64,6 +64,10 @@ public class KuaishouReportDailyCampaign implements Serializable {
     @JsonProperty("impression_1k_cost")
     @TableField("impression_1k_cost")
     private BigDecimal impression1kCost;
+
+    @JsonProperty("play_3s_ratio")
+    @TableField("play_3s_ratio")
+    private BigDecimal play3sRatio;
     @JsonProperty
     private BigDecimal photoClickCost;
     @JsonProperty
@@ -82,6 +86,11 @@ public class KuaishouReportDailyCampaign implements Serializable {
     private Long eventRegister;
     @JsonProperty
     private BigDecimal eventRegisterCost;
+    private BigDecimal eventRegisterRatio;
+    private BigDecimal eventCreditGrantLandingRatio;
+    private BigDecimal eventNextDayStayCost;
+    private Long eventNextDayStay;
+    private BigDecimal eventNextDayStayRatio;
     @JsonProperty
     private Long eventJinJianApp;
     @JsonProperty
@@ -114,6 +123,8 @@ public class KuaishouReportDailyCampaign implements Serializable {
     private Long eventCreditGrantLandingPage;
     @JsonProperty
     private BigDecimal eventCreditGrantLandingPageCost;
+    private Integer status;
+    private String campaignName;
     @JsonProperty
     private Date createTime;
     @JsonProperty

+ 12 - 12
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/AccountReportMapper.xml

@@ -72,7 +72,7 @@
         (sum(charge) / sum(activation)) activationPrice,
         ((sum(charge) / sum(activation)) / #{discount}) afterActivationPrice,
         account_id accountId,
-        (select auth_name from ctop_user_allocation where account_id = accountId limit 1) accountName,
+        (select auth_name from ctop_user_allocation where account_id = t1.account_id limit 1) accountName,
         sum(event_next_day_stay) eventNextDayStay,
         (case
         when sum(activation) != 0
@@ -81,13 +81,13 @@
         end
         ) eventNextDayStayRatio
         from
-        ctop_kuaishou_report_daily_account
+        ctop_kuaishou_report_daily_account t1
         where account_id in
         <foreach item="item" index="index" collection="accountIds"
                  open="(" separator="," close=")">
             #{item}
         </foreach>
-        group by account_id;
+        group by account_id
     </select>
 
 
@@ -117,7 +117,7 @@
         end
         ) eventRegisterCost,
         account_id accountId,
-        (select auth_name from ctop_user_allocation where account_id = accountId limit 1) accountName,
+        (select auth_name from ctop_user_allocation where account_id = = t1.account_id limit 1) accountName,
         sum(event_next_day_stay) eventNextDayStay,
         (case
         when sum(activation) != 0
@@ -126,7 +126,7 @@
         end
         ) eventNextDayStayRatio
         from
-        ctop_kuaishou_report_daily_account
+        ctop_kuaishou_report_daily_account t1
         where stat_date &lt;= #{startDate}
         and stat_date &gt;= #{endDate}
         and account_id in
@@ -134,7 +134,7 @@
                  open="(" separator="," close=")">
             #{item}
         </foreach>
-        group by account_id;
+        group by account_id
     </select>
 
 
@@ -171,9 +171,9 @@
         ) eventRegisterCost,
 
         account_id accountId,
-        (select auth_name from ctop_user_allocation where account_id = accountId limit 1) accountName
+        (select auth_name from ctop_user_allocation where account_id = = t1.account_id limit 1) accountName
         from
-        ctop_kuaishou_report_hourly_account
+        ctop_kuaishou_report_hourly_account t1
         where stat_date = #{date}
         and stat_hour &lt;= #{statHour}
         and account_id in
@@ -181,7 +181,7 @@
                  open="(" separator="," close=")">
             #{item}
         </foreach>
-        group by account_id;
+        group by account_id
     </select>
 
 
@@ -215,7 +215,7 @@
         end
         ) eventRegisterCost,
         account_id accountId,
-        (select auth_name from ctop_user_allocation where account_id = accountId limit 1) accountName,
+        (select auth_name from ctop_user_allocation where account_id = = t1.account_id limit 1) accountName,
         sum(event_next_day_stay) eventNextDayStay,
         (case
         when sum(activation) != 0
@@ -224,14 +224,14 @@
         end
         ) eventNextDayStayRatio
         from
-        ctop_kuaishou_report_daily_account
+        ctop_kuaishou_report_daily_account t1
         where stat_date = #{statDate}
         and account_id in
         <foreach item="item" index="index" collection="accountIds"
                  open="(" separator="," close=")">
             #{item}
         </foreach>
-        group by account_id;
+        group by account_id
     </select>
 
 

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyCampaignMapper.xml

@@ -168,7 +168,7 @@
         values
         <foreach collection="records" item="record" separator=",">
             (
-            #{record.accountId}},
+            #{record.accountId},
             #{record.campaignId},
             #{record.status},
             #{record.campaignName},

+ 4 - 11
module-kuaishou/src/main/resources/kuaishou_config.properties

@@ -1,9 +1,12 @@
 kuaishou_api_url=https://ad.e.kuaishou.com
 kuaishou_auth_url=https://ad.e.kuaishou.com
+kuaishou_appid=27
 kuaishou_third_appid=328
 oauth_type=agent
+kuaishou_secret=QovprB1tNhXptgDc
 kuaishou_third_secret=1iFTBiMdohkyEQQs
-kuaishou_third_callbsack_url=http://callback.shyouteng.com.cn/kuaishou
+kuaishou_callback_url=http://adsp.c-top.com.cn:8080/jeecg-boot/kuaishou
+kuaishou_third_callback_url=http://callback.shyouteng.com.cn/kuaishou
 apk_sava_path=/mnt/file/apk
 image_sava_path=/mnt/file/image
 video_sava_path=/mnt/file/video
@@ -19,13 +22,3 @@ model_video_src_path_test=D:\\data\\model\\src\\
 model_video_fill_path_test=D:\\data\\model\\fill\\
 ##
 model_video_final_path_test=D:\\data\\model\\final\\
-
-##master
-#kuaishou_appid=27
-#kuaishou_secret=QovprB1tNhXptgDc
-#kuaishou_callback_url=http://adsp.c-top.com.cn:8080/jeecg-boot/kuaishou
-##jiaoyang
-kuaishou_appid=328
-kuaishou_secret=1iFTBiMdohkyEQQs
-kuaishou_callback_url=http://callback.shyouteng.com.cn/kuaishou
-

+ 0 - 1
module-oa/src/main/java/cn/com/ctop/oa/modules/controller/WechatNoListController.java

@@ -265,7 +265,6 @@ public class WechatNoListController {
     /**
      * 考勤异常记录 导出数据
      *
-     * @param requestBody
      * @param response
      */
     @GetMapping("/excel")

+ 1 - 1
module-oa/src/main/java/cn/com/ctop/oa/modules/mapper/xml/WechatNoListMapper.xml

@@ -19,7 +19,7 @@
         end AS type,
         case when nl.type!=''and nl.type !='补卡' then CONCAT(nl.new_duration,' h')
         when ck.checkin_type ='上班打卡'and ck.exception_type ='时间异常' then
-        CONCAT(TIMESTAMPDIFF(MINUTE,DATE_FORMAT(CONCAT(DATE_FORMAT(ck.checkin_time,'%Y-%m-%d '),'09:30:00'),'%Y-%m-%d
+        CONCAT(TIMESTAMPDIFF(MINUTE,DATE_FORMAT(CONCAT(DATE_FORMAT(ck.checkin_time,'%Y-%m-%d '),'09:35:00'),'%Y-%m-%d
         %H:%i:%s'),ck.checkin_time),' min')
         when ck.checkin_type ='下班打卡'and ck.exception_type ='时间异常' then
         CONCAT(TIMESTAMPDIFF(MINUTE,ck.checkin_time,DATE_FORMAT(CONCAT(DATE_FORMAT(ck.checkin_time,'%Y-%m-%d