Pārlūkot izejas kodu

Merge branch 'test' of http://git.tjyourong.com.cn/ctop/adsp-boot into test

 Conflicts:
	jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IProjectMemberService.java
hcst_sunzhen 4 gadi atpakaļ
vecāks
revīzija
2d95c193c1
100 mainītis faili ar 1292 papildinājumiem un 397 dzēšanām
  1. 0 36
      jeecg-boot-base-common/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java
  2. 0 46
      jeecg-boot-base-common/src/main/java/org/jeecg/common/aspect/annotation/Dict.java
  3. 0 29
      jeecg-boot-base-common/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java
  4. 6 3
      jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java
  5. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdvertiserController.java
  6. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AgentInfoController.java
  7. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountAuthController.java
  8. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountLoginController.java
  9. 0 11
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceTemplateController.java
  10. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CorpFeishuUserController.java
  11. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CtopOauthTokenController.java
  12. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/DramaInfoController.java
  13. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/DramaItemInfoController.java
  14. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/DramaRoleInfoController.java
  15. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/FileInfoController.java
  16. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaiShouDefectMaterialController.java
  17. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouAdvertiserController.java
  18. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouAgentAccountController.java
  19. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouAppAccountController.java
  20. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouAppProductController.java
  21. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouChannelRegInfoController.java
  22. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouEffectAdInfoController.java
  23. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouEffectVideoInfoController.java
  24. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouHotPhotoInfoController.java
  25. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouInspiredAdController.java
  26. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialAscriptionController.java
  27. 1 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialCutFrameController.java
  28. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialImageInfoController.java
  29. 126 21
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialInfoController.java
  30. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialParameterController.java
  31. 8 8
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialPartController.java
  32. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialTagController.java
  33. 33 7
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java
  34. 0 25
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java
  35. 18 30
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectTransferRecordController.java
  36. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ReleaseRecordController.java
  37. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ReleaseViewRecordController.java
  38. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SalePerformanceDetailController.java
  39. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ScriptTagInfoController.java
  40. 248 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SupplierListController.java
  41. 248 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SupplierWatermarkController.java
  42. 53 10
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java
  43. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TransferAccountController.java
  44. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UReportFileBindUserController.java
  45. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UReportFileController.java
  46. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java
  47. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoMergeTaskController.java
  48. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoPartController.java
  49. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoWatermarkTaskController.java
  50. 15 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoWatermarkTemplateController.java
  51. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/Advertiser.java
  52. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAreaInfo.java
  53. 1 7
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ProjectTransferRecord.java
  54. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/MergeVideoJob.java
  55. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IProjectMemberService.java
  56. 5 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IProjectTransferRecordService.java
  57. 13 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectMemberServiceImpl.java
  58. 74 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectTransferRecordServiceImpl.java
  59. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java
  60. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/industry/controller/IndustryController.java
  61. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/media/controller/MediaController.java
  62. 6 8
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/entity/SysMessage.java
  63. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/opencv/controller/ModelVideoCompositeInfoController.java
  64. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/opencv/controller/ModelVideoInfoConfigController.java
  65. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/opencv/controller/ModelVideoInfoController.java
  66. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/opencv/controller/ModelVideoInfoTagController.java
  67. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/performanceappraisal/controller/OptimizerRoleInfoController.java
  68. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/AutoLogAspect.java
  69. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/DictAspect.java
  70. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/PermissionDataAspect.java
  71. 0 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
  72. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/UserCompanyController.java
  73. 5 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java
  74. 9 11
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
  75. 4 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java
  76. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysLog.java
  77. 13 13
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermission.java
  78. 8 11
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java
  79. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsFileController.java
  80. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsFileVersionController.java
  81. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsFileWatermarkController.java
  82. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsUserAclController.java
  83. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsUserController.java
  84. 1 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/entity/WpsFile.java
  85. 1 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/impl/WpsFileServiceImpl.java
  86. 37 13
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  87. 18 0
      module-common/src/main/java/cn/com/ctop/common/module/annotation/Dict.java
  88. 1 1
      module-common/src/main/java/cn/com/ctop/common/module/constant/CtopRoleCodeConstant.java
  89. 3 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/MaterialInfo.java
  90. 15 3
      module-common/src/main/java/cn/com/ctop/common/module/entity/Project.java
  91. 65 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/SupplierList.java
  92. 65 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/SupplierWatermark.java
  93. 71 0
      module-common/src/main/java/cn/com/ctop/common/module/enums/MaterialSupplierEnum.java
  94. 15 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/SupplierListMapper.java
  95. 15 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/SupplierWatermarkMapper.java
  96. 1 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/UserAllocationMapper.java
  97. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SupplierListMapper.xml
  98. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SupplierWatermarkMapper.xml
  99. 8 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/UserAllocationMapper.xml
  100. 0 0
      module-common/src/main/java/cn/com/ctop/common/module/service/IFileInfoService.java

+ 0 - 36
jeecg-boot-base-common/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java

@@ -1,36 +0,0 @@
-package org.jeecg.common.aspect.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.jeecg.common.constant.CommonConstant;
-
-/**
- * 系统日志注解
- * 
- * @Author scott
- * @email jeecgos@163.com
- * @Date 2019年1月14日
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface AutoLog {
-
-	/**
-	 * 日志内容
-	 * 
-	 * @return
-	 */
-	String value() default "";
-
-	/**
-	 * 日志类型
-	 * 
-	 * @return 0:操作日志;1:登录日志;2:定时任务;
-	 */
-	int logType() default CommonConstant.LOG_TYPE_2;
-}

+ 0 - 46
jeecg-boot-base-common/src/main/java/org/jeecg/common/aspect/annotation/Dict.java

@@ -1,46 +0,0 @@
-package org.jeecg.common.aspect.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- *  类描述:  字典注解
- * 作    者: dangzhenghui
- * 日    期: 2019年03月17日-下午9:37:16
- */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Dict {
-    /**
-     * 方法描述:  数据code
-     * 作    者: dangzhenghui
-     * 日    期: 2019年03月17日-下午9:37:16
-     *
-     * @return 返回类型: String
-     */
-    String dicCode();
-
-    /**
-     * 方法描述:  数据Text
-     * 作    者: dangzhenghui
-     * 日    期: 2019年03月17日-下午9:37:16
-     *
-     * @return 返回类型: String
-     */
-    String dicText() default "";
-
-    /**
-     * 方法描述: 数据字典表
-     * 作    者: dangzhenghui
-     * 日    期: 2019年03月17日-下午9:37:16
-     *
-     * @return 返回类型: String
-     */
-    String dictTable() default "";
-
-    String extendsKey() default "";
-
-    String extendsValue() default "";
-}

+ 0 - 29
jeecg-boot-base-common/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java

@@ -1,29 +0,0 @@
-package org.jeecg.common.aspect.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
-  *  数据权限注解
- * @Author taoyan
- * @Date 2019年4月11日
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE,ElementType.METHOD})
-@Documented
-public @interface PermissionData {
-	/**
-	 * 暂时没用
-	 * @return
-	 */
-	String value() default "";
-	
-	
-	/**
-	 * 配置菜单的组件路径,用于数据权限
-	 */
-	String pageComponent() default "";
-}

+ 6 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java

@@ -73,6 +73,11 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/ctop/bytedanceAreaInfo/**", "anon");
         filterChainDefinitionMap.put("/ctop/bytedanceInterestCategory/**", "anon");
         filterChainDefinitionMap.put("/template/creative/words/get", "anon");
+        filterChainDefinitionMap.put("template/bytedance/industry/list", "anon");
+
+        filterChainDefinitionMap.put("/bytedance/batch/creative/words/get", "anon");
+        filterChainDefinitionMap.put("/bytedance/batch/action/text", "anon");
+        filterChainDefinitionMap.put("/bytedance/batch/industry/list", "anon");
         filterChainDefinitionMap.put("/appium/crawler/*", "anon");
 
         filterChainDefinitionMap.put("/ctop/kuaishouChannelRegInfo/*", "anon");
@@ -119,9 +124,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/toutiao/loadSingleData", "anon");
         filterChainDefinitionMap.put("/kuaishou/getReport/historyData", "anon");
         filterChainDefinitionMap.put("/toutiao/advertiser/**", "anon");
-        filterChainDefinitionMap.put("/template/convert/list", "anon");
-        filterChainDefinitionMap.put("/template/convert/list/url", "anon");
-        //文件上传接口
+        filterChainDefinitionMap.put("/template/convert/**", "anon");//文件上传接口
         filterChainDefinitionMap.put("/upload/**", "anon");
         filterChainDefinitionMap.put("/appium/appiumTask/run", "anon");
 

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

@@ -1,5 +1,6 @@
 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.Project;
 import cn.com.ctop.common.module.entity.UserAllocation;
@@ -19,7 +20,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.ctop.entity.Advertiser;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,7 +9,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.AgentInfo;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.BindAccountAuth;
 import cn.com.ctop.common.module.service.IBindAccountAuthService;
 import cn.com.ctop.common.module.utils.Check;
@@ -12,7 +13,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.BindAccountLogin;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.UserAllocationMapper;
@@ -17,7 +18,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.ctop.service.ICreateInternalService;

+ 0 - 11
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceTemplateController.java

@@ -128,15 +128,4 @@ public class ByteDanceTemplateController {
         return fileInfoService.getSiteList(accountId);
     }
 
-    /**
-     * 获取动态词包信息
-     *
-     * @param accountId
-     * @return
-     */
-    @GetMapping("creative/words/get")
-    public Map<String, Object> getCreativeWords(Long accountId) {
-        return fileInfoService.getCreativeWords(accountId);
-    }
-
 }

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.CorpFeishuUser;
 import cn.com.ctop.common.module.service.ICorpFeishuUserService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +10,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CtopOauthTokenController.java

