yumeng 4 weeks ago
parent
commit
f80531ab36

+ 2 - 15
job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java

@@ -77,24 +77,11 @@ public class XxlJobTrigger {
             if (mediaId == 5) { // 查询 ADQ业务单元刷新最新账户
                 accountList = XxlJobAdminConfig.getAdminConfig().getAccountDaoDao().getAdqAdminAdcertiserList();
             }
-            if (mediaId == 6) { // 查询 快手短剧经营者平台
-                accountList = XxlJobAdminConfig.getAdminConfig().getAccountDaoDao().getKuaishouSeriesIds();
-            }
+
             if (mediaId == 7) { // 查询 罗盘账户
                 accountList = XxlJobAdminConfig.getAdminConfig().getAccountDaoDao().getKuaishouAdminadvertiserIds();
             }
-            if (mediaId == 8) { // 头条 ltv3账户获取
-                accountList = XxlJobAdminConfig.getAdminConfig().getAccountDaoDao().getBytedanceLtv3AccountList();
-            }
-            if (mediaId == 9) { // 智投助手-半小时
-                accountList = XxlJobAdminConfig.getAdminConfig().getAccountDaoDao().getPolicyConfigList(1);
-            }
-            if (mediaId == 10) { // 智投助手-一小时
-                accountList = XxlJobAdminConfig.getAdminConfig().getAccountDaoDao().getPolicyConfigList(2);
-            }
-            if (mediaId == 11) { // 智投助手-一天
-                accountList = XxlJobAdminConfig.getAdminConfig().getAccountDaoDao().getPolicyConfigList(2);
-            }
+
         }
         int finalFailRetryCount = failRetryCount >= 0 ? failRetryCount : jobInfo.getExecutorFailRetryCount();
         XxlJobGroup group = XxlJobAdminConfig.getAdminConfig().getXxlJobGroupDao().load(jobInfo.getJobGroup());

+ 0 - 5
job-admin/src/main/java/com/xxl/job/admin/dao/AccountDao.java

