yumeng преди 4 години
родител
ревизия
d6a5edf15e
променени са 23 файла, в които са добавени 107 реда и са изтрити 191 реда
  1. 6 15
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdvertiserController.java
  2. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountLoginController.java
  3. 6 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java
  4. 4 12
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java
  5. 6 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java
  6. 16 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java
  7. 0 98
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/Advertiser.java
  8. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ProjectMember.java
  9. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/AdvertiserMapper.java
  10. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IAdvertiserService.java
  11. 7 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/AdvertiserServiceImpl.java
  12. 2 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/PerformanceSaleServiceImpl.java
  13. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectTransferRecordServiceImpl.java
  14. 2 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/service/impl/SalePerformanceDetailServiceImpl.java
  15. 1 1
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  16. 1 2
      module-common/src/main/java/cn/com/ctop/common/module/entity/Advertiser.java
  17. 2 2
      module-common/src/main/java/cn/com/ctop/common/module/entity/Product.java
  18. 9 12
      module-common/src/main/java/cn/com/ctop/common/module/entity/UserAllocation.java
  19. 11 6
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/FileInfoServiceImpl.java
  20. 5 5
      module-ctop/src/main/java/cn/com/ctop/manage/modules/material/service/impl/MaterialUploadServiceImpl.java
  21. 2 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouReportDailyMaterialMapper.xml
  22. 7 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/AccountWarningServiceImpl.java
  23. 12 2
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/ByteDanceHourlyAccountWarningServiceImpl.java

+ 6 - 15
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdvertiserController.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.ctop.controller;
 
 import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.constant.CtopRoleCodeConstant;
+import cn.com.ctop.common.module.entity.Advertiser;
 import cn.com.ctop.common.module.entity.Project;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.ProjectMapper;
@@ -28,7 +29,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.ctop.entity.Advertiser;
 import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
 import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.excelutil.entity.*;