@@ -1,5 +1,8 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,10 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.StatusCode;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,7 +11,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.ctop.entity.DramaInfo;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.ctop.entity.DramaItemInfo;
 import org.jeecg.modules.ctop.service.IDramaItemInfoService;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.ctop.entity.DramaRoleInfo;
 import org.jeecg.modules.ctop.service.IDramaRoleInfoService;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.FileInfo;
 import cn.com.ctop.common.module.service.IFileInfoService;
 import cn.com.ctop.common.module.utils.StringUtils;
@@ -10,7 +11,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.entity.ImportParams;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.ctop.entity.KuaiShouDefectMaterial;
 import org.jeecg.modules.ctop.service.IKuaiShouDefectMaterialService;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.utils.StringUtils;
 import cn.com.ctop.crawler.modules.account.entity.KuaishouAdAccount;
 import cn.com.ctop.crawler.modules.account.service.IKuaishouAdAccountService;
@@ -11,7 +12,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.system.entity.SysCategory;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.utils.ExportExcelUtils;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouAgentAccount;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouAgentAccountService;
@@ -12,7 +13,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.utils.StringUtils;
 import cn.com.ctop.crawler.modules.account.entity.KuaishouAppAccount;
 import cn.com.ctop.crawler.modules.account.service.IKuaishouAppAccountService;
@@ -11,7 +12,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.kuaishou.modules.app.entity.KuaishouAppProduct;
 import cn.com.ctop.kuaishou.modules.app.service.IKuaishouAppProductService;
 import com.alibaba.fastjson.JSON;
@@ -10,7 +11,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.ctop.entity.KuaishouChannelRegInfo;
 import org.jeecg.modules.ctop.service.IKuaishouChannelRegInfoService;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.crawler.modules.kuaishoucce.entity.KuaishouEffectAdInfo;
 import cn.com.ctop.crawler.modules.kuaishoucce.service.IKuaishouEffectAdInfoService;
 import com.alibaba.fastjson.JSON;
@@ -10,7 +11,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.ctop.entity.KuaishouEffectVideoInfo;
 import org.jeecg.modules.ctop.service.IKuaishouEffectVideoInfoService;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.crawler.modules.kuaishoucce.entity.KuaishouHotPhotoInfo;
 import cn.com.ctop.crawler.modules.kuaishoucce.service.IKuaishouHotPhotoInfoService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +10,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.crawler.modules.kuaishoucce.entity.KuaishouInspiredAd;
 import cn.com.ctop.crawler.modules.kuaishoucce.service.IKuaishouInspiredAdService;
 import com.alibaba.fastjson.JSON;
@@ -10,7 +11,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.MaterialAscription;
 import cn.com.ctop.common.module.service.IMaterialAscriptionService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +10,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

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

@@ -1,9 +1,9 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.MaterialCutFrame;
 import cn.com.ctop.common.module.entity.MaterialCutFrameTask;
 import cn.com.ctop.common.module.entity.MaterialInfo;
-import cn.com.ctop.common.module.entity.MaterialParameter;
 import cn.com.ctop.common.module.service.IMaterialCutFrameService;
 import cn.com.ctop.common.module.service.IMaterialCutFrameTaskService;
 import cn.com.ctop.common.module.service.IMaterialInfoService;
@@ -15,7 +15,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.MaterialImageInfo;
 import cn.com.ctop.common.module.entity.MaterialInfo;
 import cn.com.ctop.common.module.mapper.MaterialInfoMapper;
