Przeglądaj źródła

修改文件名

yumeng 1 rok temu
rodzic
commit
27c7d49c1c

+ 2 - 3
job-adq/src/main/java/cn/com/ctop/job/adq/controller/AdqController.java

@@ -1,7 +1,7 @@
 package cn.com.ctop.job.adq.controller;
 
 import cn.com.ctop.job.adq.data.service.IAdqAdminAdvertiserListService;
-import cn.com.ctop.job.adq.data.service.IAdqReportService;
+import cn.com.ctop.job.adq.data.service.IAdqCreativeReportService;
 import cn.com.ctop.job.adq.data.service.IAdqRetryReportService;
 import cn.com.ctop.job.adq.data.utils.Check;
 import cn.com.ctop.job.adq.data.utils.DateUtils;
@@ -10,7 +10,6 @@ import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -32,7 +31,7 @@ import java.util.concurrent.Executors;
 public class AdqController {
     private static ExecutorService dailyExecutorService = Executors.newFixedThreadPool(5);
     @Autowired
-    private IAdqReportService adqReportService;
+    private IAdqCreativeReportService adqReportService;
     @Autowired
     private IAdqRetryReportService retryReportService;
     @Autowired

+ 4 - 0
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/AdqAccountReportMapper.java

@@ -0,0 +1,4 @@
+package cn.com.ctop.job.adq.data.mapper;
+
+public interface AdqAccountReportMapper {
+}

+ 1 - 1
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/AdqReportMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-public interface AdqReportMapper {
+public interface AdqCreativeReportMapper {
     void addsHourList(@Param("adds") List<AdqCreativeReportHour> hourList);
 
     List<JSONObject> getAccountList();

+ 7 - 0
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/AdqAccountReportMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.com.ctop.job.adq.data.mapper.AdqAccountReportMapper">
+
+
+
+</mapper>

+ 1 - 1
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/AdqReportMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.com.ctop.job.adq.data.mapper.AdqReportMapper">
+<mapper namespace="cn.com.ctop.job.adq.data.mapper.AdqCreativeReportMapper">
 
 
     <insert id="addsHourList">

+ 4 - 0
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/IAdqAccountReportService.java

@@ -0,0 +1,4 @@
+package cn.com.ctop.job.adq.data.service;
+
+public interface IAdqAccountReportService {
+}

+ 1 - 1
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/IAdqReportService.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 
 import java.util.List;
 
-public interface IAdqReportService {
+public interface IAdqCreativeReportService {
     void getAdqCreativeHour(Long advertiserId, String accessToken, String startDate, String endDate,Integer page,Integer isLog);
 
     List<JSONObject> getAccountList();

+ 8 - 0
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AdqAccountReportServiceImpl.java

@@ -0,0 +1,8 @@
+package cn.com.ctop.job.adq.data.service.impl;
+
+import cn.com.ctop.job.adq.data.service.IAdqAccountReportService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AdqAccountReportServiceImpl implements IAdqAccountReportService {
+}

+ 4 - 4
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AdqReportServiceImpl.java

@@ -3,8 +3,8 @@ package cn.com.ctop.job.adq.data.service.impl;
 import cn.com.ctop.job.adq.data.entity.AdqCreativeReportDaily;
 import cn.com.ctop.job.adq.data.entity.AdqCreativeReportHour;
 import cn.com.ctop.job.adq.data.entity.AdqErrorLog;
-import cn.com.ctop.job.adq.data.mapper.AdqReportMapper;
-import cn.com.ctop.job.adq.data.service.IAdqReportService;
+import cn.com.ctop.job.adq.data.mapper.AdqCreativeReportMapper;
+import cn.com.ctop.job.adq.data.service.IAdqCreativeReportService;
 import cn.com.ctop.job.adq.data.utils.Check;
 import cn.com.ctop.job.adq.data.utils.FieldsConfig;
 import cn.com.ctop.job.adq.data.utils.HttpUtils;
@@ -23,9 +23,9 @@ import java.util.Map;
 
 @Service
 @Slf4j
-public class AdqReportServiceImpl implements IAdqReportService {
+public class AdqCreativeCreativeReportServiceImpl implements IAdqCreativeReportService {
     @Autowired
-    private AdqReportMapper adqReportMapper;
+    private AdqCreativeReportMapper adqReportMapper;
 
     @Override
     public void getAdqCreativeHour(Long advertiserId, String accessToken, String startDate, String endDate, Integer page, Integer isLog) {

+ 2 - 4
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AdqRetryReportServiceImpl.java

@@ -2,7 +2,7 @@ package cn.com.ctop.job.adq.data.service.impl;
 
 import cn.com.ctop.job.adq.data.entity.AdqCreativeReportDaily;
 import cn.com.ctop.job.adq.data.entity.AdqCreativeReportHour;
-import cn.com.ctop.job.adq.data.mapper.AdqReportMapper;
+import cn.com.ctop.job.adq.data.mapper.AdqCreativeReportMapper;
 import cn.com.ctop.job.adq.data.service.IAdqRetryReportService;
 import cn.com.ctop.job.adq.data.utils.Check;
 import cn.com.ctop.job.adq.data.utils.FieldsConfig;
@@ -22,13 +22,11 @@ import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
-
 @Slf4j
 @Service
 public class AdqRetryReportServiceImpl implements IAdqRetryReportService {
     @Autowired
-    private AdqReportMapper adqReportMapper;
+    private AdqCreativeReportMapper adqReportMapper;
     private static String sendUrl = "http://172.16.0.108:8765/webhook/media_report";
     private static ExecutorService sendExecutorService = Executors.newFixedThreadPool(5);
 

+ 30 - 0
job-adq/src/main/java/cn/com/ctop/job/adq/handler/AdqAccountReportJob.java

@@ -0,0 +1,30 @@
+package cn.com.ctop.job.adq.handler;
+
+
+import cn.com.ctop.job.adq.data.service.IAdqCreativeReportService;
+import cn.com.ctop.job.adq.data.utils.Check;
+import cn.com.ctop.job.adq.data.utils.DateUtils;
+import com.xxl.job.core.context.XxlJobHelper;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+
+/**
+ * 广告主定时任务
+ *
+ * @throws Exception
+ */
+@Slf4j
+@Component
+public class AdqAccountReportJob {
+    private static ExecutorService hourExecutorService = Executors.newFixedThreadPool(3);
+    private static ExecutorService dailyExecutorService = Executors.newFixedThreadPool(3);
+
+
+
+}

+ 0 - 2
job-adq/src/main/java/cn/com/ctop/job/adq/handler/AdqAdminAdvertiserListJob.java

@@ -2,9 +2,7 @@ package cn.com.ctop.job.adq.handler;
 
 
 import cn.com.ctop.job.adq.data.service.IAdqAdminAdvertiserListService;
-import cn.com.ctop.job.adq.data.service.IAdqReportService;
 import cn.com.ctop.job.adq.data.utils.Check;
-import cn.com.ctop.job.adq.data.utils.DateUtils;
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;

+ 2 - 2
job-adq/src/main/java/cn/com/ctop/job/adq/handler/AdqCreativeReportJob.java

@@ -1,7 +1,7 @@
 package cn.com.ctop.job.adq.handler;
 
 
-import cn.com.ctop.job.adq.data.service.IAdqReportService;
+import cn.com.ctop.job.adq.data.service.IAdqCreativeReportService;
 import cn.com.ctop.job.adq.data.utils.Check;
 import cn.com.ctop.job.adq.data.utils.DateUtils;
 import com.xxl.job.core.context.XxlJobHelper;
@@ -25,7 +25,7 @@ public class AdqCreativeReportJob {
     private static ExecutorService hourExecutorService = Executors.newFixedThreadPool(3);
     private static ExecutorService dailyExecutorService = Executors.newFixedThreadPool(3);
     @Autowired
-    private IAdqReportService adqReportService;
+    private IAdqCreativeReportService adqReportService;
 
     @XxlJob("nowDateCreativeHour")
     public void creativeHour() throws Exception {

+ 2 - 4
job-adq/src/main/java/cn/com/ctop/job/adq/handler/AdqRetryReportJob.java

@@ -1,12 +1,10 @@
 package cn.com.ctop.job.adq.handler;
 
 
-import cn.com.ctop.job.adq.data.service.IAdqReportService;
+import cn.com.ctop.job.adq.data.service.IAdqCreativeReportService;
 import cn.com.ctop.job.adq.data.service.IAdqRetryReportService;
 import cn.com.ctop.job.adq.data.utils.Check;
-import cn.com.ctop.job.adq.data.utils.DateUtils;
 import com.alibaba.fastjson.JSONObject;
-import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +29,7 @@ public class AdqRetryReportJob {
 
 
     @Autowired
-    private IAdqReportService adqReportService;
+    private IAdqCreativeReportService adqReportService;
     @Autowired
     private IAdqRetryReportService retryReportService;
 

+ 2 - 2
job-adq/src/main/resources/application.yml

@@ -80,8 +80,8 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://172.16.0.117:3390/media_api?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-         # url: jdbc:mysql://8.147.135.80:3390/media_api?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+         # url: jdbc:mysql://172.16.0.117:3390/media_api?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://8.147.135.80:3390/media_api?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: data
           password: hr@2025..
           driver-class-name: com.mysql.jdbc.Driver