修改

job-adq/src/main/java/cn/com/ctop/job/adq/data/entity/AdqAdvertiserList.java

@@ -40,6 +40,11 @@ public class AdqAdvertiserList {
      */
     private Integer isMp;
 
+    /**
+     * 媒体原始响应
+     */
+    private String rawResponse;
+
     public Long getAdminAdvertiserId() {
         return adminAdvertiserId;
     }
@@ -88,6 +93,14 @@ public class AdqAdvertiserList {
         this.isMp = isMp;
     }
 
+    public String getRawResponse() {
+        return rawResponse;
+    }
+
+    public void setRawResponse(String rawResponse) {
+        this.rawResponse = rawResponse;
+    }
+
     @Override
     public String toString() {
         return "AdqAdvertiserList{" +

job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/AdqAdminAdvertiserListMapper.xml

@@ -4,27 +4,29 @@
 
 
     <insert id="replaceAdqAccountList">
-        INSERT into deepthink.adq_advertiser_list(
+        INSERT INTO media_advertiser_account(
+        media_type,
         admin_advertiser_id,
         advertiser_id,
         advertiser_name,
-        `corporation_name`,
-        is_adx,
-        is_mp
+        is_valid,
+        raw_response
         )
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            3,
             #{add.adminAdvertiserId},
             #{add.advertiserId},
             #{add.advertiserName},
-            #{add.corporationName},
-            #{add.isAdx},
-            #{add.isMp}
+            1,
+            #{add.rawResponse}
             )
         </foreach>
         on duplicate key update
-        advertiser_name= VALUES(advertiser_name)
+        advertiser_name= VALUES(advertiser_name),
+        is_valid= VALUES(is_valid),
+        raw_response= VALUES(raw_response)
     </insert>
     <insert id="addAgent">
         replace into deepthink.adq_agent_advertiser_list
@@ -59,8 +61,9 @@
     </insert>
     <delete id="deleteAdvertiserListByAdminId" parameterType="java.lang.Long">
         DELETE
-        FROM deepthink.adq_advertiser_list
-        WHERE admin_advertiser_id = #{advertiserId}
+        FROM media_advertiser_account
+        WHERE media_type = 3
+          AND admin_advertiser_id = #{advertiserId}
     </delete>
     <select id="getAdvertiserList" resultType="com.alibaba.fastjson.JSONObject">
         select t1.admin_advertiser_id as 'adminAdvertiserId', t1.advertiser_id as 'advertiserId', t3.access_token as 'accessToken'

job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/AdqErrorLogMapper.xml

@@ -31,8 +31,8 @@
     <select id="getErrorLogs" resultType="com.alibaba.fastjson.JSONObject">
         SELECT t1.msg as 'msg',t1.is_send AS 'isSend', t1.id AS 'id', t1.advertiser_id AS 'advertiserId', t1.start_date AS 'startDate', t1.end_date AS 'endDate', t1.data_dimension AS 'dataDimension', t1.data_type AS 'dataType', t3.access_token AS 'accessToken'
         FROM adq_error_log t1
-                 LEFT JOIN deepthink.adq_advertiser_list t2 ON t1.advertiser_id = t2.advertiser_id
-                 LEFT JOIN deepthink.adq_auth_list t3 ON t2.admin_advertiser_id = t3.admin_advertiser_id
+                 LEFT JOIN media_advertiser_account t2 ON t1.advertiser_id = t2.advertiser_id AND t2.media_type = 3 AND t2.is_valid = 1
+                 LEFT JOIN media_auth_account t3 ON t2.admin_advertiser_id = t3.admin_advertiser_id AND t3.media_type = 3 AND t3.is_valid = 1
     </select>
 
 </mapper>

job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AdqAdminAdvertiserListServiceImpl.java

@@ -51,9 +51,10 @@ public class AdqAdminAdvertiserListServiceImpl implements IAdqAdminAdvertiserLis
                             adqAdvertiserList.setAdminAdvertiserId(adminAdvertiserId);
                             Long accountId = accountJson.getLong("account_id");
                             adqAdvertiserList.setAdvertiserId(accountId);
-                            adqAdvertiserList.setAdvertiserName(String.valueOf(accountId));
                             String corporation_name = accountJson.getString("corporation_name");
+                            adqAdvertiserList.setAdvertiserName(corporation_name);
                             adqAdvertiserList.setCorporationName(corporation_name);
+                            adqAdvertiserList.setRawResponse(accountJson.toJSONString());
                             Boolean isAdx = accountJson.getBoolean("is_adx");
                             if (isAdx) {
                                 adqAdvertiserList.setIsAdx(1);