@@ -116,14 +116,14 @@ public class AdvertiserController {
                                                    @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize,
                                                    HttpServletRequest req) {
         Result<IPage<Advertiser>> result = new Result<>();
-        String roleCode = sysRoleService.getRoleCodeByUserId(advertiser.getUserId());
-        String userId = advertiser.getUserId();
+        // String roleCode = sysRoleService.getRoleCodeByUserId(advertiser.getUserId());
+      /*  String userId = advertiser.getUserId();
         if (CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN.equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "touTiaoOperationManager".equals(roleCode) || roleCode.contains("sale") || "meidaManager".equals(roleCode)) {
             advertiser.setUserId(null);
-        }
+        }*/
 
         QueryWrapper<Advertiser> queryWrapper = QueryGenerator.initQueryWrapper(advertiser, req.getParameterMap());
-        if ("kuaishouOperationManager".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
+       /* if ("kuaishouOperationManager".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
             QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
             userCompanyQueryWrapper.eq("user_id", userId);
             userCompanyQueryWrapper.orderByDesc("create_time");
@@ -132,7 +132,7 @@ public class AdvertiserController {
             if (!Check.isNull(userCompany)) {
                 queryWrapper.eq("company_id", userCompany.getCompanyId());
             }
-        }
+        }*/
         Page<Advertiser> page = new Page<>(pageNo, pageSize);
         IPage<Advertiser> pageList = advertiserService.page(page, queryWrapper);
         result.setSuccess(true);
@@ -201,15 +201,6 @@ public class AdvertiserController {
             result.error500("未找到对应实体");
         } else {
             boolean ok = advertiserService.updateById(advertiser);
-            QueryWrapper<Project> projectQueryWrapper = new QueryWrapper<>();
-            projectQueryWrapper.eq("advertiser_id", advertiser.getId());
-            Project updateProject = new Project();
-            projectService.update(updateProject, projectQueryWrapper);
-            QueryWrapper<UserAllocation> userAllocationQueryWrapper = new QueryWrapper<>();
-            userAllocationQueryWrapper.eq("advertiser_id", advertiser.getId());
-            UserAllocation updateUserAllocation = new UserAllocation();
-            updateUserAllocation.setAdvertiserName(advertiser.getName());
-            userAllocationService.update(updateUserAllocation, userAllocationQueryWrapper);
             if (ok) {
                 result.success("修改成功!");
             }

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountLoginController.java

@@ -91,10 +91,10 @@ public class BindAccountLoginController {
             userAllocation.setUserId(userId);
             userAllocation.setAdvertiserId(advertiserId);
             userAllocation.setAccountId(accountId);
-            userAllocation.setAdvertiserName(advertiserName);
+          //  userAllocation.setAdvertiserName(advertiserName);
             userAllocation.setAccountName(accountName);
             userAllocation.setProjectId(projectId);
-            userAllocation.setProjectName(projectName);
+            // userAllocation.setProjectName(projectName);
             userAllocation.setMediaId(mediaId);
             userAllocation.setSystemType(systemType);
             int i = userAllocationMapper.insert(userAllocation);

+ 6 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java

@@ -184,11 +184,11 @@ public class CallbackController {
                     if ((Integer) advertiseBaseInfoMap.get("code") == 0) {
                         userAllocation.setAuthName((String) advertiseBaseInfoMap.get("userName"));
                     }
-                    userAllocation.setAdvertiserName(advertiserName);
+               //     userAllocation.setAdvertiserName(advertiserName);
                     userAllocation.setMediaId(mediaId);
                     userAllocation.setAccountId(accountId);
                     userAllocation.setProjectId(projectId);
-                    userAllocation.setProjectName(projectName);
+                 //   userAllocation.setProjectName(projectName);
                     userAllocation.setWarningProportion(warningProportion);
                     userAllocation.setWarningAmount(warningAmount);
 
@@ -344,10 +344,10 @@ public class CallbackController {
                             userAllocation.setUserId(userId);
                             userAllocation.setUserName(userName);
                             userAllocation.setAccountId(token.getAccountId());
-                            userAllocation.setAdvertiserName(advertiserName);
+                       //     userAllocation.setAdvertiserName(advertiserName);
                             userAllocation.setMediaId(mediaId);
                             userAllocation.setProjectId(projectId);
-                            userAllocation.setProjectName(projectName);
+                         //   userAllocation.setProjectName(projectName);
                             userAllocation.setSystemType(systemType);
                             userAllocation.setAuthName((String) advertiserDataMap.get("name"));
                             userAllocation.setAdvertiserId(advertiserId);
@@ -398,10 +398,10 @@ public class CallbackController {
                     userAllocation.setUserId(userId);
                     userAllocation.setUserName(userName);
                     userAllocation.setAccountId(token.getAccountId());
-                    userAllocation.setAdvertiserName(advertiserName);
+               //     userAllocation.setAdvertiserName(advertiserName);
                     userAllocation.setMediaId(mediaId);
                     userAllocation.setProjectId(projectId);
-                    userAllocation.setProjectName(projectName);
+                //    userAllocation.setProjectName(projectName);
                     userAllocation.setSystemType(systemType);
                     userAllocation.setAuthName((String) advertiserDataMap.get("name"));
                     userAllocation.setAdvertiserId(advertiserId);

+ 4 - 12
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -2,7 +2,10 @@ package org.jeecg.modules.ctop.controller;
 
 import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.constant.CtopRoleCodeConstant;
-import cn.com.ctop.common.module.entity.*;
+import cn.com.ctop.common.module.entity.Advertiser;
+import cn.com.ctop.common.module.entity.MaterialInfo;
+import cn.com.ctop.common.module.entity.Project;
+import cn.com.ctop.common.module.entity.SupplierList;
 import cn.com.ctop.common.module.mapper.ProjectMapper;
 import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.utils.Check;
@@ -16,14 +19,12 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.ctop.entity.Advertiser;
 import org.jeecg.modules.ctop.entity.ProjectMember;
 import org.jeecg.modules.ctop.entity.TransferAccount;
 import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
 import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecg.modules.ctop.service.ITransferAccountService;
-import org.jeecg.modules.system.entity.SysCategory;
 import org.jeecg.modules.system.service.ISysCategoryService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -339,7 +340,6 @@ public class ProjectController {
                 projectMemberService.removeByMap(map);
                 ProjectMember member = new ProjectMember();
                 member.setProjectId(id);
-                member.setProjectName(project.getProjectName());
                 member.setUserId(userId);
                 member.setUserName(userName);
                 String roleCode = sysRoleService.getRoleCodeByUserId(userId);
@@ -393,20 +393,12 @@ public class ProjectController {
             result.error500("未找到对应实体");
         } else {
             boolean ok = projectService.updateById(project);
-
             QueryWrapper<ProjectMember> memberQueryWrapper = new QueryWrapper<>();
             memberQueryWrapper.eq("project_id", project.getId());
             ProjectMember updateMember = new ProjectMember();
             updateMember.setProjectName(project.getProjectName());
             projectMemberService.update(updateMember, memberQueryWrapper);
 
-            QueryWrapper<UserAllocation> userAllocationQueryWrapper = new QueryWrapper<>();
-            userAllocationQueryWrapper.eq("project_id", project.getId());
-            UserAllocation updateUserAllocation = new UserAllocation();
-            updateUserAllocation.setProjectName(project.getProjectName());
-            // updateUserAllocation.setMediaId(project.getMediaId());
-            userAllocationService.update(updateUserAllocation, userAllocationQueryWrapper);
-
             if (!projectEntity.getSupplierCode().equals(project.getSupplierCode())) {
                 QueryWrapper<MaterialInfo> materialInfoQueryWrapper = new QueryWrapper<>();
                 materialInfoQueryWrapper.eq("project_id", project.getId());

+ 6 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.entity.Advertiser;
 import cn.com.ctop.common.module.entity.Project;
 import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.service.IProjectService;
@@ -18,7 +19,6 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.ctop.entity.Advertiser;
 import org.jeecg.modules.ctop.entity.ProjectMember;
 import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
 import org.jeecg.modules.ctop.service.IAdvertiserService;
@@ -190,6 +190,7 @@ public class ProjectMemberController {
         queryWrapper.orderByDesc("create_time");
 
 
+
         Page<ProjectMember> page = new Page<>(pageNo, pageSize);
         IPage<ProjectMember> pageList = projectMemberService.page(page, queryWrapper);
         List<ProjectMember> projectMembers = pageList.getRecords();
@@ -202,12 +203,12 @@ public class ProjectMemberController {
                 Project project = projectService.getById(member.getProjectId());
                 if (!Check.isNull(project)) {
                     SysUser responsible = sysUserService.getById(project.getResponsibleId());
-                    projectMember.setResponsibleName(responsible.getRealname());
+                    member.setResponsibleName(responsible.getRealname());
                     SysUser designResponsible = sysUserService.getById(project.getDesignResponsibleId());
-                    projectMember.setDesignResponsibleName(designResponsible.getRealname());
+                    member.setDesignResponsibleName(designResponsible.getRealname());
                     Advertiser advertiser = advertiserService.getById(project.getAdvertiserId());
-                    projectMember.setAdvertiserName(advertiser.getName());
-                    projectMember.setAdvertiserId(project.getAdvertiserId());
+                    member.setAdvertiserName(advertiser.getName());
+                    member.setAdvertiserId(project.getAdvertiserId());
                     member.setAdvertiserId(project.getAdvertiserId());
                     member.setMediaId(project.getMediaId());
                     member.setMaxBid(project.getMaxBid());

+ 16 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java

@@ -20,7 +20,6 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.ctop.entity.Advertiser;
 import org.jeecg.modules.ctop.entity.ProjectMember;
 import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
 import org.jeecg.modules.ctop.service.IAdvertiserService;
@@ -86,11 +85,8 @@ public class UserAllocationController {
             }
             userAllocations.setAccountStatus(1);
             userAllocations.setProjectId(projectId);
-            userAllocations.setProjectName(project.getProjectName());
             userAllocations.setMediaId(project.getMediaId());
             userAllocations.setAdvertiserId(project.getAdvertiserId());
-            Advertiser advertiser = advertiserService.getById(project.getAdvertiserId());
-            userAllocations.setAdvertiserName(advertiser.getName());
             userAllocationService.save(userAllocations);
             QueryWrapper<ProjectMember> memberQueryWrapper = new QueryWrapper<>();
             memberQueryWrapper.eq("user_id", userAllocations.getUserId());
@@ -229,6 +225,20 @@ public class UserAllocationController {
         }
         Page<UserAllocation> page = new Page<>(pageNo, pageSize);
         IPage<UserAllocation> pageList = userAllocationService.page(page, queryWrapper);
+       /* List<UserAllocation> records = pageList.getRecords();
+        if (!Check.isNull(records)) {
+            for (UserAllocation allocation : records) {
+                Advertiser advertiser = advertiserService.getById(allocation.getAdvertiserId());
+                if (!Check.isNull(advertiser)) {
+                    allocation.setAdvertiserName(advertiser.getName());
+                }
+                Project project = projectService.getById(allocation.getProjectId());
+                if (!Check.isNull(project)) {
+                    allocation.setProjectName(project.getProjectName());
+                }
+            }
+
+        }*/
         result.setSuccess(true);
         result.setResult(pageList);
         return result;
@@ -280,7 +290,8 @@ public class UserAllocationController {
             if (Check.isNull(member)) {
                 ProjectMember addMember = new ProjectMember();
                 addMember.setProjectId(update.getProjectId());
-                addMember.setProjectName(update.getProjectName());
+                Project project = projectService.getById(update.getProjectId());
+                addMember.setProjectName(project.getProjectName());
                 addMember.setUserId(update.getUserId());
                 addMember.setUserName(update.getUserName());
                 String roleCode = sysRoleService.getRoleCodeByUserId(update.getUserId());

+ 0 - 98
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/Advertiser.java

@@ -1,98 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import cn.com.ctop.common.module.annotation.Dict;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 广告主信息表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-06-11
- */
-@Data
-@TableName("ctop_advertiser")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_advertiser对象", description = "广告主信息表")
-public class Advertiser {
-    /**
-     * 主键ID
-     */
-    @TableId(type = IdType.UUID)
-    @ApiModelProperty(value = "主键ID")
-    private String id;
-    /**
-     * 广告主名称
-     */
-    @Excel(name = "广告主名称", width = 15)
-    @ApiModelProperty(value = "广告主名称")
-    private String name;
-
-
-    /**
-     * 联系人姓名
-     */
-    @Excel(name = "联系人姓名", width = 15)
-    @ApiModelProperty(value = "联系人姓名")
-    private String contact;
-    /**
-     * 联系人手机
-     */
-    @Excel(name = "联系人手机", width = 15)
-    @ApiModelProperty(value = "联系人手机")
-    private String mobile;
-    /**
-     * 联系人邮箱
-     */
-    @Excel(name = "联系人邮箱", width = 15)
-    @ApiModelProperty(value = "联系人邮箱")
-    private String email;
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人", width = 15)
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    /**
-     * 修改人
-     */
-    @Excel(name = "修改人", width = 15)
-    @ApiModelProperty(value = "修改人")
-    private String updateBy;
-    /**
-     * 修改时间
-     */
-    @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-    private String userId;
-
-    private String companyId;
-
-
-
-}

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ProjectMember.java

@@ -1,6 +1,5 @@
 package org.jeecg.modules.ctop.entity;
 
-import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -76,6 +75,7 @@ public class ProjectMember implements  Serializable{
 
     @TableField(exist = false)
     private String advertiserName;
+
     @TableField(exist = false)
     private String advertiserId;
 

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/AdvertiserMapper.java

@@ -1,9 +1,9 @@
 package org.jeecg.modules.ctop.mapper;
 
+import cn.com.ctop.common.module.entity.Advertiser;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.ctop.entity.Advertiser;
 import org.jeecg.modules.excelutil.entity.KuaishouXxlEntity;
 import org.jeecg.modules.excelutil.entity.YdPlanAggregateEntity;
 import org.jeecg.modules.excelutil.entity.YdWeekAggregateEntity;
@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * @Description: 广告主信息表
  * @Author: jeecg-boot
- * @Date:   2019-06-11
+ * @Date: 2019-06-11
  * @Version: V1.0
  */
 public interface AdvertiserMapper extends BaseMapper<Advertiser> {

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IAdvertiserService.java

@@ -1,9 +1,9 @@
 package org.jeecg.modules.ctop.service;
 
+import cn.com.ctop.common.module.entity.Advertiser;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.vo.SheetInfoVo;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.ctop.entity.Advertiser;
 
 import java.text.ParseException;
 import java.util.List;
@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * @Description: 广告主信息表
  * @Author: jeecg-boot
- * @Date:   2019-06-11
+ * @Date: 2019-06-11
  * @Version: V1.0
  */
 public interface IAdvertiserService extends IService<Advertiser> {

+ 7 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/AdvertiserServiceImpl.java

@@ -1,12 +1,12 @@
 package org.jeecg.modules.ctop.service.impl;
 
+import cn.com.ctop.common.module.entity.Advertiser;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.vo.SheetInfoVo;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.ctop.entity.Advertiser;
 import org.jeecg.modules.ctop.mapper.AdvertiserMapper;
 import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.excelutil.entity.KuaishouXxlEntity;
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
 /**
  * @Description: 广告主信息表
  * @Author: jeecg-boot
- * @Date:   2019-06-11
+ * @Date: 2019-06-11
  * @Version: V1.0
  */
 @Service
@@ -34,6 +34,7 @@ public class AdvertiserServiceImpl extends ServiceImpl<AdvertiserMapper, Adverti
 
     @Autowired
     private AdvertiserMapper advertiserMapper;
+
     @Override
     public List<Advertiser> getBySaleId(String saleId) {
         QueryWrapper<Advertiser> queryWrapper = new QueryWrapper<>();
@@ -62,10 +63,10 @@ public class AdvertiserServiceImpl extends ServiceImpl<AdvertiserMapper, Adverti
 
     @Override
     public List<SheetInfoVo> getSystemTypeXxlStatisticInfo(Long projectId) {
-        List<SheetInfoVo>vos = new ArrayList<>();
-        SheetInfoVo android = getXxlStatisticInfo(projectId,"android",null,"android汇总表");
+        List<SheetInfoVo> vos = new ArrayList<>();
+        SheetInfoVo android = getXxlStatisticInfo(projectId, "android", null, "android汇总表");
         vos.add(android);
-        SheetInfoVo ios = getXxlStatisticInfo(projectId,"ios",null,"ios汇总表");
+        SheetInfoVo ios = getXxlStatisticInfo(projectId, "ios", null, "ios汇总表");
         vos.add(ios);
         return vos;
     }
@@ -115,7 +116,7 @@ public class AdvertiserServiceImpl extends ServiceImpl<AdvertiserMapper, Adverti
 
     private List<YdPlanAggregateEntity> getYdPlanStatisticInfo(Long projectId, String startDate, String endDate) {
         List<YdPlanAggregateEntity> result = new ArrayList<>();
-        List<UserAllocation> allocations = userAllocationService.getByParams(projectId, null,null);
+        List<UserAllocation> allocations = userAllocationService.getByParams(projectId, null, null);
         if (null != allocations && !allocations.isEmpty()) {
             allocations.forEach(allocation -> {
                 List<YdPlanAggregateEntity> plans = statisticWeekInfoByAccount(allocation, startDate, endDate);

+ 2 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/PerformanceSaleServiceImpl.java

@@ -1,12 +1,13 @@
 package org.jeecg.modules.ctop.service.impl;
 
+import cn.com.ctop.common.module.entity.Advertiser;
 import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.performanceappraisal.service.IPerformanceService;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.ctop.entity.Advertiser;
+
 import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.ctop.service.IPerformanceSaleService;
 import org.jeecg.modules.performance.entity.SalePerformanceDetail;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectTransferRecordServiceImpl.java

@@ -56,7 +56,7 @@ public class ProjectTransferRecordServiceImpl extends ServiceImpl<ProjectTransfe
             SysUser user = sysUserService.getById(record.getUserId());
             Project project = projectService.getById(record.getTargetProject());
             userAllocation.setProjectId(project.getId());
-            userAllocation.setProjectName(project.getProjectName());
+       //     userAllocation.setProjectName(project.getProjectName());
             userAllocationService.updateById(userAllocation);
             ProjectMember member = projectMemberService.getProjectByParams(record.getTargetProject(),record.getUserId());
             if(null == member){

+ 2 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/service/impl/SalePerformanceDetailServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.performance.service.impl;
 
+import cn.com.ctop.common.module.entity.Advertiser;
 import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
@@ -8,7 +9,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.ctop.entity.Advertiser;
+
 import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.performance.constants.RateConstant;
 import org.jeecg.modules.performance.entity.SalePerformanceDetail;

+ 1 - 1
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -72,7 +72,7 @@ public class SampleTest {
         queryWrapper.eq("media_id", 2);
         List<CtopOauthToken> list = oauthTokenService.list(queryWrapper);
         for (CtopOauthToken token : list) {
-            kuaiShouHistoryReportTaskService.createTask(token.getAccountId(), token.getAccessToken(), "2020-03-09", "2020-09-08", "history");
+            kuaiShouHistoryReportTaskService.createTask(token.getAccountId(), token.getAccessToken(), "2020-03-10", "2020-09-10", "history");
 
         }
 

+ 1 - 2
module-common/src/main/java/cn/com/ctop/common/module/entity/Advertiser.java

@@ -1,8 +1,6 @@
 package cn.com.ctop.common.module.entity;
 
-import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -89,6 +87,7 @@ public class Advertiser {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
+
     private String userId;
 
     private String companyId;

+ 2 - 2
module-common/src/main/java/cn/com/ctop/common/module/entity/Product.java

@@ -54,8 +54,8 @@ public class Product {
     @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     private String userId;
 
-    @Dict(dicCode = "code", dictTable = "sys_category", dicText = "name")
-    private String industryCode;
+    @Dict(dicCode = "id", dictTable = "sys_category", dicText = "name")
+    private String industryId;
     /**
      * 1正常0删除
      */

+ 9 - 12
module-common/src/main/java/cn/com/ctop/common/module/entity/UserAllocation.java

@@ -1,5 +1,6 @@
 package cn.com.ctop.common.module.entity;
 
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -59,6 +60,7 @@ public class UserAllocation implements Serializable {
      */
     @Excel(name = "广告主ID", width = 15)
     @ApiModelProperty(value = "广告主ID")
+    @Dict(dicCode = "id", dictTable = "ctop_advertiser", dicText = "name")
     private String advertiserId;
 
     private String systemType;
@@ -66,27 +68,16 @@ public class UserAllocation implements Serializable {
     /**
      * 项目id
      */
+    @Dict(dicCode = "id", dictTable = "ctop_project", dicText = "project_name")
     private Long projectId;
 
     /**
-     * 项目名称
-     */
-    private String projectName;
-
-    /**
-     * 广告主名称
-     */
-    @Excel(name = "广告主名称", width = 15)
-    @ApiModelProperty(value = "广告主名称")
-    private String advertiserName;
-    /**
      * 输入账号  --登陆
      */
     @Excel(name = "输入账号  --登陆", width = 15)
     @ApiModelProperty(value = "输入账号  --登陆")
     private String accountName;
 
-
     /**
      * 预警 金额
      */
@@ -135,4 +126,10 @@ public class UserAllocation implements Serializable {
     @ApiModelProperty(value = "平台类型 1 头条 2快手")
     private String mediaId;
 
+   /* @TableField(exist = false)
+    private String advertiserName;
+
+    @TableField(exist = false)
+    private String projectName;*/
+
 }

+ 11 - 6
module-common/src/main/java/cn/com/ctop/common/module/service/impl/FileInfoServiceImpl.java

@@ -2,6 +2,7 @@ package cn.com.ctop.common.module.service.impl;
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.FileInfo;
+import cn.com.ctop.common.module.entity.Project;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.FileInfoMapper;
 import cn.com.ctop.common.module.service.*;
@@ -60,6 +61,8 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
     private IMessageTemplate messageTemplate;
     @Autowired
     private ISendMessageService sendMessageService;
+    @Autowired
+    private IProjectService projectService;
 
     @Override
     public void uploadVideoToBytedance(String accountId, String videoUrl, String userId, String materialName) {
@@ -73,11 +76,12 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
                 } else {
                     log.error("头条上传素材失败,返回信息:{},accountId:{}", jsonObject, accountId);
                     UserAllocation allocation = userAllocationService.getByAccountId(Long.valueOf(accountId));
-                    String message = messageTemplate.getMaterialSyncTemplate(allocation.getProjectName(), Long.valueOf(accountId), allocation.getAuthName(), materialName, jsonObject.getString("message"));
+                    Project project = projectService.getById(allocation.getProjectId());
+                    String message = messageTemplate.getMaterialSyncTemplate(project.getProjectName(), Long.valueOf(accountId), allocation.getAuthName(), materialName, jsonObject.getString("message"));
                     sendMessageService.sendMessage(userId, message);
                 }
 
-            }else{
+            } else {
                 log.info("头条上传素材返回结果为空,返回信息:{},accountId:{}", jsonObject, accountId);
             }
 
@@ -137,11 +141,11 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
                 JSONObject getWord = (JSONObject) word;
                 String name = getWord.getString("name");
                 getWord.remove("words");
-                getWord.put("name",name);
+                getWord.put("name", name);
                 getWord.remove("words");
                 getWord.remove("max_word_len");
                 String status = getWord.getString("status");
-                if(null!=status&&status.trim().equals("CREATIVE_WORD_STATUS_APPROVE")){
+                if (null != status && status.trim().equals("CREATIVE_WORD_STATUS_APPROVE")) {
                     array.add(getWord);
                 }
             });
@@ -152,17 +156,18 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
 
     /**
      * 行动号召数据获取
+     *
      * @return
      */
     @Override
-    public JSONObject getActionText(Long accountId,String landingType) {
+    public JSONObject getActionText(Long accountId, String landingType) {
         CtopOauthToken token = ctopOauthTokenService.getTokenByAccountId(accountId);
         // 请求地址
         String url = "https://ad.oceanengine.com/open_api/2/tools/action_text/get/";
         // 请求参数
         JSONObject data = new JSONObject();
         data.put("advertiser_id", accountId);
-        data.put("landing_type",landingType);
+        data.put("landing_type", landingType);
         return HttpUtils.bytedanceGetRequest(token.getAccessToken(), url, data);
     }
 

+ 5 - 5
module-ctop/src/main/java/cn/com/ctop/manage/modules/material/service/impl/MaterialUploadServiceImpl.java

@@ -1,9 +1,6 @@
 package cn.com.ctop.manage.modules.material.service.impl;
 
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.entity.MaterialInfo;
-import cn.com.ctop.common.module.entity.MaterialParameter;
-import cn.com.ctop.common.module.entity.UserAllocation;
+import cn.com.ctop.common.module.entity.*;
 import cn.com.ctop.common.module.enums.MaterialEnum;
 import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
 import cn.com.ctop.common.module.mapper.MaterialInfoMapper;
@@ -65,6 +62,8 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
     private IUserAllocationService userAllocationService;
     @Autowired
     private IKuaishouInterfaceService kuaishouInterfaceService;
+    @Autowired
+    private IProjectService projectService;
 
 
     /**
@@ -236,7 +235,8 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
                                         log.error("快手同步素材失败,返回信息:{},请求参数:{}", resultJson, requestJson);
                                         //  发送消息到上传人
                                         UserAllocation allocation = userAllocationService.getByAccountId(accountId);
-                                        String message = messageTemplate.getMaterialSyncTemplate(allocation.getProjectName(), accountId, allocation.getAuthName(), materialInfo.getMaterialName(), resultJson.getString("message"));
+                                        Project project = projectService.getById(allocation.getProjectId());
+                                        String message = messageTemplate.getMaterialSyncTemplate(project.getProjectName(), accountId, allocation.getAuthName(), materialInfo.getMaterialName(), resultJson.getString("message"));
                                         sendMessageService.sendMessage(userId, message);
                                     }
                                 }

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

@@ -12,8 +12,8 @@
 		cover_url,
 		photo_url,
 		@photo_caption,
-		creative_material_type_string,
-        ad_scene,
+		@creative_material_type_string,
+        @ad_scene,
         charge,
         photo_show,
         aclick,

+ 7 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/AccountWarningServiceImpl.java

@@ -1,9 +1,11 @@
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 
 import cn.com.ctop.common.module.entity.MailLog;
+import cn.com.ctop.common.module.entity.Project;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.MailLogMapper;
 import cn.com.ctop.common.module.mapper.UserAllocationMapper;
+import cn.com.ctop.common.module.service.IProjectService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.CorpWexinUtils;
 import cn.com.ctop.common.module.utils.SendMailUtil;
@@ -28,6 +30,8 @@ public class AccountWarningServiceImpl implements IAccountWarningService {
     private UserAllocationMapper userAllocationMapper;
     @Autowired
     private MailLogMapper mailLogMapper;
+    @Autowired
+    private IProjectService projectService;
 
 
     /**
@@ -55,6 +59,7 @@ public class AccountWarningServiceImpl implements IAccountWarningService {
             if (userAllocation.getAccountStatus() == 1) {
                 return;
             }
+            Project project = projectService.getById(userAllocation.getProjectId());
             BigDecimal warningAmount = userAllocation.getWarningAmount();
             BigDecimal warningProportion = userAllocation.getWarningProportion();
             BigDecimal nowCost = hourlyAccountMapper.getCost(accountId, maxHour, statDate);
@@ -65,7 +70,7 @@ public class AccountWarningServiceImpl implements IAccountWarningService {
                         BigDecimal subtract = nowCost.subtract(lastHourCost);
                         BigDecimal divide = nowCost.divide(lastHourCost, 2, RoundingMode.HALF_UP);
                         if (subtract.compareTo(warningAmount) > -1 && divide.compareTo(warningProportion) > -1) {
-                            sendMessage(accountId, userAllocation.getAuthName(), maxHour, nowCost, userAllocation.getProjectId(), userAllocation.getProjectName());
+                            sendMessage(accountId, userAllocation.getAuthName(), maxHour, nowCost, userAllocation.getProjectId(), project.getProjectName());
                         }
                     }
                 }
@@ -77,7 +82,7 @@ public class AccountWarningServiceImpl implements IAccountWarningService {
                     BigDecimal subtract = nowCost.subtract(yesterdayHourCost);
                     BigDecimal divide = nowCost.divide(yesterdayHourCost, 2, RoundingMode.HALF_UP);
                     if (subtract.compareTo(warningAmount) > -1 && divide.compareTo(warningProportion) > -1) {
-                        sendYesterdayMessage(accountId, userAllocation.getAuthName(), maxHour, nowCost, userAllocation.getProjectId(), userAllocation.getProjectName());
+                        sendYesterdayMessage(accountId, userAllocation.getAuthName(), maxHour, nowCost, userAllocation.getProjectId(), project.getProjectName());
                     }
                 }
             }

+ 12 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/ByteDanceHourlyAccountWarningServiceImpl.java

@@ -1,8 +1,10 @@
 package cn.com.ctop.toutiao.modules.report.service.impl;
 
 import cn.com.ctop.common.module.entity.MailLog;
+import cn.com.ctop.common.module.entity.Project;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.MailLogMapper;
+import cn.com.ctop.common.module.service.IProjectService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.CorpWexinUtils;
@@ -31,6 +33,9 @@ public class ByteDanceHourlyAccountWarningServiceImpl implements IByteDanceHourl
     private IUserAllocationService userAllocationService;
     @Autowired
     private MailLogMapper mailLogMapper;
+    @Autowired
+    private IProjectService projectService;
+
     /**
      * 头条账户 出价预警
      *
@@ -47,6 +52,10 @@ public class ByteDanceHourlyAccountWarningServiceImpl implements IByteDanceHourl
             if (Check.isNull(userAllocation)) {
                 return;
             }
+
+            Project project = projectService.getById(userAllocation.getProjectId());
+
+
             if (userAllocation.getAccountStatus() == 1) {
                 return;
             }
@@ -61,7 +70,7 @@ public class ByteDanceHourlyAccountWarningServiceImpl implements IByteDanceHourl
                         BigDecimal subtract = nowCost.subtract(lastHourCost);
                         BigDecimal divide = nowCost.divide(lastHourCost, 2, RoundingMode.HALF_UP);
                         if (subtract.compareTo(warningAmount) > -1 && divide.compareTo(warningProportion) > -1) {
-                            sendMessage(accountId, userAllocation.getAuthName(), maxHour, cost, userAllocation.getProjectId(), userAllocation.getProjectName());
+                            sendMessage(accountId, userAllocation.getAuthName(), maxHour, cost, userAllocation.getProjectId(), project.getProjectName());
                         }
                     }
                 }
@@ -73,7 +82,7 @@ public class ByteDanceHourlyAccountWarningServiceImpl implements IByteDanceHourl
                     BigDecimal subtract = nowCost.subtract(yesterdayHourCost);
                     BigDecimal divide = nowCost.divide(yesterdayHourCost, 2, RoundingMode.HALF_UP);
                     if (subtract.compareTo(warningAmount) > -1 && divide.compareTo(warningProportion) > -1) {
-                        sendYesterdayMessage(accountId, userAllocation.getAuthName(), maxHour, cost, userAllocation.getProjectId(), userAllocation.getProjectName());
+                        sendYesterdayMessage(accountId, userAllocation.getAuthName(), maxHour, cost, userAllocation.getProjectId(), project.getProjectName());
                     }
                 }
             }
@@ -118,6 +127,7 @@ public class ByteDanceHourlyAccountWarningServiceImpl implements IByteDanceHourl
             CorpWexinUtils.sendMessage(wexinIds, text.toString());
         }
     }
+
     private void sendMessage(Long accountId, String authName, Integer hour, BigDecimal amount, Long projectId, String projectName) {
 
         StringBuilder text = new StringBuilder();