@@ -17,7 +18,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
@@ -74,8 +74,6 @@ public class MaterialImageInfoController {
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                      HttpServletRequest req) {
         Result<IPage<MaterialImageInfo>> result = new Result<IPage<MaterialImageInfo>>();
-
-
         QueryWrapper<MaterialImageInfo> queryWrapper = new QueryWrapper<>();
         Object createTime = materialImageInfo.getCreateTime();
         materialImageInfo.setCreateTime(null);
@@ -116,13 +114,15 @@ public class MaterialImageInfoController {
     @AutoLog(value = "素材-分页列表查询")
     @ApiOperation(value = "素材-分页列表查询", notes = "素材-分页列表查询")
     @GetMapping(value = "/list")
-    public Result<List<MaterialImageInfo>> queryPageList(String videoId,Integer status) {
+    public Result<List<MaterialImageInfo>> queryPageList(String videoId, Integer status) {
         Result<List<MaterialImageInfo>> result = new Result<>();
         List<MaterialImageInfo> list = new ArrayList<>();
         if (!Check.isNull(videoId)) {
             QueryWrapper<MaterialImageInfo> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("video_id", videoId);
-            queryWrapper.eq("status", status);
+            if (!Check.isNull(status)) {
+                queryWrapper.eq("status", status);
+            }
             list = MaterialImageInfoService.list(queryWrapper);
         }
 

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

@@ -1,8 +1,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.enums.MaterialSupplierEnum;
 import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.JsonUtil;
@@ -21,11 +23,9 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.ctop.service.IKuaiShouUploadService;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -67,7 +67,50 @@ public class MaterialInfoController {
     @Autowired
     private IVideoWatermarkTaskService watermarkTaskService;
     @Autowired
-    private IKuaiShouUploadService uploadService;
+    private IProjectMemberService memberService;
+    @Autowired
+    private IMaterialImageInfoService iMaterialImageInfoService;
+
+
+    @GetMapping("/supplierWatermark")
+    public Result<String> supplierWatermark(String id) {
+        Result<String> result = new Result<>();
+        try {
+            if (Check.isNull(id)) {
+                throw new Exception("请选择素材");
+            }
+            MaterialInfo materialInfo = materialInfoService.getById(id);
+            if (Check.isNull(materialInfo)) {
+                throw new Exception("素材信息为空");
+            }
+            QueryWrapper<MaterialParameter> parameterQueryWrapper = new QueryWrapper<>();
+            parameterQueryWrapper.eq("material_id", materialInfo.getCode());
+            parameterQueryWrapper.last("limit 1");
+            MaterialParameter parameter = materialParameterService.getOne(parameterQueryWrapper);
+            if (Check.isNull(parameter)) {
+                throw new Exception("素材基本信息为空");
+            }
+
+            Long templateId = MaterialSupplierEnum.getTemplateIdBySize(Integer.valueOf(parameter.getWidth()), Integer.valueOf(parameter.getHeight()));
+            String s = null;
+            if (!Check.isNull(templateId)) {
+                s = materialInfoService.watermarkVideoBySupplierCode(materialInfo.getCode(), materialInfo.getUrl(), templateId);
+
+            }
+            if (Check.isNull(s)) {
+                result.setSuccess(false);
+                result.setMessage("水印生成失败");
+            } else {
+                result.setSuccess(true);
+                result.setResult(s);
+            }
+        } catch (Exception e) {
+            result.setSuccess(false);
+            result.setMessage(e.getMessage());
+        }
+
+        return result;
+    }
 
 
     @PostMapping("/correlationUpload")
@@ -80,10 +123,10 @@ public class MaterialInfoController {
     }
 
     @PostMapping("/supplementFrameUrl")
-    public Result<Object> supplementFrameUrl(@RequestParam String videoMD5){
-        Result<Object> result=new Result<>();
+    public Result<Object> supplementFrameUrl(@RequestParam String videoMD5) {
+        Result<Object> result = new Result<>();
         boolean bool = materialCutFrameService.updateTencentCutFrame(videoMD5);
-        if(!bool){
+        if (!bool) {
             result.setSuccess(false);
             result.error500("补全截帧url失败");
             return result;
@@ -126,18 +169,6 @@ public class MaterialInfoController {
     }
 
 
-    /**
-     * 分页列表查询
-     *
-     * @param materialInfo
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @Autowired
-    private IProjectMemberService memberService;
-
     @GetMapping("/excellent/list")
     public Result<IPage<MaterialInfo>> excellentList(MaterialInfo materialInfo,
                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -166,9 +197,6 @@ public class MaterialInfoController {
         return result;
     }
 
-    @Autowired
-    private IMaterialImageInfoService iMaterialImageInfoService;
-
     @AutoLog(value = "素材信息-分页列表查询")
     @ApiOperation(value = "素材信息-分页列表查询", notes = "素材信息-分页列表查询")
     @GetMapping(value = "/list")
@@ -177,6 +205,7 @@ public class MaterialInfoController {
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                      HttpServletRequest req) {
 
+
         Result<IPage<MaterialInfo>> result = new Result<>();
         String materialName = materialInfo.getMaterialName();
         materialInfo.setMaterialName(null);
@@ -285,6 +314,82 @@ public class MaterialInfoController {
     }
 
 
+    @AutoLog(value = "素材信息-分页列表查询")
+    @ApiOperation(value = "素材信息-分页列表查询", notes = "素材信息-分页列表查询")
+    @GetMapping(value = "/supplierList")
+    public Result<IPage<MaterialInfo>> supplierList(MaterialInfo materialInfo,
+                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    HttpServletRequest req) {
+
+
+        Result<IPage<MaterialInfo>> result = new Result<>();
+        String materialName = materialInfo.getMaterialName();
+        materialInfo.setMaterialName(null);
+        QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper<>();
+        Object createTime = materialInfo.getCreateTime();
+        materialInfo.setCreateTime(null);
+        if (!Check.isNull(materialInfo.getUserId())) {
+            String roleCode = materialInfoService.getRoleCodeByUserId(materialInfo.getUserId());
+            if (CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN.equals(roleCode)) {
+                materialInfo.setUserId(null);
+            } else {
+                result.setResult(null);
+                return result;
+            }
+
+            queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
+
+            if (!Check.isNull(createTime)) {
+                try {
+                    String dateString = DateUtils.getDateString(String.valueOf(createTime));
+                    Map<String, Object> map = DateUtils.getStartEndTime(dateString);
+                    queryWrapper.ge("create_time", map.get("start"));
+                    queryWrapper.lt("create_time", map.get("end"));
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+            }
+        } else {
+            result.setResult(null);
+            return result;
+        }
+        if (!Check.isNull(materialName)) {
+            queryWrapper.like("material_name", materialName);
+
+        }
+        Page<MaterialInfo> page = new Page<>(pageNo, pageSize);
+        IPage<MaterialInfo> pageList = materialInfoService.page(page, queryWrapper);
+        List<MaterialInfo> materialInfoList = pageList.getRecords();
+        if (materialInfoList.size() != 0) {
+            for (MaterialInfo material : materialInfoList) {
+                Project project = projectService.getById(material.getProjectId());
+                if (!Check.isNull(project)) {
+                    material.setMediaId(project.getMediaId());
+                    material.setProjectName(project.getProjectName());
+                }
+
+                QueryWrapper<MaterialImageInfo> imageInfoQueryWrapper = new QueryWrapper<>();
+                imageInfoQueryWrapper.eq("video_id", material.getCode());
+                imageInfoQueryWrapper.eq("status", 0);
+                List<MaterialImageInfo> imageInfoList = iMaterialImageInfoService.list(imageInfoQueryWrapper);
+                if (Check.isNull(imageInfoList)) {
+                    material.setWhetherUnaudited(false);
+                } else {
+                    material.setWhetherUnaudited(true);
+                }
+
+            }
+
+
+        }
+
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+
     /**
      * 添加
      *

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.MaterialParameter;
 import cn.com.ctop.common.module.service.IMaterialParameterService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +10,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

+ 8 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialPartController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.MaterialInfo;
 import cn.com.ctop.common.module.entity.VideoMerge;
 import cn.com.ctop.common.module.entity.VideoMergeTask;
@@ -16,7 +17,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.vo.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -48,22 +48,22 @@ public class MaterialPartController {
         List<String> jobIdList = new ArrayList<>();
         List<VideoMerge> videoMergeList = jsonArray.toJavaList(VideoMerge.class);
         try {
-            for (VideoMerge videoMerge:videoMergeList){
+            for (VideoMerge videoMerge : videoMergeList) {
                 MaterialInfo start = materialInfoService.getMaterialInfoByCode(videoMerge.getStartPart());
                 MaterialInfo end = materialInfoService.getMaterialInfoByCode(videoMerge.getEndPart());
                 List<String> partUrlList = new ArrayList<>();
                 List<String> parts = videoMerge.getParts();
-                for (String part :parts){
+                for (String part : parts) {
                     MaterialInfo materialInfo = materialInfoService.getMaterialInfoByCode(part);
                     String url = materialInfo.getUrl();
                     int i = url.indexOf('/', 10);
-                    partUrlList.add(url.substring(i+1,url.length()));
+                    partUrlList.add(url.substring(i + 1, url.length()));
                 }
                 String startUrl = start.getUrl();
                 String startPath = startUrl.substring(startUrl.indexOf('/', 10) + 1, startUrl.length());
                 String endUrl = end.getUrl();
                 String endPath = endUrl.substring(endUrl.indexOf('/', 10) + 1, endUrl.length());
-                String jobId = MpsUtils.mergeOneVideo(startPath,partUrlList,endPath);
+                String jobId = MpsUtils.mergeOneVideo(startPath, partUrlList, endPath);
                 QueryJobListResponse.Job job = MpsUtils.getJobStatus(jobId);
                 VideoMergeTask videoMergeTask = new VideoMergeTask();
                 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -71,9 +71,9 @@ public class MaterialPartController {
                 videoMergeTask.setJobId(jobId);
                 videoMergeTask.setStatus(job.getState());
                 videoMergeTaskService.save(videoMergeTask);
-                parts.add(0,videoMerge.getStartPart());
+                parts.add(0, videoMerge.getStartPart());
                 parts.add(videoMerge.getStartPart());
-                for(String part :parts){
+                for (String part : parts) {
                     VideoPart videoPart = new VideoPart();
                     videoPart.setJobId(jobId);
                     videoPart.setPartId(part);
@@ -81,7 +81,7 @@ public class MaterialPartController {
                 }
                 jobIdList.add(jobId);
             }
-            result.success("合成中,可在任务列表中查询状态,任务ID:"+new Gson().toJson(jobIdList));
+            result.success("合成中,可在任务列表中查询状态,任务ID:" + new Gson().toJson(jobIdList));
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             result.error500("操作失败");

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.MaterialTag;
 import cn.com.ctop.common.module.service.IMaterialTagService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +10,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

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

@@ -1,12 +1,13 @@
 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.MaterialInfo;
 import cn.com.ctop.common.module.entity.Project;
+import cn.com.ctop.common.module.entity.SupplierList;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.ProjectMapper;
-import cn.com.ctop.common.module.service.IProjectService;
-import cn.com.ctop.common.module.service.ISysRoleService;
-import cn.com.ctop.common.module.service.IUserAllocationService;
+import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.utils.Check;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,7 +17,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.ctop.entity.Advertiser;
@@ -68,7 +68,6 @@ public class ProjectController {
      * @param mediaId
      * @return
      */
-
     @GetMapping(value = "/getProjectByAdvertiserAndMediaId")
     public Result<List<Project>> getProjectByCompany(String advertiserId, String mediaId) {
         Result<List<Project>> result = new Result<>();
@@ -155,6 +154,8 @@ public class ProjectController {
 
     @Autowired
     private ISysCategoryService sysCategoryService;
+    @Autowired
+    private ISupplierListService supplierListService;
 
     /**
      * 分页列表查询
@@ -177,8 +178,6 @@ public class ProjectController {
         project.setAdvertiserName(null);
         String projectName = project.getProjectName();
         project.setProjectName(null);
-
-
         String industryId = project.getIndustryId();
         project.setIndustryId(null);
         QueryWrapper<Project> queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap());
@@ -203,6 +202,23 @@ public class ProjectController {
             queryWrapper.like("project_name", projectName);
         }
         IPage<Project> pageList = projectService.page(page, queryWrapper);
+        List<Project> records = pageList.getRecords();
+        if (!Check.isNull(records)) {
+            for (Project project1 : records) {
+                if (!Check.isNull(project1.getSupplierCode())) {
+                    QueryWrapper<SupplierList> supplierListQueryWrapper = new QueryWrapper<>();
+                    supplierListQueryWrapper.eq("supplier_code", project1.getSupplierCode());
+                    supplierListQueryWrapper.last("limit 1");
+                    SupplierList one = supplierListService.getOne(supplierListQueryWrapper);
+                    if (!Check.isNull(one)) {
+                        project1.setSupplierCode_dictText(one.getSupplierName());
+                    }
+                }
+
+
+            }
+
+        }
         result.setSuccess(true);
         result.setResult(pageList);
         return result;
@@ -277,6 +293,8 @@ public class ProjectController {
 
     @Autowired
     private ISysRoleService sysRoleService;
+    @Autowired
+    private IMaterialInfoService materialInfoService;
 
     /**
      * 编辑
@@ -324,6 +342,14 @@ public class ProjectController {
             // 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());
+                MaterialInfo updateMaterialInfo = new MaterialInfo();
+                updateMaterialInfo.setSupplierCode(project.getSupplierCode());
+                materialInfoService.update(updateMaterialInfo, materialInfoQueryWrapper);
+            }
+
             if (ok) {
                 result.success("修改成功!");
             }

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

@@ -10,11 +10,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.ctop.entity.ProjectMember;
@@ -58,8 +56,6 @@ public class ProjectMemberController {
      * @param projectId
      * @return
      */
-    @AutoLog(value = "项目成员-分页列表查询")
-    @ApiOperation(value = "项目成员-分页列表查询", notes = "项目成员-分页列表查询")
     @GetMapping(value = "/getMemberList")
     public Map<String, Object> getMemberList(String projectId) {
         Map<String, Object> map = new HashMap<>();
@@ -86,8 +82,6 @@ public class ProjectMemberController {
      * @param userId
      * @return
      */
-    @AutoLog(value = "项目成员-分页列表查询")
-    @ApiOperation(value = "项目成员-分页列表查询", notes = "项目成员-分页列表查询")
     @GetMapping(value = "/participateList")
     public Map<String, Object> participateList(String userId) {
         Map<String, Object> map = new HashMap<>();
@@ -116,7 +110,6 @@ public class ProjectMemberController {
                         projectMember.setMaxBid(project.getMaxBid());
                         projectMemberList.add(projectMember);
                     }
-
                 }
             }
             map.put("code", 0);
@@ -141,8 +134,6 @@ public class ProjectMemberController {
      * @param req
      * @return
      */
-    @AutoLog(value = "项目成员-分页列表查询")
-    @ApiOperation(value = "项目成员-分页列表查询", notes = "项目成员-分页列表查询")
     @GetMapping(value = "/list")
     public Result<IPage<ProjectMember>> queryPageList(ProjectMember projectMember,
                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -164,10 +155,6 @@ public class ProjectMemberController {
      * @param jsonObject
      * @return
      */
-
-
-    @AutoLog(value = "项目成员-添加")
-    @ApiOperation(value = "项目成员-添加", notes = "项目成员-添加")
     @PostMapping(value = "/batchAdd")
     public Result<ProjectMember> batchAdd(@RequestBody JSONObject jsonObject) {
         Result<ProjectMember> result = new Result<>();
@@ -222,8 +209,6 @@ public class ProjectMemberController {
      * @param projectMember
      * @return
      */
-    @AutoLog(value = "项目成员-添加")
-    @ApiOperation(value = "项目成员-添加", notes = "项目成员-添加")
     @PostMapping(value = "/add")
     public Result<ProjectMember> add(@RequestBody ProjectMember projectMember) {
         Result<ProjectMember> result = new Result<>();
@@ -243,8 +228,6 @@ public class ProjectMemberController {
      * @param projectMember
      * @return
      */
-    @AutoLog(value = "项目成员-编辑")
-    @ApiOperation(value = "项目成员-编辑", notes = "项目成员-编辑")
     @PutMapping(value = "/edit")
     public Result<ProjectMember> edit(@RequestBody ProjectMember projectMember) {
         Result<ProjectMember> result = new Result<>();
@@ -267,8 +250,6 @@ public class ProjectMemberController {
      * @param id
      * @return
      */
-    @AutoLog(value = "项目成员-通过id删除")
-    @ApiOperation(value = "项目成员-通过id删除", notes = "项目成员-通过id删除")
     @DeleteMapping(value = "/delete")
     public Result<Object> delete(@RequestParam(name = "id", required = true) String id) {
         try {
@@ -286,8 +267,6 @@ public class ProjectMemberController {
      * @param ids
      * @return
      */
-    @AutoLog(value = "项目成员-批量删除")
-    @ApiOperation(value = "项目成员-批量删除", notes = "项目成员-批量删除")
     @DeleteMapping(value = "/deleteBatch")
     public Result<ProjectMember> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         Result<ProjectMember> result = new Result<>();
@@ -306,8 +285,6 @@ public class ProjectMemberController {
      * @param id
      * @return
      */
-    @AutoLog(value = "项目成员-通过id查询")
-    @ApiOperation(value = "项目成员-通过id查询", notes = "项目成员-通过id查询")
     @GetMapping(value = "/queryById")
     public Result<ProjectMember> queryById(@RequestParam(name = "id", required = true) String id) {
         Result<ProjectMember> result = new Result<>();
@@ -326,8 +303,6 @@ public class ProjectMemberController {
      *
      * @return
      */
-    @AutoLog(value = "头条视频报表-参与项目列表")
-    @ApiOperation(value = "头条视频报表-参与项目列表", notes = "头条视频报表-参与项目列表")
     @GetMapping(value = "/bytedanceProjectParticipateInList")
     public Result<List<ProjectMember>> bytedanceProjectParticipateInList() {
         Result<List<ProjectMember>> result = new Result<>();

+ 18 - 30
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectTransferRecordController.java

@@ -1,6 +1,9 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.service.ISysRoleService;
+import cn.com.ctop.common.module.utils.ResultMapUtils;
+import cn.com.ctop.common.module.utils.StatusCode;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -9,7 +12,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.ctop.entity.ProjectTransferRecord;
@@ -19,8 +21,10 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
- /**
+/**
  * 账户转项目记录
  * @author jeecg-boot
  * @date   2020-07-22
@@ -103,24 +107,25 @@ public class ProjectTransferRecordController {
 		 return result;
 	 }
 
+	 @PostMapping("editStatus")
+	 public Map<String,Object> editStatus(Long id, Integer status){
+	 	Map<String, Object>result = new HashMap<>();
+	 	if(id == null||id == 0||status == null){
+			ResultMapUtils.setResultMap(result, StatusCode.COMMON_PARAM_ERROR);
+			return result;
+		}
+		return projectTransferRecordService.updateStatus(id,status);
+	 }
+
 	/**
 	  *  添加
-	 * @param projectTransferRecord
 	 * @return
 	 */
 	@AutoLog(value = "账户转项目记录-添加")
 	@ApiOperation(value="账户转项目记录-添加", notes="账户转项目记录-添加")
 	@PostMapping(value = "/add")
-	public Result<ProjectTransferRecord> add(@RequestBody ProjectTransferRecord projectTransferRecord) {
-		Result<ProjectTransferRecord> result = new Result<>();
-		try {
-			projectTransferRecordService.save(projectTransferRecord);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
+	public Map<String,Object> add(Long accountId, Long projectId) {
+		return projectTransferRecordService.addRecord(accountId,projectId);
 	}
 
 	/**
@@ -146,23 +151,6 @@ public class ProjectTransferRecordController {
 		return result;
 	}
 
-	 /**
-	  *  修改状态
-	  * @return
-	  */
-	 @AutoLog(value = "账户转项目记录-编辑")
-	 @ApiOperation(value="账户转项目记录-编辑", notes="账户转项目记录-编辑")
-	 @PutMapping(value = "/editStatus")
-	 public Result<Object> editStatus(@RequestParam(name="id",required=true) Long id,@RequestParam(name = "status",defaultValue = "0") Integer status){
-		 try {
-			 projectTransferRecordService.updateStatus(id,status);
-		 } catch (Exception e) {
-			 log.error("操作失败",e.getMessage());
-			 return Result.error("操作失败!");
-		 }
-		 return Result.ok("操作成功!");
-	 }
-
 	/**
 	 * 通过id删除
 	 * @param id

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.ctop.entity.ReleaseRecord;
 import org.jeecg.modules.ctop.service.IReleaseRecordService;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,7 +10,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.ctop.entity.ReleaseViewRecord;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,7 +9,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.performance.entity.SalePerformanceDetail;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.ctop.entity.ScriptTagInfo;
 import org.jeecg.modules.ctop.service.IScriptTagInfoService;

+ 248 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SupplierListController.java

@@ -0,0 +1,248 @@
+package org.jeecg.modules.ctop.controller;
+
+import cn.com.ctop.common.module.annotation.AutoLog;
+import cn.com.ctop.common.module.entity.SupplierList;
+import cn.com.ctop.common.module.service.ISupplierListService;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+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 javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 供应商列表
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-07-27
+ */
+@Slf4j
+@Api(tags = "供应商列表")
+@RestController
+@RequestMapping("/ctop/supplierList")
+public class SupplierListController {
+    @Autowired
+    private ISupplierListService supplierListService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param supplierList
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "供应商列表-分页列表查询")
+    @ApiOperation(value = "供应商列表-分页列表查询", notes = "供应商列表-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<SupplierList>> queryPageList(SupplierList supplierList,
+                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                     HttpServletRequest req) {
+        Result<IPage<SupplierList>> result = new Result<>();
+        QueryWrapper<SupplierList> queryWrapper = QueryGenerator.initQueryWrapper(supplierList, req.getParameterMap());
+        Page<SupplierList> page = new Page<SupplierList>(pageNo, pageSize);
+        IPage<SupplierList> pageList = supplierListService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param supplierList
+     * @return
+     */
+    @AutoLog(value = "供应商列表-添加")
+    @ApiOperation(value = "供应商列表-添加", notes = "供应商列表-添加")
+    @PostMapping(value = "/add")
+    public Result<SupplierList> add(@RequestBody SupplierList supplierList) {
+        Result<SupplierList> result = new Result<>();
+        try {
+            supplierListService.save(supplierList);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param supplierList
+     * @return
+     */
+    @AutoLog(value = "供应商列表-编辑")
+    @ApiOperation(value = "供应商列表-编辑", notes = "供应商列表-编辑")
+    @PutMapping(value = "/edit")
+    public Result<SupplierList> edit(@RequestBody SupplierList supplierList) {
+        Result<SupplierList> result = new Result<SupplierList>();
+        SupplierList supplierListEntity = supplierListService.getById(supplierList.getId());
+        if (supplierListEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = supplierListService.updateById(supplierList);
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "供应商列表-通过id删除")
+    @ApiOperation(value = "供应商列表-通过id删除", notes = "供应商列表-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            supplierListService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "供应商列表-批量删除")
+    @ApiOperation(value = "供应商列表-批量删除", notes = "供应商列表-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<SupplierList> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<SupplierList> result = new Result<>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.supplierListService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "供应商列表-通过id查询")
+    @ApiOperation(value = "供应商列表-通过id查询", notes = "供应商列表-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<SupplierList> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<SupplierList> result = new Result<>();
+        SupplierList supplierList = supplierListService.getById(id);
+        if (supplierList == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(supplierList);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<SupplierList> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                SupplierList supplierList = JSON.parseObject(deString, SupplierList.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(supplierList, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<SupplierList> pageList = supplierListService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "供应商列表列表");
+        mv.addObject(NormalExcelConstants.CLASS, SupplierList.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<SupplierList> listSupplierLists = ExcelImportUtil.importExcel(file.getInputStream(), SupplierList.class, params);
+                supplierListService.saveBatch(listSupplierLists);
+                return Result.ok("文件导入成功!数据行数:" + listSupplierLists.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("文件导入失败!");
+    }
+
+}

+ 248 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SupplierWatermarkController.java

@@ -0,0 +1,248 @@
+package org.jeecg.modules.ctop.controller;
+
+import cn.com.ctop.common.module.annotation.AutoLog;
+import cn.com.ctop.common.module.entity.SupplierWatermark;
+import cn.com.ctop.common.module.service.ISupplierWatermarkService;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+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 javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 供应商水印
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-07-28
+ */
+@Slf4j
+@Api(tags = "供应商水印")
+@RestController
+@RequestMapping("/ctop/supplierWatermark")
+public class SupplierWatermarkController {
+    @Autowired
+    private ISupplierWatermarkService supplierWatermarkService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param supplierWatermark
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "供应商水印-分页列表查询")
+    @ApiOperation(value = "供应商水印-分页列表查询", notes = "供应商水印-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<SupplierWatermark>> queryPageList(SupplierWatermark supplierWatermark,
+                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                          HttpServletRequest req) {
+        Result<IPage<SupplierWatermark>> result = new Result<>();
+        QueryWrapper<SupplierWatermark> queryWrapper = QueryGenerator.initQueryWrapper(supplierWatermark, req.getParameterMap());
+        Page<SupplierWatermark> page = new Page<SupplierWatermark>(pageNo, pageSize);
+        IPage<SupplierWatermark> pageList = supplierWatermarkService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param supplierWatermark
+     * @return
+     */
+    @AutoLog(value = "供应商水印-添加")
+    @ApiOperation(value = "供应商水印-添加", notes = "供应商水印-添加")
+    @PostMapping(value = "/add")
+    public Result<SupplierWatermark> add(@RequestBody SupplierWatermark supplierWatermark) {
+        Result<SupplierWatermark> result = new Result<>();
+        try {
+            supplierWatermarkService.save(supplierWatermark);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param supplierWatermark
+     * @return
+     */
+    @AutoLog(value = "供应商水印-编辑")
+    @ApiOperation(value = "供应商水印-编辑", notes = "供应商水印-编辑")
+    @PutMapping(value = "/edit")
+    public Result<SupplierWatermark> edit(@RequestBody SupplierWatermark supplierWatermark) {
+        Result<SupplierWatermark> result = new Result<SupplierWatermark>();
+        SupplierWatermark supplierWatermarkEntity = supplierWatermarkService.getById(supplierWatermark.getId());
+        if (supplierWatermarkEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = supplierWatermarkService.updateById(supplierWatermark);
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "供应商水印-通过id删除")
+    @ApiOperation(value = "供应商水印-通过id删除", notes = "供应商水印-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            supplierWatermarkService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "供应商水印-批量删除")
+    @ApiOperation(value = "供应商水印-批量删除", notes = "供应商水印-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<SupplierWatermark> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<SupplierWatermark> result = new Result<>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.supplierWatermarkService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "供应商水印-通过id查询")
+    @ApiOperation(value = "供应商水印-通过id查询", notes = "供应商水印-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<SupplierWatermark> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<SupplierWatermark> result = new Result<>();
+        SupplierWatermark supplierWatermark = supplierWatermarkService.getById(id);
+        if (supplierWatermark == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(supplierWatermark);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<SupplierWatermark> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                SupplierWatermark supplierWatermark = JSON.parseObject(deString, SupplierWatermark.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(supplierWatermark, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<SupplierWatermark> pageList = supplierWatermarkService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "供应商水印列表");
+        mv.addObject(NormalExcelConstants.CLASS, SupplierWatermark.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<SupplierWatermark> listSupplierWatermarks = ExcelImportUtil.importExcel(file.getInputStream(), SupplierWatermark.class, params);
+                supplierWatermarkService.saveBatch(listSupplierWatermarks);
+                return Result.ok("文件导入成功!数据行数:" + listSupplierWatermarks.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("文件导入失败!");
+    }
+
+}

+ 53 - 10
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java

@@ -3,10 +3,8 @@ package org.jeecg.modules.ctop.controller;
 import cn.com.ctop.common.module.entity.*;
 import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
 import cn.com.ctop.common.module.service.*;
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.common.module.utils.CtopAdConstant;
-import cn.com.ctop.common.module.utils.ResultMapUtils;
-import cn.com.ctop.common.module.utils.StatusCode;
+import cn.com.ctop.common.module.utils.*;
+import cn.com.ctop.common.module.vo.ResFileDTO;
 import cn.com.ctop.kuaishou.modules.batch.service.*;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
@@ -26,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -69,11 +68,54 @@ public class TestController {
     private IMaterialImageInfoService iMaterialImageInfoService;
     @Autowired
     private IBytedanceReportService bytedanceReportService;
-    static ExecutorService executorService = Executors.newFixedThreadPool(10);
+    static ExecutorService executorService = Executors.newFixedThreadPool(15);
     static ExecutorService videoService = Executors.newFixedThreadPool(5);
     static ExecutorService suzhaoService = Executors.newFixedThreadPool(5);
 
 
+
+    @GetMapping(value = "/getCut")
+    public void getCut() {
+        QueryWrapper<MaterialInfo> materialInfoQueryWrapper = new QueryWrapper<>();
+        materialInfoQueryWrapper.like("cover_url", "ctop-media.oss-cn-beijing.aliyuncs.com");
+        List<MaterialInfo> list = materialInfoService.list(materialInfoQueryWrapper);
+        if (!Check.isNull(list)) {
+            for (MaterialInfo materialInfo : list) {
+                executorService.submit(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            String url = materialInfo.getCoverUrl();
+                            if (!Check.isNull(url)) {
+                                InputStream imageStream = LoadFileUtil.getFileStream(url);
+                                if (!Check.isNull(imageStream)) {
+                                    ResFileDTO jpg = CosUtils.uploadDetailInputStreamV2(imageStream, materialInfo.getCode() + ".jpg", "jpg", 0L, "zeroImage/");
+                                    String fileUrl = jpg.getFileUrl();
+                                    materialInfo.setCoverUrl(fileUrl);
+                                    boolean b = materialInfoService.saveOrUpdate(materialInfo);
+                                    if (b) {
+                                        log.info("修改成功,videoCode:{}", materialInfo.getCode());
+                                    }
+                                }
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
+            }
+        }
+        // InputStream in, String fileName, String fileType, long fileSize, String fileSavePath
+
+
+    }
+
+
+
+
+
+
+
     @GetMapping(value = "/t")
     public String test() {
         Result<String> result = new Result<>();
@@ -94,7 +136,6 @@ public class TestController {
     }
 
 
-
     @GetMapping(value = "/getSuZhao")
     public void getSuZhao() throws JobExecutionException {
         try {
@@ -765,13 +806,15 @@ public class TestController {
             bytedanceReportService.bytedanceAsyncTaskCreate(startDate, endDate, token, 4);
         }
     }
+
     @Autowired
     private IBytedanceEffectVideoInfoService effectVideoInfoService;
+
     @GetMapping("/bytedance/effectVideo/get")
-    public Map<String,Object>effectVideoGet(String date){
-        Map<String,Object>result = new HashMap<>();
+    public Map<String, Object> effectVideoGet(String date) {
+        Map<String, Object> result = new HashMap<>();
         effectVideoInfoService.loadEffectVideo(date);
-        ResultMapUtils.setResultMap(result,StatusCode.COMMON_SUCCESS);
+        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
         return result;
     }
 
@@ -792,7 +835,7 @@ public class TestController {
 
             tokens.forEach(token -> {
 
-                kuaishouInterfaceService.getAppList2(token.getAccountId(),token.getAccessToken());
+                kuaishouInterfaceService.getAppList(token.getAccountId(),token.getAccessToken());
                 //suzhaoService.submit(new Runnable() {
                 //    @Override
                 //    public void run() {

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.Project;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.MailLogMapper;
@@ -13,7 +14,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.ctop.entity.ProjectMember;
 import org.jeecg.modules.ctop.entity.TransferAccount;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.StatusCode;
 import cn.com.ctop.toutiao.modules.report.service.IBytedancePlanDailyReportService;
@@ -12,7 +13,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.ctop.entity.UReportFileBindUser;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,7 +9,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.ctop.entity.UReportFile;
 import org.jeecg.modules.ctop.service.IUReportFileService;

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

@@ -1,5 +1,6 @@
 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.Project;
 import cn.com.ctop.common.module.entity.UserAllocation;
@@ -17,7 +18,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.ctop.entity.ProjectMember;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.VideoMergeTask;
 import cn.com.ctop.common.module.service.IVideoMergeTaskService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +10,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.VideoPart;
 import cn.com.ctop.common.module.service.IVideoPartService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +10,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.VideoWatermarkTask;
 import cn.com.ctop.common.module.service.IVideoWatermarkTaskService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +10,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.TencentWatermarkTemplate;
 import cn.com.ctop.common.module.service.ITencentWatermarkTemplateService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,13 +10,14 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
 
  /**
  * 水印模板
@@ -28,6 +30,7 @@ import java.util.Arrays;
 @RestController
 @RequestMapping("/ctop/videoWatermarkTemplate")
 public class VideoWatermarkTemplateController {
+
 	@Autowired
 	private ITencentWatermarkTemplateService tencentWatermarkTemplateService;
 
@@ -55,4 +58,12 @@ public class VideoWatermarkTemplateController {
 		return result;
 	}
 
-}
+	@GetMapping(value= "/queryById")
+	public Result<TencentWatermarkTemplate> queryById(){
+		Result<TencentWatermarkTemplate> result = new Result<>();
+		TencentWatermarkTemplate tencentWatermarkTemplate=tencentWatermarkTemplateService.getById(5);
+		result.setSuccess(true);
+		result.setResult(tencentWatermarkTemplate);
+		return result;
+	}
+ }

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

@@ -1,5 +1,6 @@
 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;
@@ -10,7 +11,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 

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

@@ -29,7 +29,7 @@ public class BytedanceAreaInfo {
     /**
      * id
      */
-    @TableId(type = IdType.UUID)
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
     private Integer id;
     /**

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

@@ -1,14 +1,13 @@
 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.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
 
 import java.util.Date;
 
@@ -24,7 +23,6 @@ import java.util.Date;
 @Accessors(chain = true)
 @ApiModel(value="ctop_project_transfer_record对象", description="账户转项目记录")
 public class ProjectTransferRecord {
-
 	@TableId(type = IdType.AUTO)
 	private Long id;
 	/**账户id*/
@@ -42,10 +40,6 @@ public class ProjectTransferRecord {
 	/**审核人*/
 	@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
 	private String reviewerId;
-	/**createTime*/
-    @ApiModelProperty(value = "createTime")
 	private Date createTime;
-	/**updateTime*/
-    @ApiModelProperty(value = "updateTime")
 	private Date updateTime;
 }

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/MergeVideoJob.java

@@ -49,7 +49,7 @@ public class MergeVideoJob implements Job {
                         materialInfo.setMaterialName("合成" + DateUtils.getMillis());
                         materialInfoService.saveOrUpdate(materialInfo);
                         Thread.sleep(3 * 1000);
-                        materialInfoService.getFile(materialInfo);
+                  //      materialInfoService.getFile(materialInfo);
                         videoMergeTask.setVideoUrl(url);
                         videoMergeTask.setStatus(job.getState());
                         videoMergeTask.setVideoId(materialInfo.getId());

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

@@ -24,6 +24,7 @@ public interface IProjectMemberService extends IService<ProjectMember> {
 
     List<Map<String, Object>> getProjectAccountByUserId(String userId);
 
+    ProjectMember getProjectByParams(Long targetProject, String userId);
     List<ProjectMember> getOwnProjects(List<Integer> mediaIds);
 
     List<ProjectMember> getSaleOwnProjects(List<Integer> mediaIds);

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

@@ -3,6 +3,8 @@ package org.jeecg.modules.ctop.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.ctop.entity.ProjectTransferRecord;
 
+import java.util.Map;
+
 /**
  * 账户转项目记录
  * @author jeecg-boot
@@ -10,5 +12,7 @@ import org.jeecg.modules.ctop.entity.ProjectTransferRecord;
  * @version V1.0
  */
 public interface IProjectTransferRecordService extends IService<ProjectTransferRecord> {
-    void updateStatus(Long id,Integer status);
+    Map<String,Object> updateStatus(Long id, Integer status);
+
+    Map<String,Object> addRecord(Long accountId, Long projectId);
 }

+ 13 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectMemberServiceImpl.java

@@ -122,6 +122,19 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
         return result;
     }
 
+    @Override
+    public ProjectMember getProjectByParams(Long targetProject, String userId) {
+        QueryWrapper<ProjectMember>queryWrapper = new QueryWrapper<>();
+        if(null!=targetProject){
+            queryWrapper.eq("project_id",targetProject);
+        }
+        if(null!=userId){
+            queryWrapper.eq("user_id",userId);
+        }
+        queryWrapper.last("limit 1");
+        return null;
+    }
+
 
     private Map<String, Object> queryAccountByProjectId(ProjectMember projectMember) {
         Map<String, Object> temp = new HashMap<>();

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

@@ -1,12 +1,27 @@
 package org.jeecg.modules.ctop.service.impl;
 
+import cn.com.ctop.common.module.entity.Project;
+import cn.com.ctop.common.module.entity.UserAllocation;
+import cn.com.ctop.common.module.service.IProjectService;
+import cn.com.ctop.common.module.service.IUserAllocationService;
+import cn.com.ctop.common.module.utils.ResultMapUtils;
+import cn.com.ctop.common.module.utils.StatusCode;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.ctop.entity.ProjectMember;
 import org.jeecg.modules.ctop.entity.ProjectTransferRecord;
 import org.jeecg.modules.ctop.mapper.ProjectTransferRecordMapper;
+import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecg.modules.ctop.service.IProjectTransferRecordService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 账户转项目记录
@@ -16,14 +31,67 @@ import java.util.Date;
  */
 @Service
 public class ProjectTransferRecordServiceImpl extends ServiceImpl<ProjectTransferRecordMapper, ProjectTransferRecord> implements IProjectTransferRecordService {
-
+    @Autowired
+    private IProjectMemberService projectMemberService;
+    @Autowired
+    private ISysUserService sysUserService;
+    @Autowired
+    private IProjectService projectService;
+    @Autowired
+    private IUserAllocationService userAllocationService;
     @Override
-    public void updateStatus(Long id,Integer status) {
+    public Map<String,Object> updateStatus(Long id, Integer status) {
+        Map<String,Object>result = new HashMap<>();
         ProjectTransferRecord record = this.getById(id);
-        if(null!=record){
-            record.setStatus(status);
-            record.setUpdateTime(new Date());
-            this.updateById(record);
+        if(null == record||record.getStatus()==0){
+            ResultMapUtils.setResultMap(result, StatusCode.COMMON_PARAM_ERROR);
+            return result;
+        }
+        record.setStatus(status);
+        record.setUpdateTime(new Date());
+        this.updateById(record);
+        if(status == 2){
+            //需要转转项目
+            UserAllocation userAllocation = userAllocationService.getByAccountId(record.getAccountId());
+            SysUser user = sysUserService.getById(record.getUserId());
+            Project project = projectService.getById(record.getTargetProject());
+            userAllocation.setProjectId(project.getId());
+            userAllocation.setProjectName(project.getProjectName());
+            userAllocationService.updateById(userAllocation);
+            ProjectMember member = projectMemberService.getProjectByParams(record.getTargetProject(),record.getUserId());
+            if(null == member){
+                projectMemberService.addMember(user,project);
+            }
+        }
+        ResultMapUtils.setResultMap(result,StatusCode.COMMON_SUCCESS);
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> addRecord(Long accountId, Long projectId) {
+        Map<String,Object>result = new HashMap<>();
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if(accountId == null||projectId==null){
+            ResultMapUtils.setResultMap(result,StatusCode.COMMON_PARAM_ERROR);
+            return result;
+        }
+        UserAllocation allocation = userAllocationService.getByAccountId(accountId);
+        Project project = projectService.getById(projectId);
+        if(null == allocation||null == project){
+            ResultMapUtils.setResultMap(result,StatusCode.COMMON_PARAM_ERROR);
+            return result;
         }
+        ProjectTransferRecord record = new ProjectTransferRecord();
+        record.setStatus(1);
+        record.setAccountId(accountId);
+        record.setSoucreProject(allocation.getProjectId());
+        record.setTargetProject(projectId);
+        record.setUserId(user.getId());
+        record.setReviewerId(project.getUserId());
+        record.setCreateTime(new Date());
+        record.setUpdateTime(new Date());
+        this.save(record);
+        ResultMapUtils.setResultMap(result,StatusCode.COMMON_SUCCESS);
+        return result;
     }
 }

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.demo.test.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
+import cn.com.ctop.common.module.annotation.PermissionData;
 import cn.com.ctop.common.module.utils.StringUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,8 +12,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.DateUtils;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/industry/controller/IndustryController.java

@@ -1,12 +1,12 @@
 package org.jeecg.modules.industry.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.industry.entity.Industry;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/media/controller/MediaController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.media.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.utils.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +10,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.media.entity.Media;

+ 6 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/entity/SysMessage.java

@@ -1,16 +1,14 @@
 package org.jeecg.modules.message.entity;
 
-import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @Description: 消息
@@ -41,7 +39,7 @@ public class SysMessage extends JeecgEntity {
 	/**推送状态 0未推送 1推送成功 2推送失败*/
 	@Excel(name = "推送状态 0未推送 1推送成功 2推送失败", width = 15)
 	@Dict(dicCode = "msgSendStatus")
-	private java.lang.String esSendStatus;
+    private java.lang.String esSendStatus;
 	/**推送时间*/
 	@Excel(name = "推送时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -53,7 +51,7 @@ public class SysMessage extends JeecgEntity {
 	/**推送方式:1短信 2邮件 3微信*/
 	@Excel(name = "推送方式:1短信 2邮件 3微信", width = 15)
 	@Dict(dicCode = "msgType")
-	private java.lang.String esType;
+    private java.lang.String esType;
 	/**备注*/
 	@Excel(name = "备注", width = 15)
 	private java.lang.String remark;

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/opencv/controller/ModelVideoCompositeInfoController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.opencv.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.opencv.entity.ModelVideoCompositeInfo;
 import org.jeecg.modules.opencv.service.IModelVideoCompositeInfoService;
@@ -48,9 +48,9 @@ public class ModelVideoCompositeInfoController {
                                                                 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                                 HttpServletRequest req) {
-        Result<IPage<ModelVideoCompositeInfo>> result = new Result<IPage<ModelVideoCompositeInfo>>();
+        Result<IPage<ModelVideoCompositeInfo>> result = new Result<>();
         QueryWrapper<ModelVideoCompositeInfo> queryWrapper = QueryGenerator.initQueryWrapper(modelVideoCompositeInfo, req.getParameterMap());
-        Page<ModelVideoCompositeInfo> page = new Page<ModelVideoCompositeInfo>(pageNo, pageSize);
+        Page<ModelVideoCompositeInfo> page = new Page<>(pageNo, pageSize);
         IPage<ModelVideoCompositeInfo> pageList = modelVideoCompositeInfoService.page(page, queryWrapper);
         result.setSuccess(true);
         result.setResult(pageList);

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/opencv/controller/ModelVideoInfoConfigController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.opencv.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,7 +10,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.opencv.entity.ModelVideoInfoConfig;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/opencv/controller/ModelVideoInfoController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.opencv.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.opencv.entity.ModelVideoInfo;
 import org.jeecg.modules.opencv.service.IModelVideoInfoService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/opencv/controller/ModelVideoInfoTagController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.opencv.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,7 +9,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.opencv.entity.ModelVideoInfoTag;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/performanceappraisal/controller/OptimizerRoleInfoController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.performanceappraisal.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.performanceappraisal.entity.OptimizerRoleInfo;
 import cn.com.ctop.performanceappraisal.service.IOptimizerRoleInfoService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +10,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysUserService;

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/AutoLogAspect.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.system.aspect;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.shiro.SecurityUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -7,7 +8,6 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.IPUtils;
 import org.jeecg.common.util.SpringContextUtils;
@@ -34,7 +34,7 @@ public class AutoLogAspect {
 	@Autowired
 	private ISysLogService sysLogService;
 
-	@Pointcut("@annotation(org.jeecg.common.aspect.annotation.AutoLog)")
+	@Pointcut("@annotation(cn.com.ctop.common.module.annotation.AutoLog)")
     public void logPointCut() {
 
 	}

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/DictAspect.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.system.aspect;
 
+import cn.com.ctop.common.module.annotation.Dict;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -11,7 +12,6 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.system.service.ISysDictService;

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/PermissionDataAspect.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.system.aspect;
 
+import cn.com.ctop.common.module.annotation.PermissionData;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -7,7 +8,6 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
-import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.common.system.util.JeecgDataAutorUtils;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.SysUserCacheInfo;
@@ -46,7 +46,7 @@ public class PermissionDataAspect {
     @Autowired
 	private ISysUserService sysUserService;
 
-    @Pointcut("@annotation(org.jeecg.common.aspect.annotation.PermissionData)")
+    @Pointcut("@annotation(cn.com.ctop.common.module.annotation.PermissionData)")
 	public void pointCut() {
 
     }

+ 0 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictController.java

@@ -146,7 +146,6 @@ public class SysDictController {
 
 			 result.setSuccess(true);
 			 result.setResult(ls);
-			 log.info(result.toString());
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
 			result.error500("操作失败");

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/UserCompanyController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.system.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.utils.Check;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +10,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.system.entity.SysUser;

+ 5 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java

@@ -1,17 +1,16 @@
 package org.jeecg.modules.system.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
+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;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.jeecg.common.aspect.annotation.Dict;
+import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
+
 /**
  * @Description: 系统通告表
  * @Author: jeecg-boot
@@ -63,7 +62,7 @@ public class SysAnnouncement implements Serializable {
     @Excel(name = "优先级", width = 15, dicCode = "priority")
     @Dict(dicCode = "priority")
     private java.lang.String priority;
-    
+
     /**
      * 消息类型1:通知公告2:系统消息
      */

+ 9 - 11
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.java

@@ -1,25 +1,23 @@
 package org.jeecg.modules.system.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;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecg.modules.system.model.SysDepartTreeModel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 import java.util.Objects;
 
 /**
  * <p>
  * 部门表
  * <p>
- * 
+ *
  * @Author Steve
  * @Since  2019-01-22
  */
@@ -27,7 +25,7 @@ import java.util.Objects;
 @TableName("sys_depart")
 public class SysDepart implements Serializable {
     private static final long serialVersionUID = 1L;
-    
+
 	/**ID*/
 	@TableId(type = IdType.UUID)
 	private String id;
@@ -68,11 +66,11 @@ public class SysDepart implements Serializable {
 	/**状态(1启用,0不启用)*/
 	@Excel(name="状态",width=15)
 	@Dict(dicCode = "depart_status")
-	private String status;
+    private String status;
 	/**删除状态(0,正常,1已删除)*/
 	@Excel(name="删除状态",width=15)
 	@Dict(dicCode = "del_flag")
-	private String delFlag;
+    private String delFlag;
 	/**创建人*/
 	private String createBy;
 	/**创建日期*/
@@ -85,7 +83,7 @@ public class SysDepart implements Serializable {
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
-	
+
 	/**
 	 * 重写equals方法
 	 */
@@ -128,9 +126,9 @@ public class SysDepart implements Serializable {
     @Override
     public int hashCode() {
 
-        return Objects.hash(super.hashCode(), id, parentId, departName, 
-        		departNameEn, departNameAbbr, departOrder, description, 
-        		orgType, orgCode, mobile, fax, address, memo, status, 
+        return Objects.hash(super.hashCode(), id, parentId, departName,
+        		departNameEn, departNameAbbr, departOrder, description,
+        		orgType, orgCode, mobile, fax, address, memo, status,
         		delFlag, createBy, createTime, updateBy, updateTime);
     }
 }

+ 4 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java

@@ -1,18 +1,16 @@
 package org.jeecg.modules.system.entity;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  *

+ 5 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysLog.java

@@ -1,16 +1,16 @@
 package org.jeecg.modules.system.entity;
 
-import java.util.Date;
-
-import org.jeecg.common.aspect.annotation.Dict;
-import org.springframework.format.annotation.DateTimeFormat;
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

+ 13 - 13
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermission.java

@@ -1,15 +1,15 @@
 package org.jeecg.modules.system.entity;
 
-import java.io.Serializable;
-import java.util.Date;
+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 lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -60,7 +60,7 @@ public class SysPermission implements Serializable {
 	 * 组件
 	 */
 	private String component;
-	
+
 	/**
 	 * 组件名字
 	 */
@@ -91,7 +91,7 @@ public class SysPermission implements Serializable {
 	 */
 	@TableField(value="is_leaf")
 	private boolean leaf;
-	
+
 	/**
 	 * 是否路由菜单: 0:不是  1:是(默认值1)
 	 */
@@ -119,12 +119,12 @@ public class SysPermission implements Serializable {
 	 * 删除状态 0正常 1已删除
 	 */
 	private Integer delFlag;
-	
+
 	/**
 	 * 是否配置菜单的数据权限 1是0否 默认0
 	 */
 	private Integer ruleFlag;
-	
+
 	/**
 	 * 是否隐藏路由菜单: 0否,1是(默认值0)
 	 */
@@ -144,15 +144,15 @@ public class SysPermission implements Serializable {
 	 * 更新时间
 	 */
 	private Date updateTime;
-	
+
 	/**按钮权限状态(0无效1有效)*/
 	private java.lang.String status;
-	
+
 	/**alwaysShow*/
     private boolean alwaysShow;
-    
+
     public SysPermission() {
-    	
+
     }
     public SysPermission(boolean index) {
     	if(index) {
@@ -171,6 +171,6 @@ public class SysPermission implements Serializable {
         	this.leaf=true;
         	this.hidden=false;
     	}
-    	
+
     }
 }

+ 8 - 11
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -1,22 +1,19 @@
 package org.jeecg.modules.system.entity;
 
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
+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.TableLogic;
 import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.io.Serializable;
-
 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.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsFileController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.wps.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.constant.CtopRoleCodeConstant;
 import cn.com.ctop.common.module.service.ISysRoleService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,7 +11,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.wps.base.Response;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsFileVersionController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.wps.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.wps.entity.WpsFileVersion;
 import org.jeecg.modules.wps.service.IWpsFileVersionService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsFileWatermarkController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.wps.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.wps.entity.WpsFileWatermark;
 import org.jeecg.modules.wps.service.IWpsFileWatermarkService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsUserAclController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.wps.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.wps.entity.WpsUserAcl;
 import org.jeecg.modules.wps.service.IWpsUserAclService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsUserController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.wps.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.wps.entity.WpsUser;
 import org.jeecg.modules.wps.service.IWpsUserService;

+ 1 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/entity/WpsFile.java

@@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 /**
@@ -43,8 +42,7 @@ public class WpsFile {
 	/**creator*/
 	@Excel(name = "creator", width = 15)
     @ApiModelProperty(value = "creator")
-	@Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
-	private String creator;
+    private String creator;
 	/**createTime*/
 	@Excel(name = "createTime", width = 15)
     @ApiModelProperty(value = "createTime")
@@ -69,7 +67,6 @@ public class WpsFile {
 	@Excel(name = "canDelete", width = 15)
     @ApiModelProperty(value = "canDelete")
 	private String canDelete;
-	@Dict(dicCode = "id", dictTable = "ctop_project", dicText = "project_name")
 	private Long projectId;
 
 	private String code;

+ 1 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/impl/WpsFileServiceImpl.java

@@ -31,7 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.net.URLEncoder;
 import java.util.*;
 
 /**
@@ -173,8 +172,7 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
         FileDTO file = new FileDTO();
         BeanUtils.copyProperties(fileEntity,file);
         String url = fileEntity.getDownloadUrl();
-        url = URLEncoder.encode(url.replace(OSS_URL_PREFIX,""));
-        file.setDownload_url(OSS_URL_PREFIX+url);
+        file.setDownload_url(url);
         file.setUser_acl(userAcl);
         file.setWatermark(watermark);
         result.put("file",file);

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

@@ -4,18 +4,25 @@ import cn.com.ctop.common.module.entity.BindAccountLogin;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.IBindAccountLoginService;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.common.module.utils.CloudVideoProcessUtil;
+import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.CorpWexinUtils;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
+import cn.com.ctop.common.module.utils.HttpUtils;
 import cn.com.ctop.crawler.modules.pangolin.entity.PangolinApp;
 import cn.com.ctop.crawler.modules.pangolin.service.PangolinAppService;
 import cn.com.ctop.crawler.modules.pangolin.service.PangolinCrawlerService;
 import cn.com.ctop.crawler.modules.pangolin.service.PangolinLoginService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceCampaignService;
+import cn.com.ctop.toutiao.modules.material.vo.BytedanceCampaignEditVo;
 import cn.com.ctop.toutiao.modules.report.service.IReportService;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.cp.bean.WxCpMessage;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.ctop.entity.KuaishouEffectVideoInfo;
 import org.jeecg.modules.ctop.service.IKuaishouEffectVideoInfoService;
@@ -27,10 +34,14 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.api.impl.WxCpServiceImpl;
+import me.chanjar.weixin.cp.bean.WxCpMessage;
+import me.chanjar.weixin.cp.config.impl.WxCpDefaultConfigImpl;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
@@ -42,10 +53,17 @@ public class SampleTest {
     private IByteDanceAdvertiserDataService advertiserDataService;
     @Autowired
     private IReportService reportService;
+    @Autowired
+    private IKuaishouInterfaceService interfaceService;
+
     @Test
-    public void testOceanEngineJob() {
-        Map<String, Object> stringObjectMap = CloudVideoProcessUtil.videoCutFrameHandle("video/2019-10-30/ios推广视频-1572428291052.mp4", "video/2019-10-30/cut/${Number}.jpg");
-        System.err.println(stringObjectMap);
+    public void loadBytedanceCampaignData() {
+
+
+       // CorpWexinUtils.sendMessageByWeChatId("34585ddd4bd86e57756cf6a51b9443a5","测试消息发送");
+        interfaceService.getAppList(23212L,"493aedfee07d9c500c50077e7c808145");
+
+
 
     }
 
@@ -69,7 +87,7 @@ public class SampleTest {
         log.info("总用时:{}毫秒", end - start);
     }
 
-    static ExecutorService executorService = null;
+    static ExecutorService executorService = Executors.newFixedThreadPool(10);;
     static CountDownLatch countDownLatch = null;
 
     @Test
@@ -77,7 +95,6 @@ public class SampleTest {
         Long start = System.currentTimeMillis();
         List<BindAccountLogin> list = bindAccountLoginService.getListByParams(CtopAdConstant.PLATFORM_TYPE_KUAISHOU_PY, 1);
         if (list != null && !list.isEmpty()) {
-            executorService = Executors.newFixedThreadPool(10);
             countDownLatch = new CountDownLatch(list.size());
             list.forEach(login -> {
                 executorService.submit(() -> {
@@ -160,15 +177,22 @@ public class SampleTest {
         List<KuaishouEffectVideoInfo>videoInfos = effectVideoInfoService.list();
         for (KuaishouEffectVideoInfo video:videoInfos) {
             if(null!=video.getSignature()&&!"".equals(video.getSignature())){
-//                effectVideoInfoService.updateFinalCostDateBySignature(video.getSignature());
-//                effectVideoInfoService.updateInitialCostDateBySignature(video.getSignature());
-//                effectVideoInfoService.updateTotalCostBySignature(video.getSignature());
-                if(null==video.getTwoWeekCost()){
-                    effectVideoInfoService.updateTowWeekCostBySignature(video.getSignature());
-                }
+                effectVideoInfoService.updateFinalCostDateBySignature(video.getSignature());
+                effectVideoInfoService.updateInitialCostDateBySignature(video.getSignature());
+                effectVideoInfoService.updateTotalCostBySignature(video.getSignature());
+//                effectVideoInfoService.updateTowWeekCostBySignature(video.getSignature());
             }
         }
     }
+
+    @Test
+    public void getIndustryInfo(){
+        String access_token = "cbdf6502c04978ae401cb92a64530fb73a8c7dbe";
+        // 请求地址
+        String url = "https://ad.oceanengine.com/open_api/2/tools/industry/get/";
+        JSONObject jsonObject = HttpUtils.bytedanceGetRequest(access_token, url, new JSONObject());
+        System.out.println(jsonObject.toJSONString());
+    }
 }
 
 

+ 18 - 0
module-common/src/main/java/cn/com/ctop/common/module/annotation/Dict.java

@@ -39,4 +39,22 @@ public @interface Dict {
      * @return 返回类型: String
      */
     String dictTable() default "";
+
+    /**
+     * 方法描述: 数据字典表
+     * 作    者: dangzhenghui
+     * 日    期: 2019年03月17日-下午9:37:16
+     *
+     * @return 返回类型: String
+     */
+    String extendsKey() default "";
+
+    /**
+     * 方法描述: 数据字典表
+     * 作    者: dangzhenghui
+     * 日    期: 2019年03月17日-下午9:37:16
+     *
+     * @return 返回类型: String
+     */
+    String extendsValue() default "";
 }

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/constant/CtopRoleCodeConstant.java

@@ -1,5 +1,5 @@
 package cn.com.ctop.common.module.constant;
 
-public class CtopRoleCodeConstant {
+public class  CtopRoleCodeConstant {
     public static final String COMMON_ROLE_CODE_ADMIN = "admin";
 }

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

@@ -165,4 +165,7 @@ public class MaterialInfo {
     private String projectName;  // 是否有未审核封面
 
 
+    private String supplierCode; // 素造供应商
+
+
 }

+ 15 - 3
module-common/src/main/java/cn/com/ctop/common/module/entity/Project.java

@@ -30,7 +30,6 @@ import java.util.Date;
 @Accessors(chain = true)
 @ApiModel(value = "ctop_project对象", description = "项目")
 public class Project {
-
     /**
      * id
      */
@@ -54,8 +53,9 @@ public class Project {
     @ApiModelProperty(value = "广告主名称")
     private String advertiserName;
 
-    @Dict(dicCode = "id",dictTable="sys_category",dicText="name")
+    @Dict(dicCode = "id", dictTable = "sys_category", dicText = "name")
     private String industryId;
+    @Dict(dicCode = "code", dictTable = "sys_category", dicText = "name")
     private String industryCode;
     /**
      * 创建人
@@ -98,6 +98,18 @@ public class Project {
      * 最高出价
      */
     private Long maxBid;
+
+    private String supplierCode;
+
+    /**
+     * 销售
+     */
+    @TableField(exist = false)
+    private String supplierCode_dictText;
+
+    // 销售
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
+    private String saleId;
     /**
      * 最高深度转化出价
      */
@@ -119,7 +131,7 @@ public class Project {
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
-
     @TableField(exist = false)
     private Integer needExamine;
+
 }

+ 65 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/SupplierList.java

@@ -0,0 +1,65 @@
+package cn.com.ctop.common.module.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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 2020-07-27
+ */
+@Data
+@TableName("ctop_supplier_list")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_supplier_list对象", description = "供应商列表")
+public class SupplierList {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    /**
+     * 供应商code
+     */
+    @Excel(name = "供应商code", width = 15)
+    @ApiModelProperty(value = "供应商code")
+    private String supplierCode;
+    /**
+     * 供应商名称
+     */
+    @Excel(name = "供应商名称", width = 15)
+    @ApiModelProperty(value = "供应商名称")
+    private String supplierName;
+    /**
+     * 创建时间
+     */
+    @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 = 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;
+}

+ 65 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/SupplierWatermark.java

@@ -0,0 +1,65 @@
+package cn.com.ctop.common.module.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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 2020-07-28
+ */
+@Data
+@TableName("ctop_supplier_watermark")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_supplier_watermark对象", description = "供应商水印")
+public class SupplierWatermark {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+    private Long id;
+    /**
+     * 项目名称
+     */
+    @Excel(name = "项目名称", width = 15)
+    @ApiModelProperty(value = "项目名称")
+    private String videoSignature;
+    /**
+     * 水印
+     */
+    @Excel(name = "水印", width = 15)
+    @ApiModelProperty(value = "水印")
+    private String watermarkUrl;
+    /**
+     * 创建时间
+     */
+    @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 = 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;
+}

+ 71 - 0
module-common/src/main/java/cn/com/ctop/common/module/enums/MaterialSupplierEnum.java

@@ -0,0 +1,71 @@
+package cn.com.ctop.common.module.enums;
+
+/**
+ * 素材类型
+ */
+public enum MaterialSupplierEnum {
+
+
+    VerticalVideoSmall(559368L, 720, 1280),
+    VerticalVideoBig(560827L, 1080, 1920),
+    HorizontalVideoSmall(560828L, 1280, 720),
+    HorizontalVideoBig(560829L, 1920, 1080);
+
+
+    private Long templateId;
+    private Integer width;
+    private Integer height;
+
+
+    private MaterialSupplierEnum(Long templateId, Integer width, Integer height) {
+        this.templateId = templateId;
+        this.width = width;
+        this.height = height;
+    }
+
+    public static Long getTemplateIdBySize(Integer widthStr, Integer heightStr) {
+        for (MaterialSupplierEnum material : MaterialSupplierEnum.values()) {
+            Integer width = material.getWidth();
+            Integer height = material.getHeight();
+            if (widthStr.equals(width)  && heightStr.equals(height)) {
+                return material.getTemplateId();
+            }
+        }
+
+        return 0L;
+    }
+
+
+    public Long getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(Long templateId) {
+        this.templateId = templateId;
+    }
+
+    public Integer getWidth() {
+        return width;
+    }
+
+    public void setWidth(Integer width) {
+        this.width = width;
+    }
+
+    public Integer getHeight() {
+        return height;
+    }
+
+    public void setHeight(Integer height) {
+        this.height = height;
+    }
+
+    @Override
+    public String toString() {
+        return "MaterialSupplierEnum{" +
+                "templateId=" + templateId +
+                ", width=" + width +
+                ", height=" + height +
+                '}';
+    }
+}

+ 15 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/SupplierListMapper.java

@@ -0,0 +1,15 @@
+package cn.com.ctop.common.module.mapper;
+
+import cn.com.ctop.common.module.entity.SupplierList;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 供应商列表
+ *
+ * @author: jeecg-boot
+ * @date: 2020-07-27
+ * @cersion: V1.0
+ */
+public interface SupplierListMapper extends BaseMapper<SupplierList> {
+
+}

+ 15 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/SupplierWatermarkMapper.java

@@ -0,0 +1,15 @@
+package cn.com.ctop.common.module.mapper;
+
+import cn.com.ctop.common.module.entity.SupplierWatermark;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 供应商水印
+ *
+ * @author: jeecg-boot
+ * @date: 2020-07-28
+ * @cersion: V1.0
+ */
+public interface SupplierWatermarkMapper extends BaseMapper<SupplierWatermark> {
+
+}

+ 1 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/UserAllocationMapper.java

@@ -14,4 +14,5 @@ import java.util.List;
  */
 public interface UserAllocationMapper extends BaseMapper<UserAllocation> {
     List<UserAllocation> selectAccountListByProjectId(@Param("projectId")Long projectId);
+    String queryAdvertiserId(@Param("accountId")Long accountId);
 }

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SupplierListMapper.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.common.module.mapper.SupplierListMapper">
+
+</mapper>

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SupplierWatermarkMapper.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.common.module.mapper.SupplierWatermarkMapper">
+
+</mapper>

+ 8 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/UserAllocationMapper.xml

@@ -13,4 +13,12 @@
         left join ctop_project b on a.project_id = b.id
         where b.id = #{projectId}
     </select>
+
+    <select id="queryAdvertiserId" resultType="String">
+        select
+            distinct advertiser_id
+        from
+            ctop_user_allocation
+        where account_id=#{accountId}
+    </select>
 </mapper>

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


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels