瀏覽代碼

定向包~修改关系表名

zhaoxian 4 年之前
父節點
當前提交
3110e3d6ee

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/entity/KuaishouDirectionalTemplateRel.java

@@ -20,11 +20,11 @@ import java.util.Date;
  * @date 2021-04-25
  */
 @Data
-@TableName("ctop_kuaishou_directional_template_rel")
+@TableName("ctop_kuaishou_directional_package_rel")
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @ApiModel(value = "ctop_kuaishou_directional_template_rel对象", description = "自动投放-定向包详情关系表")
-public class KuaishouDirectionalTemplateRel {
+public class KuaishouDirectionalaPckageRel {
 
     /**
      * id

+ 3 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/mapper/KuaishouDirectionalTemplateRelMapper.java

@@ -1,6 +1,6 @@
 package cn.com.ctop.kuaishou.modules.ai.mapper;
 
-import cn.com.ctop.kuaishou.modules.ai.entity.KuaishouDirectionalTemplateRel;
+import cn.com.ctop.kuaishou.modules.ai.entity.KuaishouDirectionalaPckageRel;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -15,9 +15,9 @@ import java.util.List;
  * @date: 2021-04-25
  * @cersion: V1.0
  */
-public interface KuaishouDirectionalTemplateRelMapper extends BaseMapper<KuaishouDirectionalTemplateRel> {
+public interface KuaishouDirectionalPckageRelMapper extends BaseMapper<KuaishouDirectionalaPckageRel> {
 
-    void replace(KuaishouDirectionalTemplateRel rel);
+    void replace(KuaishouDirectionalaPckageRel rel);
 
     List<JSONObject> queryPushResults(@Param("id") String id, @Param("accountIds") JSONArray accountIds);
 

+ 4 - 4
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/mapper/xml/KuaishouDirectionalPackageMapper.xml

@@ -27,13 +27,13 @@
         LEFT JOIN ctop_project t2 ON t2.id = t1.project_id
         LEFT JOIN (
         SELECT dir_id,COUNT(1) 'count' FROM
-        ctop_kuaishou_directional_template_rel
+        ctop_kuaishou_directional_package_rel
         WHERE rel_type = 'account'
         GROUP BY dir_id
         ) t4 ON t4.dir_id = t1.id
         LEFT JOIN (
         SELECT dir_id,COUNT(1) 'count' FROM
-        ctop_kuaishou_directional_template_rel
+        ctop_kuaishou_directional_package_rel
         WHERE rel_type = 'unit'
         GROUP BY dir_id
         ) t5 ON t5.dir_id = t1.id
@@ -68,7 +68,7 @@
 
     <select id="getRelatedAccount" resultType="com.alibaba.fastjson.JSONObject">
         SELECT t1.dir_id as 'id', IFNULL(t2.auth_name, '') as 'authName', IFNULL(t2.account_id, '') as 'accountId', IFNULL(t1.template_id, '') as 'templateId', IFNULL(t1.template_name, '') as 'templateName'
-        FROM ctop_kuaishou_directional_template_rel t1
+        FROM ctop_kuaishou_directional_package_rel t1
                  INNER JOIN ctop_user_allocation t2 ON t1.rel_id = t2.account_id
         WHERE t1.data_status = 1
           AND t1.dir_id = #{id}
@@ -81,7 +81,7 @@
         IFNULL(t1.account_id,'') as 'accountId',
         IFNULL(t2.template_id,'') as 'templateId',
         t1.unit_name
-        FROM ctop_kuaishou_directional_template_rel t2
+        FROM ctop_kuaishou_directional_package_rel t2
         LEFT JOIN ( SELECT account_id,unit_id,unit_name FROM ctop_kuaishou_group
         where 1=1
         <if test="accountId!=null">

+ 6 - 6
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/mapper/xml/KuaishouDirectionalTemplateRelMapper.xml

@@ -1,10 +1,10 @@
 <?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.kuaishou.modules.ai.mapper.KuaishouDirectionalTemplateRelMapper">
+<mapper namespace="cn.com.ctop.kuaishou.modules.ai.mapper.KuaishouDirectionalPckageRelMapper">
 
     <insert id="replace">
         replace
-        into ctop_kuaishou_directional_template_rel(
+        into ctop_kuaishou_directional_package_rel(
         id ,
         dir_id ,
         project_id ,
@@ -48,7 +48,7 @@
         IFNULL(t1.template_id,'') as 'templateId',
         IFNULL(t1.message,'-') as 'message',
         CASE WHEN t1.data_status =1 THEN '推送成功' ELSE '推送失败' end as 'result'
-        FROM ctop_kuaishou_directional_template_rel t1
+        FROM ctop_kuaishou_directional_package_rel t1
         LEFT JOIN ctop_user_allocation t2 ON t1.rel_id = t2.account_id
         where dir_id = #{id}
         AND rel_type = 'account'
@@ -68,7 +68,7 @@
             IFNULL(t2.data_status,0) as 'state'
             FROM ctop_user_allocation t1
             LEFT JOIN (
-            SELECT rel_id,data_status FROM ctop_kuaishou_directional_template_rel
+            SELECT rel_id,data_status FROM ctop_kuaishou_directional_package_rel
             WHERE  project_id = #{projectId}
               AND rel_type = 'account'
               AND dir_id = #{id}
@@ -78,7 +78,7 @@
     </select>
 
     <select id="queryRelId" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT rel_id,template_id FROM ctop_kuaishou_directional_template_rel
+        SELECT rel_id,template_id FROM ctop_kuaishou_directional_package_rel
         WHERE  project_id = #{projectId}
           AND rel_type = #{type}
           AND dir_id = #{id}
@@ -88,7 +88,7 @@
         SELECT rel_id,template_id FROM(
        SELECT DISTINCT unit_id FROM ctop_kuaishou_group
        where account_id = #{accountId} ) t1
-       INNER JOIN ctop_kuaishou_directional_template_rel t2 ON t1.unit_id = t2.rel_id
+       INNER JOIN ctop_kuaishou_directional_package_rel t2 ON t1.unit_id = t2.rel_id
         WHERE t2.rel_type = 'unit' AND t2.dir_id = #{id}
     </select>
 

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/IKuaishouDirectionalTemplateRelService.java

@@ -1,6 +1,6 @@
 package cn.com.ctop.kuaishou.modules.ai.service;
 
-import cn.com.ctop.kuaishou.modules.ai.entity.KuaishouDirectionalTemplateRel;
+import cn.com.ctop.kuaishou.modules.ai.entity.KuaishouDirectionalaPckageRel;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @Date:   2021-04-25
  * @Version: V1.0
  */
-public interface IKuaishouDirectionalTemplateRelService extends IService<KuaishouDirectionalTemplateRel> {
+public interface IKuaishouDirectionalPckageRelService extends IService<KuaishouDirectionalaPckageRel> {
 
 }

+ 9 - 10
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/KuaishouDirectionalPackageServiceImpl.java

@@ -7,11 +7,11 @@ import cn.com.ctop.common.module.utils.HttpUtils;
 import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
 import cn.com.ctop.common.module.utils.PropertiesUtils;
 import cn.com.ctop.kuaishou.modules.ai.entity.KuaishouDirectionalPackage;
-import cn.com.ctop.kuaishou.modules.ai.entity.KuaishouDirectionalTemplateRel;
+import cn.com.ctop.kuaishou.modules.ai.entity.KuaishouDirectionalaPckageRel;
 import cn.com.ctop.kuaishou.modules.ai.mapper.KuaishouDirectionalPackageMapper;
-import cn.com.ctop.kuaishou.modules.ai.mapper.KuaishouDirectionalTemplateRelMapper;
+import cn.com.ctop.kuaishou.modules.ai.mapper.KuaishouDirectionalPckageRelMapper;
 import cn.com.ctop.kuaishou.modules.ai.service.IKuaishouDirectionalPackageService;
-import cn.com.ctop.kuaishou.modules.ai.service.IKuaishouDirectionalTemplateRelService;
+import cn.com.ctop.kuaishou.modules.ai.service.IKuaishouDirectionalPckageRelService;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroup;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouGroupMapper;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaishouTemplateMapper;
@@ -26,7 +26,6 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -52,9 +51,9 @@ public class KuaishouDirectionalPackageServiceImpl extends ServiceImpl<KuaishouD
     @Autowired
     private KuaishouDirectionalPackageMapper packageMapper;
     @Autowired
-    private KuaishouDirectionalTemplateRelMapper relMapper;
+    private KuaishouDirectionalPckageRelMapper relMapper;
     @Autowired
-    private IKuaishouDirectionalTemplateRelService relService;
+    private IKuaishouDirectionalPckageRelService relService;
     @Autowired
     private ICtopOauthTokenService oauthTokenService;
     @Autowired
@@ -369,7 +368,7 @@ public class KuaishouDirectionalPackageServiceImpl extends ServiceImpl<KuaishouD
         Long accountId = request.getLong("accountId");
         CtopOauthToken oauthToken = oauthTokenService.getTokenByAccountId(accountId);
         String message = "";
-        KuaishouDirectionalTemplateRel rel = new KuaishouDirectionalTemplateRel();
+        KuaishouDirectionalaPckageRel rel = new KuaishouDirectionalaPckageRel();
         rel.setDirId(data.getString("id"));
         rel.setRelId(accountId);
         rel.setRelType("account");
@@ -546,10 +545,10 @@ public class KuaishouDirectionalPackageServiceImpl extends ServiceImpl<KuaishouD
     public Result<Object> editPopulation(JSONObject requestJson) {
         Long accountId = requestJson.getLong("accountId");
         String message = "";
-        KuaishouDirectionalTemplateRel rel = new KuaishouDirectionalTemplateRel();
+        KuaishouDirectionalaPckageRel rel = new KuaishouDirectionalaPckageRel();
         try {
             CtopOauthToken oauthToken = oauthTokenService.getTokenByAccountId(accountId);
-            QueryWrapper<KuaishouDirectionalTemplateRel> queryWrapper = new QueryWrapper<>();
+            QueryWrapper<KuaishouDirectionalaPckageRel> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("dir_id", requestJson.getString("id"));
             queryWrapper.eq("rel_id", accountId);
             queryWrapper.eq("rel_type", "account");
@@ -617,7 +616,7 @@ public class KuaishouDirectionalPackageServiceImpl extends ServiceImpl<KuaishouD
         if (Check.isNull(target)) {
             throw new Exception("添加广告组和定向模板绑定关系失败");
         }
-        KuaishouDirectionalTemplateRel relEntity = new KuaishouDirectionalTemplateRel();
+        KuaishouDirectionalaPckageRel relEntity = new KuaishouDirectionalaPckageRel();
         relEntity.setDirId(target.getString("dir_id"));
         relEntity.setProjectId(target.getLong("project_id"));
         relEntity.setTemplateId(request.getLong("templateId"));

+ 4 - 4
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/KuaishouDirectionalTemplateRelServiceImpl.java

@@ -1,8 +1,8 @@
 package cn.com.ctop.kuaishou.modules.ai.service.impl;
 
-import cn.com.ctop.kuaishou.modules.ai.entity.KuaishouDirectionalTemplateRel;
-import cn.com.ctop.kuaishou.modules.ai.mapper.KuaishouDirectionalTemplateRelMapper;
-import cn.com.ctop.kuaishou.modules.ai.service.IKuaishouDirectionalTemplateRelService;
+import cn.com.ctop.kuaishou.modules.ai.entity.KuaishouDirectionalaPckageRel;
+import cn.com.ctop.kuaishou.modules.ai.mapper.KuaishouDirectionalPckageRelMapper;
+import cn.com.ctop.kuaishou.modules.ai.service.IKuaishouDirectionalPckageRelService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -14,6 +14,6 @@ import org.springframework.stereotype.Service;
  * @date 2021-04-25
  */
 @Service
-public class KuaishouDirectionalTemplateRelServiceImpl extends ServiceImpl<KuaishouDirectionalTemplateRelMapper, KuaishouDirectionalTemplateRel> implements IKuaishouDirectionalTemplateRelService {
+public class KuaishouDirectionalTemplateRelServiceImpl extends ServiceImpl<KuaishouDirectionalPckageRelMapper, KuaishouDirectionalaPckageRel> implements IKuaishouDirectionalPckageRelService {
 
 }

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

@@ -53,7 +53,7 @@
         select t1.account_id,t1.template_id,t1.template_name,t3.dir_id,t3.project_id
         from ctop_kuaishou_template t1
                  INNER JOIN ctop_user_allocation t2 ON t1.account_id = t2.account_id
-                 left JOIN ctop_kuaishou_directional_template_rel t3 ON t1.template_name = t3.template_name AND t2.project_id = t3.project_id
+                 left JOIN ctop_kuaishou_directional_package_rel t3 ON t1.template_name = t3.template_name AND t2.project_id = t3.project_id
         where t1.template_id = #{templateId}
     </select>