zhouzeyu@c-top.com.cn пре 3 година
родитељ
комит
a7ccbc8d4d

+ 4 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/clean/controller/KuaiShouAccountCleanController.java

@@ -117,17 +117,17 @@ public class KuaiShouAccountCleanController {
     /**
      * 查询清理记录
      *
-     * @param userName 运营名称  accountId 账户id
+     * @param templateId 模板名称  userId 账户id
      * @return
      */
     @GetMapping("/getCleanUpLog")
-    public Result getCleanUpLog(@Param("userName")String userName,@Param("accountId")String accountId,
+    public Result getCleanUpLog(@Param("templateId")String templateId,@Param("userId")String userId,
                                   @Param("pageNum")String pageNum,@Param("pageSize")String pageSize  ){
-        return   kuaiShouAccountCleanService.getCleanUpLog(userName,accountId,pageNum,pageSize);
+        return   kuaiShouAccountCleanService.getCleanUpLog(templateId,userId,pageNum,pageSize);
     }
 
     /**
-     * 查询清理记录
+     * 执行清理计划
      *
      * @param
      * @return

+ 4 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/clean/entity/KuaiShouAccountCleanLogInfo.java

@@ -8,6 +8,10 @@ public class KuaiShouAccountCleanLogInfo {
     private  String id;
     //账户id
     private  String accountId;
+    //账户id
+    private  String templateId;
+    //账户id
+    private  String createTemplateId;
     //运营
     private  String userName;
     //操作类型  1-投放、2-暂停、3-删除

+ 3 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/clean/mapper/KuaishouAccountCleanTemplateMapper.java

@@ -33,7 +33,7 @@ public interface KuaishouAccountCleanTemplateMapper {
     //根据id和accountId 删除关联表信息
     void removeBinding(@Param("templateId")String templateId,@Param("accountId")String accountId);
     //查询清理日志记录
-    List<KuaiShouAccountCleanLogInfo> getCleanUpLog(@Param("userName")String userName, @Param("accountId")String accountId);
+    List<KuaiShouAccountCleanLogInfo> getCleanUpLog(@Param("templateId")String templateId, @Param("userId")String userId);
 
     //根据账户id 运营名称 查询个人模板信息
     List<KuaiShouAccountCleanTemplateInfo> getMyselfTemplateList(@Param("accountId")String accountId, @Param("userName")String userName, @Param("createId")String createId);
@@ -47,4 +47,6 @@ public interface KuaishouAccountCleanTemplateMapper {
 
     Map<String,String> getUserNameByAccountId(@Param("accountId")String accountId);
 
+    String getUserRealName(@Param("userId")String userId);
+
 }

+ 172 - 164
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/clean/mapper/xml/KuaishouAccountCleanTemplateMapper.xml

@@ -2,71 +2,75 @@
 <!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.clean.mapper.KuaishouAccountCleanTemplateMapper">
 
-  <resultMap id="templateResultMap" type="cn.com.ctop.kuaishou.modules.clean.entity.KuaiShouAccountCleanTemplateInfo">
-    <id column="id" property="id"/>
-    <result column="template_name" property="templateName"/>
-    <result column="applied_media" property="appliedMedia"/>
-    <result column="clean_time" property="cleanTime"/>
-    <result column="optimization_objective" property="optimizationObjective"/>
-    <result column="charge" property="charge"/>
-    <result column="conversion" property="conversion"/>
-    <result column="promotion_group_status" property="promotionGroupStatus"/>
-    <result column="perform_operations" property="performOperations"/>
-    <result column="status" property="status"/>
-    <result column="create_user" property="createUser"/>
-    <result column="create_id" property="createId"/>
-    <result column="create_time" property="createTime"/>
-    <result column="account_id" property="accountId"/>
-    <result column="user_name" property="userName"/>
-    <result column="account_status" property="accountStatus"/>
-    <result column="account_name" property="accountName"/>
-  </resultMap>
-
-  <resultMap id="logResultMap" type="cn.com.ctop.kuaishou.modules.clean.entity.KuaiShouAccountCleanLogInfo">
-    <id column="id" property="id"/>
-    <result column="account_id" property="accountId"/>
-    <result column="user_name" property="userName"/>
-    <result column="operation_type" property="operationType"/>
-    <result column="create_time" property="createTime"/>
-    <result column="executive_information" property="executiveInformation"/>
-  </resultMap>
-  <!--保存清理模板-->
-  <insert id="saveAccountCleanTemplate" parameterType="cn.com.ctop.kuaishou.modules.clean.entity.KuaiShouAccountCleanTemplateInfo">
+    <resultMap id="templateResultMap" type="cn.com.ctop.kuaishou.modules.clean.entity.KuaiShouAccountCleanTemplateInfo">
+        <id column="id" property="id"/>
+        <result column="template_name" property="templateName"/>
+        <result column="applied_media" property="appliedMedia"/>
+        <result column="clean_time" property="cleanTime"/>
+        <result column="optimization_objective" property="optimizationObjective"/>
+        <result column="charge" property="charge"/>
+        <result column="conversion" property="conversion"/>
+        <result column="promotion_group_status" property="promotionGroupStatus"/>
+        <result column="perform_operations" property="performOperations"/>
+        <result column="status" property="status"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_id" property="createId"/>
+        <result column="create_time" property="createTime"/>
+        <result column="account_id" property="accountId"/>
+        <result column="user_name" property="userName"/>
+        <result column="account_status" property="accountStatus"/>
+        <result column="account_name" property="accountName"/>
+    </resultMap>
+
+    <resultMap id="logResultMap" type="cn.com.ctop.kuaishou.modules.clean.entity.KuaiShouAccountCleanLogInfo">
+        <id column="id" property="id"/>
+        <result column="account_id" property="accountId"/>
+        <result column="template_id" property="templateId"/>
+        <result column="create_template_id" property="createTemplateId"/>
+        <result column="user_name" property="userName"/>
+        <result column="operation_type" property="operationType"/>
+        <result column="create_time" property="createTime"/>
+        <result column="executive_information" property="executiveInformation"/>
+    </resultMap>
+    <!--保存清理模板-->
+    <insert id="saveAccountCleanTemplate"
+            parameterType="cn.com.ctop.kuaishou.modules.clean.entity.KuaiShouAccountCleanTemplateInfo">
     insert into ctop_kuaishou_account_clean_template values (#{id},#{templateName},#{appliedMedia},#{cleanTime},#{optimizationObjective},#{charge},
     #{conversion},#{performOperations},#{promotionGroupStatus},#{status},#{createUser},#{createId},#{createTime})
   </insert>
 
-  <!--根据创建人查询模板-->
-  <select id="getTemplateList" resultMap="templateResultMap" >
-    select t.id,t.template_name,t.applied_media,t.create_user  from ctop_kuaishou_account_clean_template t
-    <where>
-      <if test="templateId!=null and templateId!=''">
-         t.id=#{templateId}
-      </if >
-
-      <if test="createUser!=null and createUser!=''">
-        and t.create_user=#{createUser}
-      </if >
-      <if test="createId!=null and createId!=''">
-        and t.create_id=#{createId}
-      </if >
-    </where>
-  </select>
-
-   <select id="getInfoById" parameterType="String" resultMap="templateResultMap">
+    <!--根据创建人查询模板-->
+    <select id="getTemplateList" resultMap="templateResultMap">
+        select t.id,t.template_name,t.applied_media,t.create_user from ctop_kuaishou_account_clean_template t
+        <where>
+            <if test="templateId!=null and templateId!=''">
+                t.id=#{templateId}
+            </if>
+
+            <if test="createUser!=null and createUser!=''">
+                and t.create_user=#{createUser}
+            </if>
+            <if test="createId!=null and createId!=''">
+                and t.create_id=#{createId}
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="getInfoById" parameterType="String" resultMap="templateResultMap">
       select  t.id,t.template_name,t.clean_time,t.optimization_objective,t.charge,t.conversion,t.promotion_group_status,t.perform_operations  from ctop_kuaishou_account_clean_template t
       where t.id=#{templateId}
    </select>
 
-  <select id="getAccountAssociatedSize" resultType="int">
+    <select id="getAccountAssociatedSize" resultType="int">
         select count(*) from ctop_kuaishou_account_clean_center where account_id=#{accountId}
   </select>
 
-  <insert id="savePushTemplateAssociated" >
+    <insert id="savePushTemplateAssociated">
     insert into ctop_kuaishou_account_clean_center (account_id,template_id,create_time)values (#{accountId},#{templateId},#{createTime})
   </insert>
 
-  <update id="updateTemplate" >
+    <update id="updateTemplate">
     update ctop_kuaishou_account_clean_template set
     template_name=#{templateName},clean_time=#{cleanTime},
     optimization_objective=#{optimizationObjective},charge=#{charge},
@@ -74,139 +78,143 @@
     perform_operations=#{performOperations}
     where id=#{id}
   </update>
-  <update id="updateTemplateStatus" >
+    <update id="updateTemplateStatus">
     update ctop_kuaishou_account_clean_template set status=#{status}
     where id=#{templateId}
   </update>
 
-  <delete id="removeBinding">
+    <delete id="removeBinding">
     delete  from ctop_kuaishou_account_clean_center where account_id=#{accountId} and template_id=#{templateId}
   </delete>
 
-  <select id="getCleanUpLog" parameterType="cn.com.ctop.kuaishou.modules.clean.entity.KuaiShouAccountCleanLogInfo" resultMap="logResultMap">
-    select *  from  ctop_kuaishou_account_clean_logs t
-    <where>
-      <if test="accountId!=null and accountId!=''">
-        t.account_id=#{accountId}
-      </if >
-
-      <if test="userName!=null and userName!=''">
-        and t.user_name like concat('%',#{userName},'%')
-      </if >
-    </where>
-  </select>
-
-
-
-
-  <!--根据账户id 运营名称 查询个人模板信息-->
-  <select id="getMyselfTemplateList" resultMap="templateResultMap" >
-    select t.status,t.id,t.template_name,t.applied_media,t2.account_id,t3.auth_name as account_name,t3.account_status,t3.user_name from ctop_kuaishou_account_clean_template t
-    LEFT JOIN ctop_kuaishou_account_clean_center t2 on t.id=t2.template_id
-    LEFT JOIN ctop_user_allocation t3 on t2.account_id=t3.account_id
-    <where>
-        t2.account_id is not null
-      <if test="accountId!=null and accountId!=''">
-        and t2.account_id=#{accountId}
-      </if >
-
-      <if test="userName!=null and userName!=''">
-        and t3.user_name like concat('%',#{userName},'%')
-      </if >
-      <if test="createId!=null and createId!=''">
-        and t.create_id=#{createId}
-      </if >
-    </where>
-
-  </select>
-
-  <select id="getTemplateListBystatus" resultMap="templateResultMap">
+    <select id="getCleanUpLog" parameterType="cn.com.ctop.kuaishou.modules.clean.entity.KuaiShouAccountCleanLogInfo"
+            resultMap="logResultMap">
+        select * from ctop_kuaishou_account_clean_logs t
+        <where>
+            <if test="templateId!=null and templateId!=''">
+                t.template_id=#{templateId}
+            </if>
+
+            <if test="userId!=null and userId!=''">
+                and t.create_template_id =#{userId}
+            </if>
+        </where>
+    </select>
+
+
+    <!--根据账户id 运营名称 查询个人模板信息-->
+    <select id="getMyselfTemplateList" resultMap="templateResultMap">
+        select t.status,t.id,t.template_name,t.applied_media,t2.account_id,t3.auth_name as
+        account_name,t3.account_status,t3.user_name from ctop_kuaishou_account_clean_template t
+        LEFT JOIN ctop_kuaishou_account_clean_center t2 on t.id=t2.template_id
+        LEFT JOIN ctop_user_allocation t3 on t2.account_id=t3.account_id
+        <where>
+            t2.account_id is not null
+            <if test="accountId!=null and accountId!=''">
+                and t2.account_id=#{accountId}
+            </if>
+
+            <if test="userName!=null and userName!=''">
+                and t3.user_name like concat('%',#{userName},'%')
+            </if>
+            <if test="createId!=null and createId!=''">
+                and t.create_id=#{createId}
+            </if>
+        </where>
+
+    </select>
+
+    <select id="getTemplateListBystatus" resultMap="templateResultMap">
        select  t.id,t.template_name,t.clean_time,t.optimization_objective,t.charge,t.conversion,t.promotion_group_status,t.perform_operations,t2.account_id  from ctop_kuaishou_account_clean_template t
        left join  ctop_kuaishou_account_clean_center t2 on t.id=t2.template_id where t.status='0'
   </select>
 
-  <select id="getGroupMessage" resultType="java.lang.String">
+    <select id="getGroupMessage" resultType="java.lang.String">
 
-      SELECT t.unit_id from ctop_kuaishou_group  t  LEFT JOIN ctop_kuaishou_report_daily_group  t2
+        SELECT t.unit_id from ctop_kuaishou_group t LEFT JOIN ctop_kuaishou_report_daily_group t2
         on t.unit_id=t2.unit_id
         where t.account_id=#{template.accountId}
         and t.group_create_time &lt;= #{startDate}
         and t2.stat_date &gt;= #{startDate}
-       <if test="template.promotionGroupStatus!=null and template.promotionGroupStatus!='' and template.promotionGroupStatus!='3'">
-          and t.put_status=#{template.promotionGroupStatus}
-       </if >
-         group by t.unit_id
+        <if test="template.promotionGroupStatus!=null and template.promotionGroupStatus!='' and template.promotionGroupStatus!='3'">
+            and t.put_status=#{template.promotionGroupStatus}
+        </if>
+        group by t.unit_id
         having sum(t2.charge) &lt;= #{template.charge}
-      <foreach item="item" index="index" collection="list"  open="and (" separator="or" close=")">
-
-          <if test='item=="activation"'>
-              /* 激活数*/
-              sum(t2.activation) &lt; #{template.conversion}
-          </if >
-
-          <if test='item=="bclick"'>
-              /*行为数*/
-              sum(t2.bclick) &lt; #{template.conversion}
-          </if >
-
-          <if test='item=="formSize"'>
-              /*表单数*/
-              sum(t2.form_count) &lt; #{template.conversion}
-          </if >
-
-          <if test='item=="pay"'>
-              /*付费数*/
-              sum(t2.event_pay) &lt; #{template.conversion}
-          </if >
-
-          <if test='item=="roi"'>
-              /*首日roi*/
-              sum(t2.event_pay_first_day_roi) &lt; #{template.conversion}
-          </if >
-
-          <if test='item=="evocativeApplication"'>
-              /*唤起应用*/
-              sum(t2.event_app_invoked) &lt; #{template.conversion}
-          </if >
-
-          <if test='item=="effectiveClues"'>
-              /*落地页有效线索*/
-              sum(t2.event_valid_clues) &lt; #{template.conversion}
-          </if >
-
-          <if test='item=="creditApp"'>
-              /*授信数APP*/
-              sum(t2.event_credit_grant_app) &lt; #{template.conversion}
-          </if >
-
-          <if test='item=="creditGrant"'>
-              /*落地页授信数*/
-              sum(t2.event_credit_grant_landing_page) &lt; #{template.conversion}
-          </if >
-
-          <if test='item=="finishedPieceApp"'>
-              /*完件数App*/
-              sum(t2.event_jin_jian_app) &lt; #{template.conversion}
-          </if >
-
-          <if test='item=="finishedPieceGrant"'>
-              /*落地页完件数*/
-              sum(t2.event_jin_jian_landing_page) &lt; #{template.conversion}
-          </if >
-
-          <if test='item=="registered"'>
-              /*注册*/
-              sum(t2.event_register) &lt; #{template.conversion}
-          </if >
-      </foreach>
-
-  </select>
-
-  <select id="getUserNameByAccountId" resultType="Map">
+        <foreach item="item" index="index" collection="list" open="and (" separator="or" close=")">
+
+            <if test='item=="activation"'>
+                /* 激活数*/
+                sum(t2.activation) &lt; #{template.conversion}
+            </if>
+
+            <if test='item=="bclick"'>
+                /*行为数*/
+                sum(t2.bclick) &lt; #{template.conversion}
+            </if>
+
+            <if test='item=="formSize"'>
+                /*表单数*/
+                sum(t2.form_count) &lt; #{template.conversion}
+            </if>
+
+            <if test='item=="pay"'>
+                /*付费数*/
+                sum(t2.event_pay) &lt; #{template.conversion}
+            </if>
+
+            <if test='item=="roi"'>
+                /*首日roi*/
+                sum(t2.event_pay_first_day_roi) &lt; #{template.conversion}
+            </if>
+
+            <if test='item=="evocativeApplication"'>
+                /*唤起应用*/
+                sum(t2.event_app_invoked) &lt; #{template.conversion}
+            </if>
+
+            <if test='item=="effectiveClues"'>
+                /*落地页有效线索*/
+                sum(t2.event_valid_clues) &lt; #{template.conversion}
+            </if>
+
+            <if test='item=="creditApp"'>
+                /*授信数APP*/
+                sum(t2.event_credit_grant_app) &lt; #{template.conversion}
+            </if>
+
+            <if test='item=="creditGrant"'>
+                /*落地页授信数*/
+                sum(t2.event_credit_grant_landing_page) &lt; #{template.conversion}
+            </if>
+
+            <if test='item=="finishedPieceApp"'>
+                /*完件数App*/
+                sum(t2.event_jin_jian_app) &lt; #{template.conversion}
+            </if>
+
+            <if test='item=="finishedPieceGrant"'>
+                /*落地页完件数*/
+                sum(t2.event_jin_jian_landing_page) &lt; #{template.conversion}
+            </if>
+
+            <if test='item=="registered"'>
+                /*注册*/
+                sum(t2.event_register) &lt; #{template.conversion}
+            </if>
+        </foreach>
+
+    </select>
+
+    <select id="getUserNameByAccountId" resultType="Map">
        select t.user_name as userName,t.auth_name as authName from ctop_user_allocation t where t.account_id=#{accountId}
   </select>
 
-  <insert id="saveCleamLog" >
+    <insert id="saveCleamLog">
     insert into ctop_kuaishou_account_clean_logs (account_id,user_name,operation_type,create_time,executive_information) values (#{accountId},#{userName},#{operationType},#{createTime},#{executiveInformation})
   </insert>
+
+    <select id="getUserRealName" resultType="String">
+        select t.realname from sys_user t where t.id=#{userId}
+    </select>
 </mapper>

+ 2 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/clean/service/KuaiShouAccountCleanService.java

@@ -61,10 +61,10 @@ public interface KuaiShouAccountCleanService {
     /**
      * 查询清理记录
      *
-     * @param userName 运营名称  accountId 账户id
+     * @param templateId 模板名称  userId 账户id
      * @return
      */
-    Result getCleanUpLog(String userName, String accountId, String pageNum, String pageSize);
+    Result getCleanUpLog(String templateId, String userId, String pageNum, String pageSize);
     /**
      * 查询个人清理模板列表
      *

+ 17 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/clean/service/impl/KuaiShouAccountCleanServiceImpl.java

@@ -53,6 +53,7 @@ public class KuaiShouAccountCleanServiceImpl implements KuaiShouAccountCleanServ
         SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
         Random rand = new Random();
         int id = 100000 + rand.nextInt(99900000);
+
         //设置6-8位数字
         kuaiShouAccountCleanTemplateInfo.setId(String.valueOf(id));
         //设置应用媒体 固定写死
@@ -62,6 +63,8 @@ public class KuaiShouAccountCleanServiceImpl implements KuaiShouAccountCleanServ
         //设置创建日期
         kuaiShouAccountCleanTemplateInfo.setCreateTime(sd.format(new Date()));
         try {
+            String userRealName = kuaishouAccountCleanTemplateMapper.getUserRealName(kuaiShouAccountCleanTemplateInfo.getCreateId());
+            kuaiShouAccountCleanTemplateInfo.setCreateUser(userRealName);
             kuaishouAccountCleanTemplateMapper.saveAccountCleanTemplate(kuaiShouAccountCleanTemplateInfo);
             result.success("创建模板成功");
         } catch (Exception e) {
@@ -222,11 +225,20 @@ public class KuaiShouAccountCleanServiceImpl implements KuaiShouAccountCleanServ
     }
 
     @Override
-    public Result getCleanUpLog(String userName, String accountId, String pageNum, String pageSize) {
+    public Result getCleanUpLog(String templateId, String userId, String pageNum, String pageSize) {
         Result result = new Result();
+        List<KuaiShouAccountCleanLogInfo> cleanUpLog=new ArrayList<>();
         try {
+            //查询当前登录人角色
+            String roleCode = sysRoleService.getRoleCodeByUserId(userId);
             PageHelper.startPage(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-            List<KuaiShouAccountCleanLogInfo> cleanUpLog = kuaishouAccountCleanTemplateMapper.getCleanUpLog(userName, accountId);
+            if (roleCode != null && roleCode.equals("admin")) {
+                cleanUpLog = kuaishouAccountCleanTemplateMapper.getCleanUpLog(templateId, null);
+            }else {
+                cleanUpLog = kuaishouAccountCleanTemplateMapper.getCleanUpLog(templateId, userId);
+            }
+            PageHelper.startPage(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+
             PageInfo pageInfo = new PageInfo(cleanUpLog);
             result.success("查询成功");
             result.setResult(pageInfo);
@@ -284,7 +296,7 @@ public class KuaiShouAccountCleanServiceImpl implements KuaiShouAccountCleanServ
             List<KuaiShouAccountCleanTemplateInfo> templateListBystatus = kuaishouAccountCleanTemplateMapper.getTemplateListBystatus();
             if (!templateListBystatus.isEmpty()) {
                 templateListBystatus.stream().forEach(ob -> {
-                    if(!ob.getAccountId().isEmpty()){
+                    if(ob.getAccountId()!=null){
                         //获取各项优化目标
                         List<String> optimizationObjectiveList = Arrays.asList(ob.getOptimizationObjective().split(";"));
                         //获取清理时间范围
@@ -343,6 +355,8 @@ public class KuaiShouAccountCleanServiceImpl implements KuaiShouAccountCleanServ
                             //执行信息
                             String textMessage = "清理规则执行:  账户:" + ob.getAccountId() + ", 授权名称: " + authName + ",推广组:" + unitIds + "已经被清理规则" + operationType;
                             kuaiShouAccountCleanLogInfo.setExecutiveInformation(textMessage);
+                            kuaiShouAccountCleanLogInfo.setTemplateId(ob.getId());
+                            kuaiShouAccountCleanLogInfo.setCreateTemplateId(ob.getCreateId());
                             kuaishouAccountCleanTemplateMapper.saveCleamLog(kuaiShouAccountCleanLogInfo);
                         }
                     }