@@ -10,7 +10,6 @@ public interface AccountDao {
 
     List<String> getAdqList();
 
-
     List<String> getBytedanceList();
 
     List<String> getBytedanceAdminAdcertiserList();
@@ -19,11 +18,7 @@ public interface AccountDao {
 
     List<String> getAdqAdminAdcertiserList();
 
-    List<String> getKuaishouSeriesIds();
-
     List<String> getKuaishouAdminadvertiserIds();
 
-    List<String> getBytedanceLtv3AccountList();
 
-    List<String> getPolicyConfigList(@Param("scheduleType") Integer scheduleType);
 }

+ 3 - 3
job-admin/src/main/resources/application.properties

@@ -23,9 +23,9 @@ mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
 #mybatis.type-aliases-package=com.xxl.job.admin.core.model
 
 ### xxl-job, datasource
-spring.datasource.url=jdbc:mysql://172.16.0.117:3390/deepthink_xxl_job?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=GMT%2B8
-spring.datasource.username=data
-spring.datasource.password=hr@2025..
+spring.datasource.url=jdbc:mysql://nuojing.rwlb.rds.aliyuncs.com:3306/nuojing_data_xxl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+spring.datasource.username=nuojing_only_read
+spring.datasource.password=lLze2N_%(CZ%
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 ### datasource-pool

+ 4 - 2
job-admin/src/main/resources/logback.xml

@@ -2,10 +2,12 @@
 <configuration debug="false" scan="true" scanPeriod="1 seconds">
 
     <contextName>logback</contextName>
-    <property name="log.path" value="/data/webapp/hr_job-admin/log/xxl-job-admin.log"/>
+<!--
+    <property name="log.path" value="${LOG_PATH:-/data/webapp/hr_job-admin/log/job-admin.log}"/>
+-->
 
 
-<!--    <property name="log.path" value="/Users/yumeng/logs/hr-xxl-job/xxl-job-admin.log"/>-->
+    <property name="log.path" value="/Users/yumeng/logs/hr-xxl-job/job-admin.log"/>
 
 
 

+ 13 - 37
job-admin/src/main/resources/mybatis-mapper/AccountMapper.xml

@@ -4,26 +4,22 @@
 <mapper namespace="com.xxl.job.admin.dao.AccountDao">
     <select id="getAdqList" resultType="java.lang.String">
         SELECT concat(t1.advertiser_id, '_', t2.access_token) AS 'param'
-        FROM deepthink.adq_advertiser_list t1
-                 LEFT JOIN deepthink.adq_auth_list t2
+        FROM nuojing_data.media_advertiser_account t1
+                 LEFT JOIN nuojing_data.media_auth_account t2
                            ON t1.admin_advertiser_id = t2.admin_advertiser_id
-                 LEFT JOIN deepthink.advertiser_bind_info t3
-                           ON t1.advertiser_id = t3.advertiser_id
-        WHERE t3.advertiser_status = 1
+        WHERE t1.media_type = 3
         GROUP BY t1.advertiser_id
     </select>
 
 
     <select id="getBytedanceList" resultType="java.lang.String">
-        SELECT *
-        FROM (SELECT concat(t1.advertiser_id, '_', t3.access_token) AS 'param'
-              FROM (SELECT advertiser_id
-                    FROM media_api.bytedance_advertiser_report_hour
-                    WHERE  stat_time_day >= date_format(CURDATE() - INTERVAL 1 DAY, '%Y%m%d')
-                    GROUP BY advertiser_id) t1
-                       LEFT JOIN deepthink.bytedance_advertiser_list t2 ON t1.advertiser_id = t2.advertiser_id
-                       LEFT JOIN deepthink.bytedance_auth_list t3 ON t2.admin_advertiser_id = t3.admin_advertiser_id) t
-        WHERE t.param IS NOT NULL
+        select concat(t1.advertiser_id, '_', t3.access_token)
+        from nuojing_data.media_advertiser_relation t1
+                 left join nuojing_data.media_advertiser_account t2 on t1.advertiser_id = t2.advertiser_id
+                 left join nuojing_data.media_auth_account t3 on t2.admin_advertiser_id = t3.admin_advertiser_id
+        where t1.media_type = 1
+          and t1.delivery_status = 1
+        group by t1.advertiser_id
 
     </select>
     <select id="getBytedanceAdminAdcertiserList" resultType="java.lang.String">
@@ -45,32 +41,12 @@
         SELECT concat(admin_advertiser_id, '_', access_token)
         FROM deepthink.adq_auth_list
     </select>
-    <select id="getKuaishouSeriesIds" resultType="java.lang.String">
-        SELECT concat(admin_advertiser_id, '_', access_token)
-        FROM deepthink.kuaishou_auth_list
-        WHERE `type` = 2
-    </select>
+
     <select id="getKuaishouAdminadvertiserIds" resultType="java.lang.String">
         SELECT concat(admin_advertiser_id, '_', access_token)
         FROM deepthink.kuaishou_auth_list
         WHERE `type` = 1
     </select>
-    <select id="getBytedanceLtv3AccountList" resultType="java.lang.String">
-        SELECT *
-        FROM (SELECT concat(t1.advertiser_id, '_', t3.access_token) AS 'param'
-              FROM (SELECT advertiser_id
-                    FROM media_api.bytedance_advertiser_report_hour
-                    WHERE stat_time_day &gt;= date_format(CURDATE() - INTERVAL 4 DAY, '%Y%m%d')
-                      AND stat_time_day &lt;= date_format(CURDATE() - INTERVAL 1 DAY, '%Y%m%d')
-                    GROUP BY advertiser_id) t1
-                       LEFT JOIN deepthink.bytedance_advertiser_list t2 ON t1.advertiser_id = t2.advertiser_id
-                       LEFT JOIN deepthink.bytedance_auth_list t3 ON t2.admin_advertiser_id = t3.admin_advertiser_id) t
-        WHERE t.param IS NOT NULL
-    </select>
-    <select id="getPolicyConfigList" resultType="java.lang.String">
-        select id
-        from deepthink.zt_policy_config
-        where schedule_type = #{scheduleType}
-        and is_deleted = 0
-    </select>
+
+
 </mapper>

+ 1 - 11
job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl

@@ -207,13 +207,7 @@
                                 <option value="3">ADQ</option>
                                 <option value="4">头条管家账户刷新最新账户</option>
                                 <option value="5">ADQ业务单元刷新最新账户</option>
-                                <option value="6">快手-短剧经营者平台</option>
                                 <option value="7">快手-罗盘刷新最新账户</option>
-                                <option value="8">头条-ltv3账户获取</option>
-                                <option value="9">智投助手_半小时</option>
-                                <option value="10">智投助手_一小时</option>
-                                <option value="11">智投助手_每天</option>
-
                             </select>
                         </div>
 
@@ -533,12 +527,8 @@ exit 0
                                 <option value="3">ADQ</option>
                                 <option value="4">头条管家账户刷新最新账户</option>
                                 <option value="5">ADQ业务单元刷新最新账户</option>
-                                <option value="6">快手-短剧经营者平台</option>
                                 <option value="7">快手-罗盘刷新最新账户</option>
-                                <option value="8">头条-ltv3账户获取</option>
-                                <option value="9">智投助手_半小时</option>
-                                <option value="10">智投助手_一小时</option>
-                                <option value="11">智投助手_每天</option>
+
                             </select>
                         </div>