瀏覽代碼

Merge branch 'test'

songyh 4 年之前
父節點
當前提交
a0360e2e8b
共有 33 個文件被更改,包括 794 次插入42 次删除
  1. 0 6
      jeecg-boot-module-system/src/main/java/org/jeecg/config/WebMvcConfiguration.java
  2. 13 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java
  3. 66 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialInfoController.java
  4. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java
  5. 28 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
  6. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/MaterialInfo.java
  7. 7 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/UserAllocation.java
  8. 9 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/SysUserMapper.java
  9. 15 1
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialInfoMapper.xml
  10. 11 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SysUserMapper.xml
  11. 2 0
      module-common/src/main/java/cn/com/ctop/common/module/service/ISysUserService.java
  12. 10 3
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java
  13. 24 0
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/SysUserServiceImpl.java
  14. 28 0
      module-common/src/main/java/cn/com/ctop/common/module/utils/StringUtils.java
  15. 3 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java
  16. 69 10
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/controller/BytedanceVideoSlogenInfoController.java
  17. 2 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/mapper/ByteDanceCreativeWordPackageMapper.java
  18. 2 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/mapper/BytedanceVideoSlogenInfoMapper.java
  19. 5 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/mapper/xml/ByteDanceCreativeWordPackageMapper.xml
  20. 8 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/mapper/xml/BytedanceVideoSlogenInfoMapper.xml
  21. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/IByteDanceCreativeWordPackageService.java
  22. 2 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/IBytedanceVideoSlogenInfoService.java
  23. 4 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/ByteDanceCreativeWordPackageServiceImpl.java
  24. 2 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/BytedanceImageInfoServiceImpl.java
  25. 10 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/BytedanceVideoSlogenInfoServiceImpl.java
  26. 236 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/operation/controller/BytedanceOperationLogController.java
  27. 61 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/operation/entity/BytedanceOperationLog.java
  28. 17 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/operation/mapper/BytedanceOperationLogMapper.java
  29. 5 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/operation/mapper/xml/BytedanceOperationLogMapper.xml
  30. 14 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/operation/service/IBytedanceOperationLogService.java
  31. 19 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/operation/service/impl/BytedanceOperationLogServiceImpl.java
  32. 108 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/operation/util/GetChangeDateUtil.java
  33. 4 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/ReportServiceImpl.java

+ 0 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/config/WebMvcConfiguration.java

@@ -1,8 +1,6 @@
 package org.jeecg.config;
 package org.jeecg.config;
 
 
-import org.jeecg.config.interceptors.BrowseLogHandelInterceptor;
 import org.jeecg.modules.shiro.authc.interceptor.OnlineInterceptor;
 import org.jeecg.modules.shiro.authc.interceptor.OnlineInterceptor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Configuration;
@@ -22,10 +20,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
  */
  */
 @Configuration
 @Configuration
 public class WebMvcConfiguration implements WebMvcConfigurer {
 public class WebMvcConfiguration implements WebMvcConfigurer {
-
-	@Autowired
-	BrowseLogHandelInterceptor browseLogHandelInterceptor;
-
 	@Value("${jeecg.path.upload}")
 	@Value("${jeecg.path.upload}")
 	private String upLoadPath;
 	private String upLoadPath;
 	@Value("${jeecg.path.webapp}")
 	@Value("${jeecg.path.webapp}")

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

@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.IOException;
@@ -50,7 +51,7 @@ public class CallbackController {
     private IKuaishouInterfaceService kuaishouInterfaceService;
     private IKuaishouInterfaceService kuaishouInterfaceService;
     @Autowired
     @Autowired
     private IBindAccountAuthService bindAccountAuthService;
     private IBindAccountAuthService bindAccountAuthService;
-    @Autowired
+    @Resource
     private UserAllocationMapper allocationMapper;
     private UserAllocationMapper allocationMapper;
     @Autowired
     @Autowired
     private ICtopOauthTokenService ctopOauthTokenService;
     private ICtopOauthTokenService ctopOauthTokenService;
@@ -147,6 +148,7 @@ public class CallbackController {
                     //创建人
                     //创建人
                     String userId = json.getString("userId");
                     String userId = json.getString("userId");
                     Long projectId = json.getLong("projectId");
                     Long projectId = json.getLong("projectId");
+                    String authBeginTime = json.getString("authBeginTime");
                     BigDecimal warningProportion = json.getBigDecimal("WarningProportion");
                     BigDecimal warningProportion = json.getBigDecimal("WarningProportion");
                     BigDecimal warningAmount = json.getBigDecimal("WarningAmount");
                     BigDecimal warningAmount = json.getBigDecimal("WarningAmount");
                     String systemType = json.getString("systemType");
                     String systemType = json.getString("systemType");
@@ -185,6 +187,9 @@ public class CallbackController {
                     userAllocation.setSystemType(systemType);
                     userAllocation.setSystemType(systemType);
                     // 获取快手昵称
                     // 获取快手昵称
                     userAllocation.setAuthName((String) advertiseBaseInfoMap.get("userName"));
                     userAllocation.setAuthName((String) advertiseBaseInfoMap.get("userName"));
+                    if(null!=authBeginTime&&!authBeginTime.trim().equals("")){
+                        userAllocation.setAuthBeginTime(authBeginTime);
+                    }
                     userAllocation.setMediaId(mediaId);
                     userAllocation.setMediaId(mediaId);
                     userAllocation.setAccountId(accountId);
                     userAllocation.setAccountId(accountId);
                     userAllocation.setProjectId(projectId);
                     userAllocation.setProjectId(projectId);
@@ -274,6 +279,7 @@ public class CallbackController {
             String userId = json.getString("userId");
             String userId = json.getString("userId");
             //创建人
             //创建人
             String userName = json.getString("userName");
             String userName = json.getString("userName");
+            String authBeginTime = json.getString("authBeginTime");
             Long projectId = json.getLong("projectId");
             Long projectId = json.getLong("projectId");
             BigDecimal warningProportion = json.getBigDecimal("WarningProportion");
             BigDecimal warningProportion = json.getBigDecimal("WarningProportion");
             BigDecimal warningAmount = json.getBigDecimal("WarningAmount");
             BigDecimal warningAmount = json.getBigDecimal("WarningAmount");
@@ -339,6 +345,9 @@ public class CallbackController {
                             userAllocation.setProjectId(projectId);
                             userAllocation.setProjectId(projectId);
                             userAllocation.setSystemType(systemType);
                             userAllocation.setSystemType(systemType);
                             userAllocation.setAuthName((String) advertiserDataMap.get("name"));
                             userAllocation.setAuthName((String) advertiserDataMap.get("name"));
+                            if(null!=authBeginTime&&!authBeginTime.trim().equals("")){
+                                userAllocation.setAuthBeginTime(authBeginTime);
+                            }
                             userAllocation.setAdvertiserId(advertiserId);
                             userAllocation.setAdvertiserId(advertiserId);
                             userAllocation.setWarningProportion(warningProportion);
                             userAllocation.setWarningProportion(warningProportion);
                             userAllocation.setWarningAmount(warningAmount);
                             userAllocation.setWarningAmount(warningAmount);
@@ -391,6 +400,9 @@ public class CallbackController {
                     userAllocation.setProjectId(projectId);
                     userAllocation.setProjectId(projectId);
                     userAllocation.setSystemType(systemType);
                     userAllocation.setSystemType(systemType);
                     userAllocation.setAuthName((String) advertiserDataMap.get("name"));
                     userAllocation.setAuthName((String) advertiserDataMap.get("name"));
+                    if(null!=authBeginTime&&!authBeginTime.trim().equals("")){
+                        userAllocation.setAuthBeginTime(authBeginTime);
+                    }
                     userAllocation.setAdvertiserId(advertiserId);
                     userAllocation.setAdvertiserId(advertiserId);
                     userAllocation.setWarningProportion(warningProportion);
                     userAllocation.setWarningProportion(warningProportion);
                     userAllocation.setWarningAmount(warningAmount);
                     userAllocation.setWarningAmount(warningAmount);

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

@@ -6,7 +6,9 @@ import cn.com.ctop.common.module.entity.*;
 import cn.com.ctop.common.module.enums.MaterialSupplierEnum;
 import cn.com.ctop.common.module.enums.MaterialSupplierEnum;
 import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.utils.*;
 import cn.com.ctop.common.module.utils.*;
+import cn.com.ctop.toutiao.modules.material.entity.ByteDanceCreativeWordPackage;
 import cn.com.ctop.toutiao.modules.material.entity.BytedanceVideoSlogenInfo;
 import cn.com.ctop.toutiao.modules.material.entity.BytedanceVideoSlogenInfo;
+import cn.com.ctop.toutiao.modules.material.service.IByteDanceCreativeWordPackageService;
 import cn.com.ctop.toutiao.modules.material.service.IBytedanceVideoSlogenInfoService;
 import cn.com.ctop.toutiao.modules.material.service.IBytedanceVideoSlogenInfoService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
@@ -31,6 +33,8 @@ import javax.servlet.http.HttpServletRequest;
 import java.net.URLDecoder;
 import java.net.URLDecoder;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.util.*;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 
 /**
 /**
  * 素材信息
  * 素材信息
@@ -74,7 +78,8 @@ public class MaterialInfoController {
     private IProductService productService;
     private IProductService productService;
     @Autowired
     @Autowired
     private IProjectService projectService;
     private IProjectService projectService;
-
+    @Autowired
+    private IByteDanceCreativeWordPackageService byteDanceGeneralCopywriterService;
 
 
     @GetMapping("/supplierWatermark")
     @GetMapping("/supplierWatermark")
     public Result<String> supplierWatermark(String id) {
     public Result<String> supplierWatermark(String id) {
@@ -513,8 +518,60 @@ public class MaterialInfoController {
         if (!Check.isNull(materialInfo.getSlogans())) {
         if (!Check.isNull(materialInfo.getSlogans())) {
             JSONArray slogans = materialInfo.getSlogans();
             JSONArray slogans = materialInfo.getSlogans();
             if (null != slogans && !slogans.isEmpty()) {
             if (null != slogans && !slogans.isEmpty()) {
+
+
+                for (int i = 0;i<slogans.size();i++) {
+                    JSONObject slogenInfo = slogans.getJSONObject(i);
+                    String title = slogenInfo.getString("title");
+                    title = title.trim().replaceAll("[\\{]{2,}","{");
+                    title = title.trim().replaceAll("[\\}]{2,}","}");
+                    slogenInfo.put("title",title);
+                    String reg = "\\{[\\u4e00-\\u9fa5\\-]{2,6}\\}";
+                    Pattern pattern = Pattern.compile(reg);
+                    Matcher matcher = pattern.matcher(title);
+                    JSONArray creativeWordIdsArray = new JSONArray();
+
+                    int len = StringUtils.lengthAsSlogan(title);
+                    int left = title.indexOf("{");
+                    int right = title.indexOf("}");
+                    if(left >= 0 || right >= 0){
+                        int times = 0;
+                        while (matcher.find()) { //此处find()每次被调用后,会偏移到下一个匹配
+                            times++;
+                            if(times>=3){
+                                result.setCode(500);
+                                result.setMessage("动态词包不合法,词包数量超过2个");
+                                return  result;
+                            }
+                            String matchStr = matcher.group();//获取当前匹配的值
+                            title = title.replace(matchStr,"");
+                            ByteDanceCreativeWordPackage creativeWordPackage = byteDanceGeneralCopywriterService.selectCreativeWordPackageByName(matchStr.substring(1,matchStr.length()-1));
+                            if(Check.isNull(creativeWordPackage)){
+                                result.setCode(500);
+                                result.setMessage("动态词包不合法,词包不存在或者含有单独的非词包大括号");
+                                return  result;
+                            }
+                            creativeWordIdsArray.add(creativeWordPackage.getCreativeWordId());
+                            len = len - (right - left) + creativeWordPackage.getMaxWordLen();
+                            left = title.indexOf("{");
+                            right = title.indexOf("}");
+                        }
+                        if(title.contains("{") || title.contains("}")){
+                            return result.error500("大括号单独出现或大括号中内容不合法");
+                        }
+                        slogenInfo.put("creative_word_ids",creativeWordIdsArray.toJSONString());
+                    }
+                    //校验标题长度,长度小于5和大于30的全部过滤
+                    if(len<5 || len>30){
+                        result.setCode(500);
+                        result.setMessage("文案长度不合法,小于5或大于30");
+                        return  result;
+                    }
+                }
+
                 LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
                 LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-                slogenInfoService.insertSlogans(materialInfo.getProjectId(), materialInfoEntity.getCode(), slogans, user.getId());
+                slogenInfoService.deleteAllSlogens(Check.isNull(materialInfo.getProjectId()) ? materialInfoEntity.getProjectId() : materialInfo.getProjectId(),materialInfoEntity.getCode(),user.getId());
+                slogenInfoService.insertSlogans(Check.isNull(materialInfo.getProjectId()) ? materialInfoEntity.getProjectId() : materialInfo.getProjectId() , materialInfoEntity.getCode(), slogans, user.getId());
             }
             }
         }
         }
         boolean ok = materialInfoService.updateById(materialInfo);
         boolean ok = materialInfoService.updateById(materialInfo);
@@ -545,6 +602,7 @@ public class MaterialInfoController {
                 sendMessageService.sendMessage(userId, text);
                 sendMessageService.sendMessage(userId, text);
             }
             }
         }
         }
+        result.setCode(0);
         return result;
         return result;
 
 
     }
     }
@@ -563,11 +621,14 @@ public class MaterialInfoController {
         for (String id : ids) {
         for (String id : ids) {
             materialInfo.setId(id);
             materialInfo.setId(id);
             Result<MaterialInfo> materialInfoResult = bytedanceEdit(materialInfo);
             Result<MaterialInfo> materialInfoResult = bytedanceEdit(materialInfo);
-            if (materialInfoResult.getCode().equals(CommonConstant.SC_OK_200)) {
-                successNum++;
+            if (!materialInfoResult.getCode().equals(0)) {
+                return materialInfoResult;
             }
             }
+            successNum++;
         }
         }
-        return result.success("批量修改成功" + successNum + "个");
+        result.setCode(0);
+        result.setMessage("批量通过" + successNum + "个视频");
+        return result;
 
 
     }
     }
 
 

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

@@ -498,10 +498,10 @@ public class UserAllocationController {
             ProjectMember member = memberMapper.selectOne(memberQueryWrapper);
             ProjectMember member = memberMapper.selectOne(memberQueryWrapper);
             if (Check.isNull(member)) {
             if (Check.isNull(member)) {
                 ProjectMember addMember = new ProjectMember();
                 ProjectMember addMember = new ProjectMember();
-                addMember.setProjectId(userAllocation.getProjectId());
-                addMember.setUserId(userAllocation.getUserId());
-                addMember.setUserName(userAllocation.getUserName());
-                String roleCode = sysRoleService.getRoleCodeByUserId(userAllocation.getUserId());
+                addMember.setProjectId(userAllocationEntity.getProjectId());
+                addMember.setUserId(userAllocationEntity.getUserId());
+                addMember.setUserName(userAllocationEntity.getUserName());
+                String roleCode = sysRoleService.getRoleCodeByUserId(userAllocationEntity.getUserId());
                 if (!Check.isNull(roleCode)) {
                 if (!Check.isNull(roleCode)) {
                     addMember.setRoleCode(roleCode);
                     addMember.setRoleCode(roleCode);
                 }
                 }

+ 28 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -15,6 +15,9 @@ import cn.com.ctop.common.module.utils.StatusCode;
 import cn.com.ctop.common.module.vo.SysDepartUsersVO;
 import cn.com.ctop.common.module.vo.SysDepartUsersVO;
 import cn.com.ctop.common.module.vo.SysUserRoleVO;
 import cn.com.ctop.common.module.vo.SysUserRoleVO;
 import cn.com.ctop.common.module.vo.SysUserVo;
 import cn.com.ctop.common.module.vo.SysUserVo;
+import cn.com.ctop.toutiao.modules.operation.entity.BytedanceOperationLog;
+import cn.com.ctop.toutiao.modules.operation.service.IBytedanceOperationLogService;
+import cn.com.ctop.toutiao.modules.operation.util.GetChangeDateUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
@@ -102,10 +105,12 @@ public class SysUserController {
     private IUserCompanyService userCompanyService;
     private IUserCompanyService userCompanyService;
     @Autowired
     @Autowired
     private ISysRoleService roleService;
     private ISysRoleService roleService;
-
     @Resource
     @Resource
     private UserCompanyMapper userCompanyMapper;
     private UserCompanyMapper userCompanyMapper;
     @Autowired
     @Autowired
+    IBytedanceOperationLogService bytedanceOperationLogService;
+
+    @Autowired
     private RedisUtil redisUtil;
     private RedisUtil redisUtil;
     @Value("${jeecg.path.upload}")
     @Value("${jeecg.path.upload}")
     private String upLoadPath;
     private String upLoadPath;
@@ -143,7 +148,7 @@ public class SysUserController {
      * @param user
      * @param user
      * @param pageNo
      * @param pageNo
      * @param pageSize
      * @param pageSize
-     * @param req
+     * @param
      * @return
      * @return
      */
      */
     @PermissionData(pageComponent = "system/UserList")
     @PermissionData(pageComponent = "system/UserList")
@@ -329,9 +334,16 @@ public class SysUserController {
                     user.setOrgCode(depart.getOrgCode());
                     user.setOrgCode(depart.getOrgCode());
                 }
                 }
             }
             }
+
+            if (Check.isNull(selectedRoles)){
+
+            }
+
             sysUserService.addUserWithRole(user, selectedRoles);
             sysUserService.addUserWithRole(user, selectedRoles);
             sysUserService.addUserWithDepart(user, selectedDeparts);
             sysUserService.addUserWithDepart(user, selectedDeparts);
             userCompanyService.addOrUpdateUserWithCompany(user);
             userCompanyService.addOrUpdateUserWithCompany(user);
+            //用户 分配角色 为 设计组长  用户设计组长姓名 为自己真实姓名
+            sysUserService.updUserDesignLeaderById(user.getId(),user.getRealname(),selectedRoles);
             result.success("添加成功!");
             result.success("添加成功!");
             sysBaseAPI.addLog("添加用户,id: " + user.getId(), CommonConstant.LOG_TYPE_2, 1);
             sysBaseAPI.addLog("添加用户,id: " + user.getId(), CommonConstant.LOG_TYPE_2, 1);
         } catch (Exception e) {
         } catch (Exception e) {
@@ -358,7 +370,18 @@ public class SysUserController {
             if (sysUser == null) {
             if (sysUser == null) {
                 result.error500("未找到对应实体");
                 result.error500("未找到对应实体");
             } else {
             } else {
+                sysUser = sysUserService.queryPageList(sysUser).get(0);
                 SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
                 SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
+                BytedanceOperationLog bytedanceOperationLog = new BytedanceOperationLog();
+                bytedanceOperationLog.setOldData(sysUser.toString());
+                bytedanceOperationLog.setNewData(user.toString());
+                String operationContent = user.getRealname() + ":" +GetChangeDateUtil.makeOperationContent(sysUser,user,new String[]{"leaderName", "departName","roleName"});
+                bytedanceOperationLog.setOperationContent(operationContent);
+                bytedanceOperationLog.setOperationType("用户管理-修改");
+                LoginUser createBy = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+                bytedanceOperationLog.setCreateById(createBy.getId());
+                bytedanceOperationLogService.save(bytedanceOperationLog);
+
                 user.setLeaderName(user.getLeaderName().trim());
                 user.setLeaderName(user.getLeaderName().trim());
                 user.setUpdateTime(new Date());
                 user.setUpdateTime(new Date());
                 user.setLeaderName(user.getLeaderName().trim());
                 user.setLeaderName(user.getLeaderName().trim());
@@ -388,12 +411,14 @@ public class SysUserController {
                                 ProjectMember updateMember = new ProjectMember();
                                 ProjectMember updateMember = new ProjectMember();
                                 updateMember.setRoleCode(sysRole.getRoleCode());
                                 updateMember.setRoleCode(sysRole.getRoleCode());
                                 memberService.update(updateMember, memberQueryWrapper);//更新项目人员角色信息
                                 memberService.update(updateMember, memberQueryWrapper);//更新项目人员角色信息
+
                             }
                             }
                         }
                         }
                     };
                     };
                     thread.start();
                     thread.start();
                 }
                 }
-
+                //用户 分配角色 为 设计组长  用户设计组长姓名 为自己真实姓名
+                sysUserService.updUserDesignLeaderById(user.getId(),user.getRealname(),roles);
                 result.success("修改成功!");
                 result.success("修改成功!");
             }
             }
         } catch (Exception e) {
         } catch (Exception e) {

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/MaterialInfo.java

@@ -192,4 +192,9 @@ public class MaterialInfo implements Serializable {
     //视频关联广告语信息--头条
     //视频关联广告语信息--头条
     @TableField(exist = false)
     @TableField(exist = false)
     private JSONArray slogans;
     private JSONArray slogans;
+
+    @TableField(exist = false)
+    private Integer slogansCount;
+
+    private Integer offlineFlag;
 }
 }

+ 7 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/UserAllocation.java

@@ -104,6 +104,13 @@ public class UserAllocation implements Serializable {
     @ApiModelProperty(value = "授权名称")
     @ApiModelProperty(value = "授权名称")
     private String authName;
     private String authName;
 
 
+    /**
+     * 授权开始时间
+     */
+    @Excel(name = "授权开始时间", width = 15)
+    @ApiModelProperty(value = "授权开始时间")
+    private String authBeginTime;
+
 
 
     /**
     /**
      * 0 启动
      * 0 启动

+ 9 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/SysUserMapper.java

@@ -152,6 +152,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      */
      */
     int updateNullByEmptyString(@Param("fieldName") String fieldName);
     int updateNullByEmptyString(@Param("fieldName") String fieldName);
 
 
+
     /**
     /**
      * 根据部门Ids,查询部门下用户信息
      * 根据部门Ids,查询部门下用户信息
      *
      *
@@ -177,4 +178,12 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     List<SysUser> queryPageList(SysUser user);
     List<SysUser> queryPageList(SysUser user);
 
 
     List<JSONObject> getUserMapByMap(@Param("ids") Map<String, String> userIdMap);
     List<JSONObject> getUserMapByMap(@Param("ids") Map<String, String> userIdMap);
+
+    /**
+     *
+     * @param userId 用户id
+     * @param designTeamLeaderName 设计组长姓名
+     * @return
+     */
+    Integer updUserDesignLeaderById(@Param("userId") String userId,@Param("designTeamLeaderName") String designTeamLeaderName);
 }
 }

+ 15 - 1
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialInfoMapper.xml

@@ -90,8 +90,22 @@
         select
         select
         distinct matInfo.code,
         distinct matInfo.code,
         matInfo.project_id,
         matInfo.project_id,
-        matInfo.id
+        matInfo.id,
+        t.slogansCount,
+        matInfo.offline_flag
         from ctop_material_info matInfo
         from ctop_material_info matInfo
+        left JOIN (
+            SELECT
+                video_code,
+                count(*) AS slogansCount
+            FROM
+                ctop_bytedance_video_slogen_info
+            WHERE
+                status = 1
+            GROUP BY
+                video_code
+        ) t ON matInfo.code = t.video_code
+
         <if test="tagCode!=null">
         <if test="tagCode!=null">
             left join ctop_material_tag_info tagInfo on tagInfo.code = matInfo.code
             left join ctop_material_tag_info tagInfo on tagInfo.code = matInfo.code
         </if>
         </if>

+ 11 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SysUserMapper.xml

@@ -313,6 +313,9 @@ SELECT
         <if test="sex != null and sex != ''">
         <if test="sex != null and sex != ''">
             AND t1.sex =#{sex}
             AND t1.sex =#{sex}
         </if>
         </if>
+        <if test="id != null and id != ''">
+            AND t1.id =#{id}
+        </if>
 
 
         ) t4
         ) t4
         GROUP BY t4.id
         GROUP BY t4.id
@@ -325,4 +328,12 @@ SELECT
         </foreach>
         </foreach>
     </select>
     </select>
 
 
+
+
+
+    <!-- 修改用户 设计组长姓名 -->
+    <update id="updUserDesignLeaderById">
+        UPDATE sys_user SET design_team_leader_name = #{designTeamLeaderName} WHERE id = #{userId}
+    </update>
+
 </mapper>
 </mapper>

+ 2 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/ISysUserService.java

@@ -272,4 +272,6 @@ public interface ISysUserService extends IService<SysUser> {
     Map<String, String> getUserMapByMap(Map<String, String> userIdMap);
     Map<String, String> getUserMapByMap(Map<String, String> userIdMap);
 
 
     String getRoleCodeByUserId(String userId);
     String getRoleCodeByUserId(String userId);
+
+    Integer updUserDesignLeaderById(String userId,String userName,String roleId);
 }
 }

+ 10 - 3
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -38,7 +38,6 @@ import java.util.concurrent.Executors;
 
 
 import static cn.com.ctop.common.module.utils.CloudVideoProcessUtil.getTaskDetailResponse;
 import static cn.com.ctop.common.module.utils.CloudVideoProcessUtil.getTaskDetailResponse;
 import static cn.com.ctop.common.module.utils.CloudVideoProcessUtil.videoWatermarkHandle;
 import static cn.com.ctop.common.module.utils.CloudVideoProcessUtil.videoWatermarkHandle;
-
 /**
 /**
  * 素材信息
  * 素材信息
  *
  *
@@ -70,7 +69,6 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
     private ISupplierWatermarkService supplierWatermarkService;
     private ISupplierWatermarkService supplierWatermarkService;
     @Resource
     @Resource
     private IProductService productService;
     private IProductService productService;
-
     @Value("${oss.replace.download}")
     @Value("${oss.replace.download}")
     private String downloadUrl;
     private String downloadUrl;
 
 
@@ -797,6 +795,8 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         if (null != dailyList && !dailyList.isEmpty()) {
         if (null != dailyList && !dailyList.isEmpty()) {
             for (MaterialInfo info : dailyList) {
             for (MaterialInfo info : dailyList) {
                 MaterialInfo materialInfo = materialInfoMapper.selectById(info.getId());
                 MaterialInfo materialInfo = materialInfoMapper.selectById(info.getId());
+                materialInfo.setSlogansCount(info.getSlogansCount());
+                materialInfo.setOfflineFlag(info.getOfflineFlag());
                 //素材名称为空 则使用素材id 同步失败
                 //素材名称为空 则使用素材id 同步失败
                 materialInfo.setMaterialName(Check.isNull(materialInfo.getMaterialName()) ? materialInfo.getId() : materialInfo.getMaterialName());
                 materialInfo.setMaterialName(Check.isNull(materialInfo.getMaterialName()) ? materialInfo.getId() : materialInfo.getMaterialName());
                 //判断是否已经同步到快手平台
                 //判断是否已经同步到快手平台
@@ -841,7 +841,13 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                 } else {
                 } else {
                     materialInfo.setWhetherUnaudited(true);
                     materialInfo.setWhetherUnaudited(true);
                 }
                 }
-
+                //统计广告语数量
+//                List<BytedanceVideoSlogenInfo> slogenInfos = slogenInfoService.listByParams(materialInfo.getCode(), 1);
+//                JSONArray slogenArray = new JSONArray();
+//                if (null != slogenInfos && !slogenInfos.isEmpty()) {
+//                    slogenArray.addAll(slogenInfos);
+//                }
+//                materialInfo.setSlogans(slogenArray);
                 setList.add(materialInfo);
                 setList.add(materialInfo);
             }
             }
         }
         }
@@ -851,6 +857,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         return result;
         return result;
     }
     }
 
 
+
     @Override
     @Override
     public JSONArray getIdListByProject(Long projectId) {
     public JSONArray getIdListByProject(Long projectId) {
         return materialInfoMapper.getIdListByProject(projectId);
         return materialInfoMapper.getIdListByProject(projectId);

+ 24 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/SysUserServiceImpl.java

@@ -521,4 +521,28 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return userMapper.queryByDepIds(departIds, username);
         return userMapper.queryByDepIds(departIds, username);
     }
     }
 
 
+
+    /**
+     *
+     * @description: 修改用户 设计组长姓名
+     *用户 分配角色 为 设计组长  用户设计组长姓名 为自己真实姓名
+     * @param userId 用户id
+     * @param userName 设计组长姓名
+     * @param roleId 角色id
+     * @return: java.lang.Integer
+     * @author: zianY
+     */
+    @Override
+    public Integer updUserDesignLeaderById(String userId,String userName,String roleId) {
+        String designTeamLeaderName = "";
+        if (!Check.isNull(roleId)){
+            SysRole sysRole = sysRoleMapper.selectById(roleId);
+            if ("designTeamLeader".equals(sysRole.getRoleCode())){
+                designTeamLeaderName = userName;
+            }
+        }
+       return userMapper.updUserDesignLeaderById(userId,designTeamLeaderName);
+    }
+
+
 }
 }

+ 28 - 0
module-common/src/main/java/cn/com/ctop/common/module/utils/StringUtils.java

@@ -1,5 +1,6 @@
 package cn.com.ctop.common.module.utils;
 package cn.com.ctop.common.module.utils;
 
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.Pattern;
@@ -118,4 +119,31 @@ public class StringUtils {
         }
         }
         return dest;
         return dest;
     }
     }
+
+    public static int lengthAsSlogan(String a)  {
+        char[] c = a.toCharArray();
+        int count=0;
+        for (char d : c) {
+            Character.UnicodeBlock ub = Character.UnicodeBlock.of(d);
+            if (ub == Character.UnicodeBlock.GENERAL_PUNCTUATION
+                    || ub == Character.UnicodeBlock.CJK_SYMBOLS_AND_PUNCTUATION
+                    || ub == Character.UnicodeBlock.HALFWIDTH_AND_FULLWIDTH_FORMS
+                    || ub == Character.UnicodeBlock.CJK_COMPATIBILITY_FORMS
+                    || ub == Character.UnicodeBlock.VERTICAL_FORMS
+                    || ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS
+                    || ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A
+                    || ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B
+                    || ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C
+                    || ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D
+                    || ub == Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS
+                    || ub == Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT) {
+                count++;
+            }
+
+        }
+        BigDecimal strNum = new BigDecimal(count);
+        BigDecimal strlen = new BigDecimal(a.length());
+        BigDecimal res = strlen.subtract(strNum).divide(new BigDecimal(2),0, BigDecimal.ROUND_UP).add(strNum);
+        return res.intValue();
+    }
 }
 }

+ 3 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -4,6 +4,7 @@ import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.OauthConfig;
 import cn.com.ctop.common.module.entity.OauthConfig;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.enums.MaterialEnum;
 import cn.com.ctop.common.module.enums.MaterialEnum;
+import cn.com.ctop.common.module.mapper.UserAllocationMapper;
 import cn.com.ctop.common.module.service.IMaterialCutFrameService;
 import cn.com.ctop.common.module.service.IMaterialCutFrameService;
 import cn.com.ctop.common.module.service.IOauthConfigService;
 import cn.com.ctop.common.module.service.IOauthConfigService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
@@ -127,7 +128,8 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
     private IKuaishouPopulationGroupService populationGroupService;
     private IKuaishouPopulationGroupService populationGroupService;
     @Autowired
     @Autowired
     private IKuaishouAppPackageService appPackageService;
     private IKuaishouAppPackageService appPackageService;
-
+    @Autowired
+    private UserAllocationMapper allocationMapper;
     @Override
     @Override
     public void getAdvertiserReportHourly(CtopOauthToken token, Date startDate, Date endDate) {
     public void getAdvertiserReportHourly(CtopOauthToken token, Date startDate, Date endDate) {
         try {
         try {
@@ -778,8 +780,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
 
 
     @Override
     @Override
     public void loadKuaishouDataSingle(CtopOauthToken token) throws java.text.ParseException {
     public void loadKuaishouDataSingle(CtopOauthToken token) throws java.text.ParseException {
-
-
         Date endDate = new Date();
         Date endDate = new Date();
         for (int i = 0; i < 7; i++) {
         for (int i = 0; i < 7; i++) {
             Date getStartDate = DateUtils.addDay(endDate, -i);
             Date getStartDate = DateUtils.addDay(endDate, -i);

+ 69 - 10
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/controller/BytedanceVideoSlogenInfoController.java

@@ -1,8 +1,13 @@
 package cn.com.ctop.toutiao.modules.material.controller;
 package cn.com.ctop.toutiao.modules.material.controller;
 
 
+import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.QueryGenerator;
 import cn.com.ctop.common.module.utils.QueryGenerator;
+import cn.com.ctop.common.module.utils.StringUtils;
+import cn.com.ctop.toutiao.modules.material.entity.ByteDanceCreativeWordPackage;
 import cn.com.ctop.toutiao.modules.material.entity.BytedanceVideoSlogenInfo;
 import cn.com.ctop.toutiao.modules.material.entity.BytedanceVideoSlogenInfo;
+import cn.com.ctop.toutiao.modules.material.service.IByteDanceCreativeWordPackageService;
 import cn.com.ctop.toutiao.modules.material.service.IBytedanceVideoSlogenInfoService;
 import cn.com.ctop.toutiao.modules.material.service.IBytedanceVideoSlogenInfoService;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,6 +22,8 @@ import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 
 /**
 /**
  * 头条视频文案信息
  * 头条视频文案信息
@@ -31,7 +38,8 @@ import java.util.Date;
 public class BytedanceVideoSlogenInfoController {
 public class BytedanceVideoSlogenInfoController {
 	@Autowired
 	@Autowired
 	private IBytedanceVideoSlogenInfoService bytedanceVideoSlogenInfoService;
 	private IBytedanceVideoSlogenInfoService bytedanceVideoSlogenInfoService;
-
+	@Autowired
+	private IByteDanceCreativeWordPackageService byteDanceGeneralCopywriterService;
 	/**
 	/**
 	  * 分页列表查询
 	  * 分页列表查询
 	 * @param slogenInfo
 	 * @param slogenInfo
@@ -85,17 +93,68 @@ public class BytedanceVideoSlogenInfoController {
 	@PostMapping(value = "/edit")
 	@PostMapping(value = "/edit")
 	public Result<BytedanceVideoSlogenInfo> edit(@RequestBody BytedanceVideoSlogenInfo slogenInfo) {
 	public Result<BytedanceVideoSlogenInfo> edit(@RequestBody BytedanceVideoSlogenInfo slogenInfo) {
 		Result<BytedanceVideoSlogenInfo> result = new Result<>();
 		Result<BytedanceVideoSlogenInfo> result = new Result<>();
-		BytedanceVideoSlogenInfo bytedanceVideoSlogenInfoEntity = bytedanceVideoSlogenInfoService.getById(slogenInfo.getId());
-		if(bytedanceVideoSlogenInfoEntity==null) {
-			result.error500("未找到对应实体");
+		try{
+			BytedanceVideoSlogenInfo bytedanceVideoSlogenInfoEntity = bytedanceVideoSlogenInfoService.getById(slogenInfo.getId());
+			if(bytedanceVideoSlogenInfoEntity==null) {
+				result.error500("未找到对应实体");
+				return result;
+			}
+			LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			slogenInfo.setUpdateBy(user.getId());
+			slogenInfo.setUpdateTime(new Date());
+
+			String title = slogenInfo.getSlogan();
+			title = title.trim().replaceAll("[\\{]{2,}", "{");
+			title = title.trim().replaceAll("[\\}]{2,}", "}");
+			slogenInfo.setSlogan(title);
+
+
+			String reg = "\\{[\\u4e00-\\u9fa5\\-]{2,6}\\}";
+			Pattern pattern = Pattern.compile(reg);
+			Matcher matcher = pattern.matcher(title);
+			JSONArray creativeWordIdsArray = new JSONArray();
+
+			int len = StringUtils.lengthAsSlogan(title);
+			int left = title.indexOf("{");
+			int right = title.indexOf("}");
+			if (left >= 0 || right >= 0) {
+				int times = 0;
+				while (matcher.find()) { //此处find()每次被调用后,会偏移到下一个匹配
+					times++;
+					if (times >= 3) {
+						result.error500("动态词包不合法,词包数量超过2个");
+						return result;
+					}
+					String matchStr = matcher.group();//获取当前匹配的值
+					title = title.replace(matchStr,"");
+					ByteDanceCreativeWordPackage creativeWordPackage = byteDanceGeneralCopywriterService.selectCreativeWordPackageByName(matchStr.substring(1, matchStr.length() - 1));
+					if (Check.isNull(creativeWordPackage)) {
+						return result.error500("动态词包不合法,词包不存在或者含有单独的非词包大括号");
+					}
+					creativeWordIdsArray.add(creativeWordPackage.getCreativeWordId());
+					len = len - (right - left) + creativeWordPackage.getMaxWordLen();
+					left = title.indexOf("{");
+					right = title.indexOf("}");
+				}
+				if(title.contains("{") || title.contains("}")){
+					return result.error500("大括号单独出现或大括号中内容不合法");
+				}
+				slogenInfo.setCreativeWordIds(creativeWordIdsArray.toJSONString());
+			}
+			//校验标题长度,长度小于5和大于30的全部过滤
+			if (len < 5 || len > 30) {
+				return result.error500("文案长度不合法,小于5或大于30");
+			}
+
+			bytedanceVideoSlogenInfoService.updateById(slogenInfo);
+			result.setCode(0);
+			result.setMessage("修改成功!");
+			return result;
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
 			return result;
 			return result;
 		}
 		}
-		LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		slogenInfo.setUpdateBy(user.getId());
-		slogenInfo.setUpdateTime(new Date());
-		bytedanceVideoSlogenInfoService.updateById(slogenInfo);
-		result.success("修改成功!");
-		return result;
 	}
 	}
 
 
 	/**
 	/**

+ 2 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/mapper/ByteDanceCreativeWordPackageMapper.java

@@ -15,4 +15,6 @@ import java.util.List;
  */
  */
 public interface ByteDanceCreativeWordPackageMapper extends BaseMapper<ByteDanceCreativeWordPackage> {
 public interface ByteDanceCreativeWordPackageMapper extends BaseMapper<ByteDanceCreativeWordPackage> {
     void replaceBatch(@Param(value = "creativeWordPackages") List<ByteDanceCreativeWordPackage> creativeWordPackages);
     void replaceBatch(@Param(value = "creativeWordPackages") List<ByteDanceCreativeWordPackage> creativeWordPackages);
+
+    ByteDanceCreativeWordPackage selectCreativeWordPackageByName(String name);
 }
 }

+ 2 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/mapper/BytedanceVideoSlogenInfoMapper.java

@@ -2,6 +2,7 @@ package cn.com.ctop.toutiao.modules.material.mapper;
 
 
 import cn.com.ctop.toutiao.modules.material.entity.BytedanceVideoSlogenInfo;
 import cn.com.ctop.toutiao.modules.material.entity.BytedanceVideoSlogenInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 
 /**
 /**
  * 头条视频文案信息
  * 头条视频文案信息
@@ -10,5 +11,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @version V1.0
  * @version V1.0
  */
  */
 public interface BytedanceVideoSlogenInfoMapper extends BaseMapper<BytedanceVideoSlogenInfo> {
 public interface BytedanceVideoSlogenInfoMapper extends BaseMapper<BytedanceVideoSlogenInfo> {
-
+    void updateStatusToZero(@Param("projectId") Long projectId,@Param("videoCode") String videoCode,@Param("userId") String userId);
 }
 }

+ 5 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/mapper/xml/ByteDanceCreativeWordPackageMapper.xml

@@ -26,4 +26,9 @@
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>
+
+    <select id="selectCreativeWordPackageByName" resultType="cn.com.ctop.toutiao.modules.material.entity.ByteDanceCreativeWordPackage">
+        select * from ctop_bytedance_creative_word_package where name = #{name}
+    </select>
+
 </mapper>
 </mapper>

+ 8 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/mapper/xml/BytedanceVideoSlogenInfoMapper.xml

@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?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">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.ctop.toutiao.modules.material.mapper.BytedanceVideoSlogenInfoMapper">
 <mapper namespace="cn.com.ctop.toutiao.modules.material.mapper.BytedanceVideoSlogenInfoMapper">
-
+    <update id="updateStatusToZero" >
+        update ctop_bytedance_video_slogen_info a set a.status = 0
+        where 1=1
+        and a.video_code = #{videoCode} and a.create_by = #{userId}
+        <if test="projectId != null">
+            and a.project_id = #{projectId}
+        </if>
+    </update>
 </mapper>
 </mapper>

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/IByteDanceCreativeWordPackageService.java

@@ -17,5 +17,5 @@ import java.util.Map;
  */
  */
 public interface IByteDanceCreativeWordPackageService extends IService<ByteDanceCreativeWordPackage> {
 public interface IByteDanceCreativeWordPackageService extends IService<ByteDanceCreativeWordPackage> {
     Map<String, Object> getCreativeWordPackage();
     Map<String, Object> getCreativeWordPackage();
-
+    public ByteDanceCreativeWordPackage selectCreativeWordPackageByName(String name);
 }
 }

+ 2 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/IBytedanceVideoSlogenInfoService.java

@@ -17,4 +17,6 @@ public interface IBytedanceVideoSlogenInfoService extends IService<BytedanceVide
     void insertSlogans(Long projectId, String videoCode, JSONArray slogans, String userId);
     void insertSlogans(Long projectId, String videoCode, JSONArray slogans, String userId);
 
 
     List<BytedanceVideoSlogenInfo> listByParams(String code, Integer status);
     List<BytedanceVideoSlogenInfo> listByParams(String code, Integer status);
+
+    void deleteAllSlogens(Long projectId, String videoCode, String userId);
 }
 }

+ 4 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/ByteDanceCreativeWordPackageServiceImpl.java

@@ -62,5 +62,8 @@ public class ByteDanceCreativeWordPackageServiceImpl extends ServiceImpl<ByteDan
             byteDanceCreativeWordPackageMapper.replaceBatch(resultList);
             byteDanceCreativeWordPackageMapper.replaceBatch(resultList);
         }
         }
     }
     }
-
+    @Override
+    public ByteDanceCreativeWordPackage selectCreativeWordPackageByName(String name){
+        return byteDanceCreativeWordPackageMapper.selectCreativeWordPackageByName(name);
+    }
 }
 }

+ 2 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/BytedanceImageInfoServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -17,7 +18,7 @@ import java.util.List;
  */
  */
 @Service
 @Service
 public class BytedanceImageInfoServiceImpl extends ServiceImpl<BytedanceImageInfoMapper, BytedanceImageInfo> implements IBytedanceImageInfoService {
 public class BytedanceImageInfoServiceImpl extends ServiceImpl<BytedanceImageInfoMapper, BytedanceImageInfo> implements IBytedanceImageInfoService {
-    @Autowired
+    @Resource
     private BytedanceImageInfoMapper imageInfoMapper;
     private BytedanceImageInfoMapper imageInfoMapper;
     @Override
     @Override
     public void replaceBatch(List<BytedanceImageInfo> videoInfoList) {
     public void replaceBatch(List<BytedanceImageInfo> videoInfoList) {

+ 10 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/BytedanceVideoSlogenInfoServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -21,6 +22,9 @@ import java.util.List;
  */
  */
 @Service
 @Service
 public class BytedanceVideoSlogenInfoServiceImpl extends ServiceImpl<BytedanceVideoSlogenInfoMapper, BytedanceVideoSlogenInfo> implements IBytedanceVideoSlogenInfoService {
 public class BytedanceVideoSlogenInfoServiceImpl extends ServiceImpl<BytedanceVideoSlogenInfoMapper, BytedanceVideoSlogenInfo> implements IBytedanceVideoSlogenInfoService {
+    @Resource
+    BytedanceVideoSlogenInfoMapper bytedanceVideoSlogenInfoMapper;
+
     @Override
     @Override
     public void insertSlogans(Long projectId, String videoCode, JSONArray slogans,String userId){
     public void insertSlogans(Long projectId, String videoCode, JSONArray slogans,String userId){
         if(null==slogans||slogans.isEmpty()){
         if(null==slogans||slogans.isEmpty()){
@@ -36,6 +40,12 @@ public class BytedanceVideoSlogenInfoServiceImpl extends ServiceImpl<BytedanceVi
             this.save(slogenInfo);
             this.save(slogenInfo);
         }
         }
     }
     }
+
+    @Override
+    public void deleteAllSlogens(Long projectId, String videoCode, String userId){
+        bytedanceVideoSlogenInfoMapper.updateStatusToZero(projectId, videoCode, userId);
+    }
+
     @Override
     @Override
     public List<BytedanceVideoSlogenInfo> listByParams(String code, Integer status) {
     public List<BytedanceVideoSlogenInfo> listByParams(String code, Integer status) {
         QueryWrapper<BytedanceVideoSlogenInfo>queryWrapper =new QueryWrapper<>();
         QueryWrapper<BytedanceVideoSlogenInfo>queryWrapper =new QueryWrapper<>();

+ 236 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/operation/controller/BytedanceOperationLogController.java

@@ -0,0 +1,236 @@
+package cn.com.ctop.toutiao.modules.operation.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import cn.com.ctop.common.module.utils.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import cn.com.ctop.toutiao.modules.operation.entity.BytedanceOperationLog;
+import cn.com.ctop.toutiao.modules.operation.service.IBytedanceOperationLogService;
+import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * 操作日志
+ * @author jeecg-boot
+ * @date   2021-06-17
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="操作日志")
+@RestController
+@RequestMapping("/operation/bytedanceOperationLog")
+public class BytedanceOperationLogController {
+	@Autowired
+	private IBytedanceOperationLogService bytedanceOperationLogService;
+
+	/**
+	  * 分页列表查询
+	 * @param bytedanceOperationLog
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@ApiOperation(value="操作日志-分页列表查询", notes="操作日志-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BytedanceOperationLog>> queryPageList(BytedanceOperationLog bytedanceOperationLog,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<BytedanceOperationLog>> result = new Result<>();
+		QueryWrapper<BytedanceOperationLog> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceOperationLog, req.getParameterMap());
+		Page<BytedanceOperationLog> page = new Page<BytedanceOperationLog>(pageNo, pageSize);
+		IPage<BytedanceOperationLog> pageList = bytedanceOperationLogService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+
+	/**
+	  *   添加
+	 * @param bytedanceOperationLog
+	 * @return
+	 */
+	@ApiOperation(value="操作日志-添加", notes="操作日志-添加")
+	@PostMapping(value = "/add")
+	public Result<BytedanceOperationLog> add(@RequestBody BytedanceOperationLog bytedanceOperationLog) {
+		Result<BytedanceOperationLog> result = new Result<>();
+		try {
+			bytedanceOperationLogService.save(bytedanceOperationLog);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+
+	/**
+	  *  编辑
+	 * @param bytedanceOperationLog
+	 * @return
+	 */
+	@ApiOperation(value="操作日志-编辑", notes="操作日志-编辑")
+	@PutMapping(value = "/edit")
+	public Result<BytedanceOperationLog> edit(@RequestBody BytedanceOperationLog bytedanceOperationLog) {
+		Result<BytedanceOperationLog> result = new Result<BytedanceOperationLog>();
+		BytedanceOperationLog bytedanceOperationLogEntity = bytedanceOperationLogService.getById(bytedanceOperationLog.getId());
+		if(bytedanceOperationLogEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = bytedanceOperationLogService.updateById(bytedanceOperationLog);
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="操作日志-通过id删除", notes="操作日志-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id") String id) {
+		try {
+			bytedanceOperationLogService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@ApiOperation(value="操作日志-批量删除", notes="操作日志-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<BytedanceOperationLog> deleteBatch(@RequestParam(name="ids") String ids) {
+		Result<BytedanceOperationLog> result = new Result<>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.bytedanceOperationLogService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="操作日志-通过id查询", notes="操作日志-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BytedanceOperationLog> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<BytedanceOperationLog> result = new Result<>();
+		BytedanceOperationLog bytedanceOperationLog = bytedanceOperationLogService.getById(id);
+		if(bytedanceOperationLog==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(bytedanceOperationLog);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<BytedanceOperationLog> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              BytedanceOperationLog bytedanceOperationLog = JSON.parseObject(deString, BytedanceOperationLog.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(bytedanceOperationLog, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<BytedanceOperationLog> pageList = bytedanceOperationLogService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "操作日志列表");
+      mv.addObject(NormalExcelConstants.CLASS, BytedanceOperationLog.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("操作日志列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+  /**
+      * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<BytedanceOperationLog> listBytedanceOperationLogs = ExcelImportUtil.importExcel(file.getInputStream(), BytedanceOperationLog.class, params);
+              bytedanceOperationLogService.saveBatch(listBytedanceOperationLogs);
+              return Result.ok("文件导入成功!数据行数:" + listBytedanceOperationLogs.size());
+          } catch (Exception e) {
+              log.error(e.getMessage(),e);
+              return Result.error("文件导入失败:"+e.getMessage());
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败!");
+  }
+
+}

+ 61 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/operation/entity/BytedanceOperationLog.java

@@ -0,0 +1,61 @@
+package cn.com.ctop.toutiao.modules.operation.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 操作日志
+ * @author jeecg-boot
+ * @date   2021-06-17
+ * @version V1.0
+ */
+@Data
+@TableName("ctop_bytedance_operation_log")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ctop_bytedance_operation_log对象", description="操作日志")
+public class BytedanceOperationLog {
+    
+	/**id*/
+	@TableId(type = IdType.UUID)
+    @ApiModelProperty(value = "id")
+	private String id;
+	/**原始数据*/
+	@Excel(name = "原始数据", width = 15)
+    @ApiModelProperty(value = "原始数据")
+	private Object oldData;
+	/**修改后的数据*/
+	@Excel(name = "修改后的数据", width = 15)
+    @ApiModelProperty(value = "修改后的数据")
+	private Object newData;
+	/**操作类型*/
+	@Excel(name = "操作类型", width = 15)
+    @ApiModelProperty(value = "操作类型")
+	private String operationType;
+	/**操作内容*/
+	@Excel(name = "操作内容", width = 15)
+    @ApiModelProperty(value = "操作内容")
+	private Object operationContent;
+	/**创建人id*/
+	@Excel(name = "创建人id", width = 15)
+    @ApiModelProperty(value = "创建人id")
+	private String createById;
+	/**创建时间*/
+	@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;
+}

+ 17 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/operation/mapper/BytedanceOperationLogMapper.java

@@ -0,0 +1,17 @@
+package cn.com.ctop.toutiao.modules.operation.mapper;
+
+import java.util.List;
+
+import cn.com.ctop.toutiao.modules.operation.entity.BytedanceOperationLog;
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 操作日志
+ * @author jeecg-boot
+ * 2021-06-17
+ * @version V1.0
+ */
+public interface BytedanceOperationLogMapper extends BaseMapper<BytedanceOperationLog> {
+
+}

+ 5 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/operation/mapper/xml/BytedanceOperationLogMapper.xml

@@ -0,0 +1,5 @@
+<?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.operation.mapper.BytedanceOperationLogMapper">
+
+</mapper>

+ 14 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/operation/service/IBytedanceOperationLogService.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.toutiao.modules.operation.service;
+
+import cn.com.ctop.toutiao.modules.operation.entity.BytedanceOperationLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 操作日志
+ * @author jeecg-boot
+ * 2021-06-17
+ * @version V1.0
+ */
+public interface IBytedanceOperationLogService extends IService<BytedanceOperationLog> {
+
+}

+ 19 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/operation/service/impl/BytedanceOperationLogServiceImpl.java

@@ -0,0 +1,19 @@
+package cn.com.ctop.toutiao.modules.operation.service.impl;
+
+import cn.com.ctop.toutiao.modules.operation.mapper.BytedanceOperationLogMapper;
+import cn.com.ctop.toutiao.modules.operation.service.IBytedanceOperationLogService;
+import cn.com.ctop.toutiao.modules.operation.entity.BytedanceOperationLog;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 操作日志
+ * @author jeecg-boot
+ * 2021-06-17
+ * @version V1.0
+ */
+@Service
+public class BytedanceOperationLogServiceImpl extends ServiceImpl<BytedanceOperationLogMapper, BytedanceOperationLog> implements IBytedanceOperationLogService {
+
+}

+ 108 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/operation/util/GetChangeDateUtil.java

@@ -0,0 +1,108 @@
+package cn.com.ctop.toutiao.modules.operation.util;
+
+import cn.com.ctop.common.module.entity.SysUser;
+import cn.com.ctop.toutiao.modules.operation.entity.BytedanceOperationLog;
+import org.omg.PortableInterceptor.SYSTEM_EXCEPTION;
+
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+import java.security.Timestamp;
+import java.util.*;
+
+public class GetChangeDateUtil {
+    /**
+     *
+     * <p>Title: compareFields</p>
+     * <p>Description: </p>  比较两个实体属性值
+     * @param obj1
+     * @param obj2
+     * @param ignoreArr 忽略的字段
+     * @return
+     */
+    public static Map<String, List<Object>> compareFields(Object obj1, Object obj2, String[] ignoreArr) {
+        try{
+            Map<String, List<Object>> map = new HashMap<String, List<Object>>();
+            List<String> ignoreList = null;
+            if(ignoreArr != null && ignoreArr.length > 0){
+                // array转化为list
+                ignoreList = Arrays.asList(ignoreArr);
+            }
+            if (obj1.getClass() == obj2.getClass()) {// 只有两个对象都是同一类型的才有可比性
+                Class clazz = obj1.getClass();
+                // 获取object的属性描述
+                PropertyDescriptor[] pds = Introspector.getBeanInfo(clazz,
+                        Object.class).getPropertyDescriptors();
+                for (PropertyDescriptor pd : pds) {// 这里就是所有的属性了
+                    String name = pd.getName();// 属性名
+                    if(ignoreList == null || !ignoreList.contains(name)){// 如果当前属性选择忽略比较,跳到下一次循环
+                        continue;
+                    }
+                    Method readMethod = pd.getReadMethod();// get方法
+                    // 在obj1上调用get方法等同于获得obj1的属性值
+                    Object o1 = readMethod.invoke(obj1);
+                    // 在obj2上调用get方法等同于获得obj2的属性值
+                    Object o2 = readMethod.invoke(obj2);
+                    if(o1 == null && o2 == null){                               //o1 旧     o2新    如果两个都是空就跳过
+                        continue;
+                    }else if(o1 == null && o2 != null){                         //如果O1旧的没有     O2新的有
+                        List<Object> list = new ArrayList<Object>();
+                        list.add("旧(null)");
+                        list.add("新"+"("+String.valueOf(o2)+")");
+                        map.put(name, list);
+                        continue;
+                    }
+                    if (!o1.equals(o2)) {// 比较这两个值是否相等,不等就可以放入map了                             //如果旧的和新的不相等
+                        List<Object> list = new ArrayList<Object>();
+
+                        if(o2==null) {
+                            list.add("旧"+"("+String.valueOf(o1)+")");
+                            list.add("新()");
+                        }else {
+                            list.add("旧"+"("+String.valueOf(o1)+")");
+                            list.add("新"+"("+String.valueOf(o2)+")");
+                        }
+                        map.put(name, list);
+                    }
+                }
+            }
+            return map;
+        }catch(Exception e){
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static String makeOperationContent(Object obj1, Object obj2, String[] ignoreArr){
+
+
+        Map<String, List<Object>> bject = GetChangeDateUtil.compareFields(obj1,obj2,ignoreArr);
+        Set<String> names = bject.keySet();
+        StringBuilder sb = new StringBuilder();
+        for (String name: names
+        ) {
+            sb.append(name + "由【"+bject.get(name).get(0) +"】改为了【"+ bject.get(name).get(1)+"】");
+            sb.append(",");
+//            System.out.println(name + "由【"+bject.get(name).get(0) +"】改为了【"+ bject.get(name).get(1)+"】");
+        }
+        return sb.substring(0,sb.length() - 1 >= 0 ? sb.length() - 1 : 0);
+    }
+
+    public static void main(String[] args) {
+
+        SysUser user1 = new SysUser();
+        user1.setRealname("张三");
+//        user1.setLeaderName("领导1号");
+//        user1.setDepartName("研发部门");
+//        user1.setRoleName("用户");
+        SysUser user2 = new SysUser();
+        user2.setRealname("张三");
+//        user2.setLeaderName("领导2号");
+//        user2.setDepartName("组织架构部门");
+//        user2.setRoleName("管理员");
+        String s = makeOperationContent(user1, user2, new String[]{"leaderName", "departName","roleName"});
+
+        System.out.println(s);
+
+    }
+}

+ 4 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/ReportServiceImpl.java

@@ -2,6 +2,7 @@ package cn.com.ctop.toutiao.modules.report.service.impl;
 
 
 import cn.com.ctop.common.module.entity.*;
 import cn.com.ctop.common.module.entity.*;
 import cn.com.ctop.common.module.enums.BytedanceConvertType;
 import cn.com.ctop.common.module.enums.BytedanceConvertType;
+import cn.com.ctop.common.module.mapper.UserAllocationMapper;
 import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
@@ -73,6 +74,8 @@ public class ReportServiceImpl implements IReportService {
     private IByteDanceAdvertiserDataService advertiserDataService;
     private IByteDanceAdvertiserDataService advertiserDataService;
     @Autowired
     @Autowired
     private IBytedanceInterfaceService bytedanceInterfaceService;
     private IBytedanceInterfaceService bytedanceInterfaceService;
+    @Autowired
+    private UserAllocationMapper allocationMapper;
 
 
     @Override
     @Override
     public void getAdvertiserReport(CtopOauthToken token, Date startDate, Date endDate, String bytedanceReportTypePl) {
     public void getAdvertiserReport(CtopOauthToken token, Date startDate, Date endDate, String bytedanceReportTypePl) {
@@ -442,7 +445,7 @@ public class ReportServiceImpl implements IReportService {
     @Override
     @Override
     public void loadBytedanceHistoryData(CtopOauthToken token) {
     public void loadBytedanceHistoryData(CtopOauthToken token) {
         for (int i = 1; i < 180; i++) {
         for (int i = 1; i < 180; i++) {
-            Date getDate = DateUtils.addDay(new Date(), -i);
+            Date getDate = DateUtils.addDay(new Date(),-i);
             this.getAdvertiserCreativeReport(token, getDate, getDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
             this.getAdvertiserCreativeReport(token, getDate, getDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
             this.getAdvertiserPlanReport(token, getDate, getDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
             this.getAdvertiserPlanReport(token, getDate, getDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
             this.getAdvertiserReport(token, getDate, getDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
             this.getAdvertiserReport(token, getDate, getDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);