浏览代码

合并代码

syh 4 年之前
父节点
当前提交
74ff9fcff8
共有 66 个文件被更改,包括 580 次插入314 次删除
  1. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouAdvertiserController.java
  2. 1 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java
  3. 0 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/AutoLogAspect.java
  4. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/DictAspect.java
  5. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java
  6. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java
  7. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
  8. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java
  9. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java
  10. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.java
  11. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
  12. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java
  13. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysLogController.java
  14. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDictPage.java
  15. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDictTree.java
  16. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java
  17. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java
  18. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java
  19. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysCategoryService.java
  20. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysLogService.java
  21. 6 7
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/AutoPoiDictService.java
  22. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java
  23. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java
  24. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java
  25. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java
  26. 11 121
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  27. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java
  28. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java
  29. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysCategory.java
  30. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java
  31. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDict.java
  32. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java
  33. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysLog.java
  34. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java
  35. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java
  36. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.java
  37. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDataSourceMapper.java
  38. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java
  39. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java
  40. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java
  41. 9 9
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml
  42. 9 9
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
  43. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysCategoryMapper.xml
  44. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDataSourceMapper.xml
  45. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictItemMapper.xml
  46. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
  47. 14 14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml
  48. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java
  49. 7 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java
  50. 9 9
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/TreeSelectModel.java
  51. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDataSourceService.java
  52. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java
  53. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDictService.java
  54. 6 13
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
  55. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDataSourceServiceImpl.java
  56. 6 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictItemServiceImpl.java
  57. 11 11
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
  58. 2 1
      module-job-bytedance/src/main/resources/application.yml
  59. 1 6
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/material/entity/EtlKuaishouVideoInfo.java
  60. 13 7
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/material/service/impl/EtlKuaishouVideoInfoServiceImpl.java
  61. 107 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/EtlKuaishouAccountMaterialReportDaily.java
  62. 22 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/EtlKuaishouAccountMaterialReportDailyMapper.java
  63. 1 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/EtlKuaishouReportVideoDailyMapper.java
  64. 184 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/EtlKuaishouAccountMaterialReportDailyMapper.xml
  65. 15 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IEtlKuaishouAccountMaterialReportDailyService.java
  66. 54 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/EtlKuaishouAccountMaterialReportDailyServiceImpl.java

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

@@ -14,7 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysCategory;
+import cn.com.ctop.common.module.entity.SysCategory;
 import org.jeecg.modules.system.service.ISysCategoryService;
 import org.jeecg.modules.system.service.ISysCategoryService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;

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

@@ -2,7 +2,6 @@ package org.jeecg.modules.ngalain.controller;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
-import java.util.Map;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 
 
@@ -11,7 +10,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.ngalain.service.NgAlainService;
 import org.jeecg.modules.ngalain.service.NgAlainService;
-import org.jeecg.modules.system.service.ISysDictService;
+import cn.com.ctop.common.module.service.ISysDictService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -14,7 +14,6 @@ import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.IPUtils;
 import org.jeecg.common.util.IPUtils;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.SpringContextUtils;
-import org.jeecg.modules.system.entity.SysLog;
 import org.jeecg.modules.system.service.ISysLogService;
 import org.jeecg.modules.system.service.ISysLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.core.LocalVariableTableParameterNameDiscoverer;

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

@@ -14,7 +14,7 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.service.ISysDictService;
+import cn.com.ctop.common.module.service.ISysDictService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import org.springframework.util.StringUtils;

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

@@ -5,8 +5,8 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.system.mapper.SysDictMapper;
-import org.jeecg.modules.system.model.DuplicateCheckVo;
+import cn.com.ctop.common.module.mapper.SysDictMapper;
+import cn.com.ctop.common.module.model.DuplicateCheckVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;

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

@@ -38,7 +38,7 @@ import org.jeecg.common.util.*;
 import org.jeecg.common.util.encryption.EncryptedString;
 import org.jeecg.common.util.encryption.EncryptedString;
 import org.jeecg.modules.shiro.vo.DefContants;
 import org.jeecg.modules.shiro.vo.DefContants;
 import org.jeecg.modules.system.model.SysLoginModel;
 import org.jeecg.modules.system.model.SysLoginModel;
-import org.jeecg.modules.system.service.ISysDictService;
+import cn.com.ctop.common.module.service.ISysDictService;
 import org.jeecg.modules.system.service.ISysLogService;
 import org.jeecg.modules.system.service.ISysLogService;
 import org.jeecg.modules.system.util.RandImageUtil;
 import org.jeecg.modules.system.util.RandImageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -17,8 +17,8 @@ import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
 import cn.com.ctop.common.module.message.websocket.WebSocket;
 import cn.com.ctop.common.module.message.websocket.WebSocket;
-import org.jeecg.modules.system.entity.SysAnnouncement;
-import org.jeecg.modules.system.entity.SysAnnouncementSend;
+import cn.com.ctop.common.module.entity.SysAnnouncement;
+import cn.com.ctop.common.module.entity.SysAnnouncementSend;
 import org.jeecg.modules.system.service.ISysAnnouncementSendService;
 import org.jeecg.modules.system.service.ISysAnnouncementSendService;
 import org.jeecg.modules.system.service.ISysAnnouncementService;
 import org.jeecg.modules.system.service.ISysAnnouncementService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;

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

@@ -12,8 +12,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysAnnouncementSend;
-import org.jeecg.modules.system.model.AnnouncementSendModel;
+import cn.com.ctop.common.module.entity.SysAnnouncementSend;
+import cn.com.ctop.common.module.model.AnnouncementSendModel;
 import org.jeecg.modules.system.service.ISysAnnouncementSendService;
 import org.jeecg.modules.system.service.ISysAnnouncementSendService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

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

@@ -12,8 +12,8 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysCategory;
-import org.jeecg.modules.system.model.TreeSelectModel;
+import cn.com.ctop.common.module.entity.SysCategory;
+import cn.com.ctop.common.module.model.TreeSelectModel;
 import org.jeecg.modules.system.service.ISysCategoryService;
 import org.jeecg.modules.system.service.ISysCategoryService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;

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

@@ -1,5 +1,7 @@
 package org.jeecg.modules.system.controller;
 package org.jeecg.modules.system.controller;
 
 
+import cn.com.ctop.common.module.entity.SysDataSource;
+import cn.com.ctop.common.module.service.ISysDataSourceService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -12,8 +14,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.dynamic.db.DataSourceCachePool;
 import org.jeecg.common.util.dynamic.db.DataSourceCachePool;
-import org.jeecg.modules.system.entity.SysDataSource;
-import org.jeecg.modules.system.service.ISysDataSourceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.ModelAndView;

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

@@ -18,13 +18,13 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.ImportExcelUtil;
 import org.jeecg.common.util.ImportExcelUtil;
 import org.jeecg.common.util.SqlInjectionUtil;
 import org.jeecg.common.util.SqlInjectionUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysDict;
-import org.jeecg.modules.system.entity.SysDictItem;
+import cn.com.ctop.common.module.entity.SysDict;
+import cn.com.ctop.common.module.entity.SysDictItem;
 import org.jeecg.modules.system.model.SysDictPage;
 import org.jeecg.modules.system.model.SysDictPage;
 import org.jeecg.modules.system.model.SysDictTree;
 import org.jeecg.modules.system.model.SysDictTree;
-import org.jeecg.modules.system.model.TreeSelectModel;
-import org.jeecg.modules.system.service.ISysDictItemService;
-import org.jeecg.modules.system.service.ISysDictService;
+import cn.com.ctop.common.module.model.TreeSelectModel;
+import cn.com.ctop.common.module.service.ISysDictItemService;
+import cn.com.ctop.common.module.service.ISysDictService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;

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

@@ -8,8 +8,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.system.entity.SysDictItem;
-import org.jeecg.modules.system.service.ISysDictItemService;
+import cn.com.ctop.common.module.entity.SysDictItem;
+import cn.com.ctop.common.module.service.ISysDictItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.system.controller;
 package org.jeecg.modules.system.controller;
 
 
 
 
+import cn.com.ctop.common.module.entity.SysLog;
 import cn.com.ctop.common.module.entity.SysRole;
 import cn.com.ctop.common.module.entity.SysRole;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,7 +10,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysLog;
 import org.jeecg.modules.system.service.ISysLogService;
 import org.jeecg.modules.system.service.ISysLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDictPage.java

@@ -1,7 +1,7 @@
 package org.jeecg.modules.system.model;
 package org.jeecg.modules.system.model;
 
 
 import lombok.Data;
 import lombok.Data;
-import org.jeecg.modules.system.entity.SysDictItem;
+import cn.com.ctop.common.module.entity.SysDictItem;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.ExcelCollection;
 import org.jeecgframework.poi.excel.annotation.ExcelCollection;
 
 

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDictTree.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
-import org.jeecg.modules.system.entity.SysDict;
+import cn.com.ctop.common.module.entity.SysDict;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;
 
 

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java

@@ -6,8 +6,8 @@ import org.jeecg.common.handler.IFillRuleHandler;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.YouBianCodeUtil;
 import org.jeecg.common.util.YouBianCodeUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysCategory;
-import org.jeecg.modules.system.mapper.SysCategoryMapper;
+import cn.com.ctop.common.module.entity.SysCategory;
+import cn.com.ctop.common.module.mapper.SysCategoryMapper;
 
 
 import java.util.List;
 import java.util.List;
 
 

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

@@ -2,8 +2,8 @@ package org.jeecg.modules.system.service;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.system.entity.SysAnnouncementSend;
-import org.jeecg.modules.system.model.AnnouncementSendModel;
+import cn.com.ctop.common.module.entity.SysAnnouncementSend;
+import cn.com.ctop.common.module.model.AnnouncementSendModel;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java

@@ -2,7 +2,7 @@ package org.jeecg.modules.system.service;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.system.entity.SysAnnouncement;
+import cn.com.ctop.common.module.entity.SysAnnouncement;
 
 
 /**
 /**
  * @Description: 系统通告表
  * @Description: 系统通告表

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

@@ -2,8 +2,8 @@ package org.jeecg.modules.system.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.modules.system.entity.SysCategory;
-import org.jeecg.modules.system.model.TreeSelectModel;
+import cn.com.ctop.common.module.entity.SysCategory;
+import cn.com.ctop.common.module.model.TreeSelectModel;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysLogService.java

@@ -1,7 +1,7 @@
 package org.jeecg.modules.system.service;
 package org.jeecg.modules.system.service;
 
 
+import cn.com.ctop.common.module.entity.SysLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.system.entity.SysLog;
 
 
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;

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

@@ -2,11 +2,10 @@ package org.jeecg.modules.system.service.impl;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
-import java.util.Map;
 
 
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.mapper.SysDictMapper;
+import cn.com.ctop.common.module.mapper.SysDictMapper;
 import org.jeecgframework.dict.service.AutoPoiDictServiceI;
 import org.jeecgframework.dict.service.AutoPoiDictServiceI;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -18,9 +17,9 @@ import lombok.extern.slf4j.Slf4j;
  *  举例: @Excel(name = "性别", width = 15, dicCode = "sex")
  *  举例: @Excel(name = "性别", width = 15, dicCode = "sex")
  * 1、导出的时候会根据字典配置,把值1,2翻译成:男、女;
  * 1、导出的时候会根据字典配置,把值1,2翻译成:男、女;
  * 2、导入的时候,会把男、女翻译成1,2存进数据库;
  * 2、导入的时候,会把男、女翻译成1,2存进数据库;
- * 
- * @Author:scott 
- * @since:2019-04-09 
+ *
+ * @Author:scott
+ * @since:2019-04-09
  * @Version:1.0
  * @Version:1.0
  */
  */
 @Slf4j
 @Slf4j
@@ -31,8 +30,8 @@ public class AutoPoiDictService implements AutoPoiDictServiceI {
 
 
 	/**
 	/**
 	 * 通过字典查询easypoi,所需字典文本
 	 * 通过字典查询easypoi,所需字典文本
-	 * 
-	 * @Author:scott 
+	 *
+	 * @Author:scott
 	 * @since:2019-04-09
 	 * @since:2019-04-09
 	 * @return
 	 * @return
 	 */
 	 */

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

@@ -2,9 +2,9 @@ package org.jeecg.modules.system.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.system.entity.SysAnnouncementSend;
-import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper;
-import org.jeecg.modules.system.model.AnnouncementSendModel;
+import cn.com.ctop.common.module.entity.SysAnnouncementSend;
+import cn.com.ctop.common.module.mapper.SysAnnouncementSendMapper;
+import cn.com.ctop.common.module.model.AnnouncementSendModel;
 import org.jeecg.modules.system.service.ISysAnnouncementSendService;
 import org.jeecg.modules.system.service.ISysAnnouncementSendService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 

+ 4 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java

@@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysAnnouncement;
-import org.jeecg.modules.system.entity.SysAnnouncementSend;
-import org.jeecg.modules.system.mapper.SysAnnouncementMapper;
-import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper;
+import cn.com.ctop.common.module.entity.SysAnnouncement;
+import cn.com.ctop.common.module.entity.SysAnnouncementSend;
+import cn.com.ctop.common.module.mapper.SysAnnouncementMapper;
+import cn.com.ctop.common.module.mapper.SysAnnouncementSendMapper;
 import org.jeecg.modules.system.service.ISysAnnouncementService;
 import org.jeecg.modules.system.service.ISysAnnouncementService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -7,9 +7,9 @@ import org.jeecg.common.constant.FillRuleConstant;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.util.FillRuleUtil;
 import org.jeecg.common.util.FillRuleUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysCategory;
-import org.jeecg.modules.system.mapper.SysCategoryMapper;
-import org.jeecg.modules.system.model.TreeSelectModel;
+import cn.com.ctop.common.module.entity.SysCategory;
+import cn.com.ctop.common.module.mapper.SysCategoryMapper;
+import cn.com.ctop.common.module.model.TreeSelectModel;
 import org.jeecg.modules.system.service.ISysCategoryService;
 import org.jeecg.modules.system.service.ISysCategoryService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 

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

@@ -1,9 +1,9 @@
 package org.jeecg.modules.system.service.impl;
 package org.jeecg.modules.system.service.impl;
 
 
+import cn.com.ctop.common.module.entity.SysLog;
+import cn.com.ctop.common.module.mapper.SysLogMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.system.api.ISysBaseApi;
 import org.jeecg.common.system.api.ISysBaseApi;
-import org.jeecg.modules.system.entity.SysLog;
-import org.jeecg.modules.system.mapper.SysLogMapper;
 import org.jeecg.modules.system.service.ISysLogService;
 import org.jeecg.modules.system.service.ISysLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;

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

@@ -12,10 +12,7 @@ import cn.com.ctop.kuaishou.modules.ai.service.IAiKuaishouAccountTargetTemplateS
 import cn.com.ctop.kuaishou.modules.ai.service.IAiKuaishouNewCreateCampaign;
 import cn.com.ctop.kuaishou.modules.ai.service.IAiKuaishouNewCreateCampaign;
 import cn.com.ctop.kuaishou.modules.batch.service.*;
 import cn.com.ctop.kuaishou.modules.batch.service.*;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
-import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyAgentService;
-import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyImageService;
-import cn.com.ctop.kuaishou.modules.report.service.IKuaishouVideoEtlInfoService;
-import cn.com.ctop.kuaishou.modules.report.service.IRuleKuaiShouPlanService;
+import cn.com.ctop.kuaishou.modules.report.service.*;
 import cn.com.ctop.oa.modules.service.IWechatCheckinDataService;
 import cn.com.ctop.oa.modules.service.IWechatCheckinDataService;
 import cn.com.ctop.oa.modules.service.IWechatNoListService;
 import cn.com.ctop.oa.modules.service.IWechatNoListService;
 import cn.com.ctop.oa.modules.service.IWechatUserListService;
 import cn.com.ctop.oa.modules.service.IWechatUserListService;
@@ -484,61 +481,8 @@ public class SampleTest {
 
 
     @Autowired
     @Autowired
     IRuleByteDanceAccountService ruleByteDanceAccountService;
     IRuleByteDanceAccountService ruleByteDanceAccountService;
-
-    @Test
-    public void cleanRuleDataAccount() {
-        List<CtopOauthToken> tokens = oauthTokenService.selectKuaiShouToken();
-        for (CtopOauthToken oauthToken : tokens) {
-            ruleKuaiShouPlanService.cleanRuleDataTarget(oauthToken.getAccountId(), 1);
-        }
-    }
-
     @Autowired
     @Autowired
     IAiKuaishouNewCreateCampaign aiKuaishouNewCreateCampaign;
     IAiKuaishouNewCreateCampaign aiKuaishouNewCreateCampaign;
-    @Autowired
-    private IAiKuaishouAccountTargetTemplateService aiKuaishouAccountTargetTemplateService;
-
-    @Test
-    public void createPlan() {
-        List<AiKuaishouAccountTargetTemplate> accountTargetTemplates = aiKuaishouAccountTargetTemplateService.getAllEffectTemplate();
-        if (null == accountTargetTemplates || accountTargetTemplates.isEmpty()) {
-            return;
-        }
-        accountTargetTemplates.forEach(targetTemplate -> aiKuaishouNewCreateCampaign.kuaishouAiAdsNewMaterialCreativity(targetTemplate));
-    }
-
-    @Test
-    public void testCreatePlan() {
-//        List<AiKuaishouAccountTargetTemplate> accountTargetTemplates = aiKuaishouAccountTargetTemplateService.getAllEffectTemplate();
-//        if (null == accountTargetTemplates || accountTargetTemplates.isEmpty()) {
-//            return;
-//        }
-//        for (AiKuaishouAccountTargetTemplate template:accountTargetTemplates){
-//            if(template.getAccountId()!=9556344L){
-//                AiKuaishouAccountTargetTemplate accountTargetTemplate2 = aiKuaishouAccountTargetTemplateService.getByAccountId(template.getAccountId());
-//                aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate2,50);
-//            }
-//        }
-        /**
-         * 120002
-         * 150001
-         * 150002
-         * 150003
-         * 150004
-         */
-
-        AiKuaishouAccountTargetTemplate accountTargetTemplate2 = aiKuaishouAccountTargetTemplateService.getById(120002);
-        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate2, 250);
-        accountTargetTemplate2 = aiKuaishouAccountTargetTemplateService.getById(150001);
-        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate2, 250);
-        accountTargetTemplate2 = aiKuaishouAccountTargetTemplateService.getById(150002);
-        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate2, 250);
-        accountTargetTemplate2 = aiKuaishouAccountTargetTemplateService.getById(150003);
-        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate2, 250);
-        accountTargetTemplate2 = aiKuaishouAccountTargetTemplateService.getById(150004);
-        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate2, 250);
-    }
-
     @Test
     @Test
     public void testLoadBytedanceDataV2(){
     public void testLoadBytedanceDataV2(){
         String accountIds=
         String accountIds=
@@ -602,76 +546,12 @@ public class SampleTest {
         }
         }
     }
     }
 
 
-
-    @Test
-    public void checkBytedanceReport(){
-        CtopOauthToken token = tokenService.getTokenByAccountId(1678959391271949L);
-        String startDate = "2021-01-01 00:00:00";
-        String endDate = "2021-01-31 00:00:00";
-        bytedanceReportService.checkoutData(token,startDate,endDate);
-    }
-    @Test
-    public void etlKuaishouProjectData() {
-        CtopOauthToken token = tokenService.getTokenByAccountId(1660666858777607L);
-        reportService.getAdvertiserPlanReport(token, DateUtils.parseDate("2021-01-25", "yyyy-MM-dd"), DateUtils.parseDate("2021-01-25", "yyyy-MM-dd"), CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
-    }
-
     @Autowired
     @Autowired
     IBytedanceVideoReportService bytedanceVideoReportService;
     IBytedanceVideoReportService bytedanceVideoReportService;
 
 
-    @Test
-    public void etlBytedanceVideoReport() {
-
-        for (int i = 27; i <= 35; i++) {
-            etlBytedanceVideo(DateUtils.formatDate(DateUtils.addDay(new Date(), -i)));
-        }
-        //etlBytedanceVideo("2021-02-03");
-
-    }
-
-    private void etlBytedanceVideo(String statDate) {
-        List<CtopOauthToken> tokens = oauthTokenService.selectToutiaoToken();
-        executorService = Executors.newFixedThreadPool(10);
-        countDownLatch = new CountDownLatch(tokens.size());
-        tokens.forEach(token -> executorService.submit(() -> {
-            try {
-                Long[] materials={6904990807503634445L,6904990807503634445L};
-                bytedanceVideoReportService.pullVideoReportByMaterialId(token, statDate, statDate, materials,1);
-                //bytedanceVideoReportService.pullVideoReport(token, statDate, statDate, 1);
-            } catch (Exception e) {
-
-            } finally {
-                countDownLatch.countDown();
-            }
-        }));
-        try {
-            countDownLatch.await();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-
     @Autowired
     @Autowired
     IETLReportBytedanceVideoService ietlReportBytedanceVideoService;
     IETLReportBytedanceVideoService ietlReportBytedanceVideoService;
 
 
-    @Test
-    public void etlBytedanceVideoReportClean() {
-        //for (int i = 1; i <= 1; i++) {
-          //  String statDate = DateUtils.formatDate(DateUtils.addDay(new Date(), -i));
-            ietlReportBytedanceVideoService.cleanETL("2020-12-31");
-        //}
-    }
-
-    @Test
-    public void etlBytedanceVideoReportClean1() {
-
-        for (int i = 3; i <= 31; i++) {
-            String statDate = DateUtils.formatDate(DateUtils.addDay(new Date(), -i));
-            ietlReportBytedanceVideoService.cleanETL(statDate);
-        }
-    }
-
-
     @Autowired
     @Autowired
     IKuaishouReportDailyImageService kuaishouReportDailyImageService;
     IKuaishouReportDailyImageService kuaishouReportDailyImageService;
 
 
@@ -696,4 +576,14 @@ public class SampleTest {
         }
         }
     }
     }
 
 
+    @Autowired
+    private IEtlKuaishouAccountMaterialReportDailyService dailyService;
+    @Test
+    public void etlKuaishouInfo(){
+        Date startDate = DateUtils.parseDate("2020-05-03","yyyy-MM-dd");
+        for(int i=0;i<365;i++){
+            dailyService.etlKuaishouAccountMaterialReportDailyData(DateUtils.formatDate(DateUtils.addDay(startDate,i)));
+        }
     }
     }
+
+}

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.system.entity;
+package cn.com.ctop.common.module.entity;
 
 
 import cn.com.ctop.common.module.annotation.Dict;
 import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.system.entity;
+package cn.com.ctop.common.module.entity;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;
@@ -19,7 +19,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 @TableName("sys_announcement_send")
 @TableName("sys_announcement_send")
 public class SysAnnouncementSend implements Serializable {
 public class SysAnnouncementSend implements Serializable {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
-    
+
 	/**id*/
 	/**id*/
 	@TableId(type = IdType.ID_WORKER_STR)
 	@TableId(type = IdType.ID_WORKER_STR)
 	private java.lang.String id;
 	private java.lang.String id;

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.system.entity;
+package cn.com.ctop.common.module.entity;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.system.entity;
+package cn.com.ctop.common.module.entity;
 
 
 import cn.com.ctop.common.module.annotation.Dict;
 import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.system.entity;
+package cn.com.ctop.common.module.entity;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.system.entity;
+package cn.com.ctop.common.module.entity;
 
 
 import cn.com.ctop.common.module.annotation.Dict;
 import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.system.entity;
+package cn.com.ctop.common.module.entity;
 
 
 import cn.com.ctop.common.module.annotation.Dict;
 import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java

@@ -1,9 +1,9 @@
-package org.jeecg.modules.system.mapper;
+package cn.com.ctop.common.module.mapper;
 
 
+import cn.com.ctop.common.module.entity.SysAnnouncement;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.system.entity.SysAnnouncement;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -16,6 +16,6 @@ import java.util.List;
 public interface SysAnnouncementMapper extends BaseMapper<SysAnnouncement> {
 public interface SysAnnouncementMapper extends BaseMapper<SysAnnouncement> {
 
 
 
 
-	List<SysAnnouncement> querySysCementListByUserId(Page<SysAnnouncement> page, @Param("userId")String userId,@Param("msgCategory")String msgCategory);
+	List<SysAnnouncement> querySysCementListByUserId(Page<SysAnnouncement> page, @Param("userId")String userId, @Param("msgCategory")String msgCategory);
 
 
 }
 }

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java

@@ -1,10 +1,10 @@
-package org.jeecg.modules.system.mapper;
+package cn.com.ctop.common.module.mapper;
 
 
+import cn.com.ctop.common.module.entity.SysAnnouncementSend;
+import cn.com.ctop.common.module.model.AnnouncementSendModel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.system.entity.SysAnnouncementSend;
-import org.jeecg.modules.system.model.AnnouncementSendModel;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.java

@@ -1,10 +1,10 @@
-package org.jeecg.modules.system.mapper;
+package cn.com.ctop.common.module.mapper;
 
 
+import cn.com.ctop.common.module.entity.SysCategory;
+import cn.com.ctop.common.module.model.TreeSelectModel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Select;
-import org.jeecg.modules.system.entity.SysCategory;
-import org.jeecg.modules.system.model.TreeSelectModel;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;

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

@@ -1,7 +1,7 @@
-package org.jeecg.modules.system.mapper;
+package cn.com.ctop.common.module.mapper;
 
 
+import cn.com.ctop.common.module.entity.SysDataSource;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.system.entity.SysDataSource;
 
 
 /**
 /**
  * @Description: 多数据源管理
  * @Description: 多数据源管理

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

@@ -1,8 +1,8 @@
-package org.jeecg.modules.system.mapper;
+package cn.com.ctop.common.module.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Select;
-import org.jeecg.modules.system.entity.SysDictItem;
+import cn.com.ctop.common.module.entity.SysDictItem;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 4 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java

@@ -1,5 +1,8 @@
-package org.jeecg.modules.system.mapper;
+package cn.com.ctop.common.module.mapper;
 
 
+import cn.com.ctop.common.module.entity.SysDict;
+import cn.com.ctop.common.module.model.DuplicateCheckVo;
+import cn.com.ctop.common.module.model.TreeSelectModel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
@@ -7,9 +10,6 @@ import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import org.apache.ibatis.annotations.Update;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.DictQuery;
 import org.jeecg.common.system.vo.DictQuery;
-import org.jeecg.modules.system.entity.SysDict;
-import org.jeecg.modules.system.model.DuplicateCheckVo;
-import org.jeecg.modules.system.model.TreeSelectModel;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;

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

@@ -1,8 +1,8 @@
-package org.jeecg.modules.system.mapper;
+package cn.com.ctop.common.module.mapper;
 
 
+import cn.com.ctop.common.module.entity.SysLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.system.entity.SysLog;
 
 
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;

+ 9 - 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysAnnouncementMapper">
+<mapper namespace="cn.com.ctop.common.module.mapper.SysAnnouncementMapper">
 
 
-	<resultMap id="SysAnnouncement" type="org.jeecg.modules.system.entity.SysAnnouncement" >
+	<resultMap id="SysAnnouncement" type="cn.com.ctop.common.module.entity.SysAnnouncement" >
 		<result column="id" property="id" jdbcType="VARCHAR"/>
 		<result column="id" property="id" jdbcType="VARCHAR"/>
 		<result column="titile" property="titile" jdbcType="VARCHAR"/>
 		<result column="titile" property="titile" jdbcType="VARCHAR"/>
 		<result column="msg_content" property="msgContent" jdbcType="VARCHAR"/>
 		<result column="msg_content" property="msgContent" jdbcType="VARCHAR"/>
@@ -26,15 +26,15 @@
 		<result column="open_type" property="openType" jdbcType="VARCHAR"/>
 		<result column="open_type" property="openType" jdbcType="VARCHAR"/>
 		<result column="open_page" property="openPage" jdbcType="VARCHAR"/>
 		<result column="open_page" property="openPage" jdbcType="VARCHAR"/>
 	</resultMap>
 	</resultMap>
-	
-	
+
+
 	<select id="querySysCementListByUserId" parameterType="String"  resultMap="SysAnnouncement">
 	<select id="querySysCementListByUserId" parameterType="String"  resultMap="SysAnnouncement">
-	   select * from sys_announcement 
-	   where send_status = '1' 
-	   and del_flag = '0' 
-	   and msg_category = #{msgCategory} 
+	   select * from sys_announcement
+	   where send_status = '1'
+	   and del_flag = '0'
+	   and msg_category = #{msgCategory}
 	   and id IN ( select annt_id from sys_announcement_send where user_id = #{userId} and read_flag = '0')
 	   and id IN ( select annt_id from sys_announcement_send where user_id = #{userId} and read_flag = '0')
 	   order by create_time DESC
 	   order by create_time DESC
 	</select>
 	</select>
 
 
-</mapper>
+</mapper>

+ 9 - 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysAnnouncementSendMapper">
-	
-	<resultMap id="AnnouncementSendModel" type="org.jeecg.modules.system.model.AnnouncementSendModel" >
+<mapper namespace="cn.com.ctop.common.module.mapper.SysAnnouncementSendMapper">
+
+	<resultMap id="AnnouncementSendModel" type="cn.com.ctop.common.module.model.AnnouncementSendModel" >
 		<result column="id" property="id" jdbcType="VARCHAR"/>
 		<result column="id" property="id" jdbcType="VARCHAR"/>
 		<result column="annt_id" property="anntId" jdbcType="VARCHAR"/>
 		<result column="annt_id" property="anntId" jdbcType="VARCHAR"/>
 		<result column="user_id" property="userId" jdbcType="VARCHAR"/>
 		<result column="user_id" property="userId" jdbcType="VARCHAR"/>
@@ -16,14 +16,14 @@
 		<result column="open_type" property="openType" jdbcType="VARCHAR"/>
 		<result column="open_type" property="openType" jdbcType="VARCHAR"/>
 		<result column="open_page" property="openPage" jdbcType="VARCHAR"/>
 		<result column="open_page" property="openPage" jdbcType="VARCHAR"/>
 	</resultMap>
 	</resultMap>
-	
+
 	<select id="queryByUserId" parameterType="String"  resultType="String">
 	<select id="queryByUserId" parameterType="String"  resultType="String">
-	   select sas.annt_id from sys_announcement_send sas 
+	   select sas.annt_id from sys_announcement_send sas
 	   where sas.user_id = #{userId}
 	   where sas.user_id = #{userId}
 	</select>
 	</select>
-	
+
 	<select id="getMyAnnouncementSendList" parameterType="Object"  resultMap="AnnouncementSendModel">
 	<select id="getMyAnnouncementSendList" parameterType="Object"  resultMap="AnnouncementSendModel">
-	   select 
+	   select
 	   		sas.id,
 	   		sas.id,
 	   		sas.annt_id,
 	   		sas.annt_id,
 	   		sas.user_id,
 	   		sas.user_id,
@@ -38,7 +38,7 @@
 			sa.open_type as open_type,
 			sa.open_type as open_type,
 			sa.open_page as open_page,
 			sa.open_page as open_page,
 			sa.msg_abstract
 			sa.msg_abstract
-	   from sys_announcement_send sas 
+	   from sys_announcement_send sas
 	   left join sys_announcement sa ON sas.annt_id = sa.id
 	   left join sys_announcement sa ON sas.annt_id = sa.id
 	   where sa.send_status = '1'
 	   where sa.send_status = '1'
 	   and sa.del_flag = '0'
 	   and sa.del_flag = '0'
@@ -64,4 +64,4 @@
 	   order by sas.read_flag,sa.send_time desc
 	   order by sas.read_flag,sa.send_time desc
 	</select>
 	</select>
 
 
-</mapper>
+</mapper>

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysCategoryMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysCategoryMapper">
+<mapper namespace="cn.com.ctop.common.module.mapper.SysCategoryMapper">
 
 
-	<select id="queryListByPid" parameterType="Object" resultType="org.jeecg.modules.system.model.TreeSelectModel">
+	<select id="queryListByPid" parameterType="Object" resultType="cn.com.ctop.common.module.model.TreeSelectModel">
 		select code,
 		select code,
 			   name as "title",
 			   name as "title",
 			   id as "key",
 			   id as "key",

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDataSourceMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysDataSourceMapper">
+<mapper namespace="cn.com.ctop.common.module.mapper.SysDataSourceMapper">
 
 
-</mapper>
+</mapper>

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictItemMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysDictItemMapper">
+<mapper namespace="cn.com.ctop.common.module.mapper.SysDictItemMapper">
 
 
 </mapper>
 </mapper>

+ 4 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysDictMapper">
+<mapper namespace="cn.com.ctop.common.module.mapper.SysDictMapper">
 
 
 	<!-- 通过字典code获取字典数据 -->
 	<!-- 通过字典code获取字典数据 -->
 	<select id="queryDictItemsByCode" parameterType="String"  resultType="org.jeecg.common.system.vo.DictModel">
 	<select id="queryDictItemsByCode" parameterType="String"  resultType="org.jeecg.common.system.vo.DictModel">
@@ -50,12 +50,12 @@
 	</select>
 	</select>
 
 
 	<!-- 重复校验 sql语句 -->
 	<!-- 重复校验 sql语句 -->
-	<select id="duplicateCheckCountSql" resultType="Long" parameterType="org.jeecg.modules.system.model.DuplicateCheckVo">
+	<select id="duplicateCheckCountSql" resultType="Long" parameterType="cn.com.ctop.common.module.model.DuplicateCheckVo">
 		SELECT COUNT(*) FROM ${tableName} WHERE ${fieldName} = #{fieldVal} and id &lt;&gt; #{dataId}
 		SELECT COUNT(*) FROM ${tableName} WHERE ${fieldName} = #{fieldVal} and id &lt;&gt; #{dataId}
 	</select>
 	</select>
 
 
 	<!-- 重复校验 sql语句 -->
 	<!-- 重复校验 sql语句 -->
-	<select id="duplicateCheckCountSqlNoDataId" resultType="Long" parameterType="org.jeecg.modules.system.model.DuplicateCheckVo">
+	<select id="duplicateCheckCountSqlNoDataId" resultType="Long" parameterType="cn.com.ctop.common.module.model.DuplicateCheckVo">
 		SELECT COUNT(*) FROM ${tableName} WHERE ${fieldName} = #{fieldVal}
 		SELECT COUNT(*) FROM ${tableName} WHERE ${fieldName} = #{fieldVal}
 	</select>
 	</select>
 
 
@@ -75,7 +75,7 @@
 	</select>
 	</select>
 
 
 	<!-- 根据表名、显示字段名、存储字段名、父ID查询树 -->
 	<!-- 根据表名、显示字段名、存储字段名、父ID查询树 -->
-	<select id="queryTreeList" parameterType="Object" resultType="org.jeecg.modules.system.model.TreeSelectModel">
+	<select id="queryTreeList" parameterType="Object" resultType="cn.com.ctop.common.module.model.TreeSelectModel">
 		select ${text} as "title",
 		select ${text} as "title",
 			   ${code} as "key",
 			   ${code} as "key",
 			   <if test="hasChildField != null and hasChildField != ''">
 			   <if test="hasChildField != null and hasChildField != ''">

+ 14 - 14
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysLogMapper">
+<mapper namespace="cn.com.ctop.common.module.mapper.SysLogMapper">
 
 
 	<!-- 清空所有日志记录 -->
 	<!-- 清空所有日志记录 -->
 	<delete id="removeAll">
 	<delete id="removeAll">
 		DELETE FROM sys_log
 		DELETE FROM sys_log
 	</delete>
 	</delete>
-	
+
 	<!-- 获取访问总数 -->
 	<!-- 获取访问总数 -->
 	<select id="findTotalVisitCount" resultType="long">
 	<select id="findTotalVisitCount" resultType="long">
         select count(1) from sys_log where log_type = 1
         select count(1) from sys_log where log_type = 1
@@ -16,12 +16,12 @@
     <select id="findTodayVisitCount" resultType="long">
     <select id="findTodayVisitCount" resultType="long">
         select count(1) from sys_log where log_type = 1 and create_time &gt;= #{dayStart} and create_time &lt; #{dayEnd}
         select count(1) from sys_log where log_type = 1 and create_time &gt;= #{dayStart} and create_time &lt; #{dayEnd}
     </select>
     </select>
-    
+
 	<!-- 获取今日访问总IP数 -->
 	<!-- 获取今日访问总IP数 -->
     <select id="findTodayIp" resultType="long">
     <select id="findTodayIp" resultType="long">
         select count(distinct(ip)) from sys_log where log_type = 1 and create_time &gt;= #{dayStart} and create_time &lt; #{dayEnd}
         select count(distinct(ip)) from sys_log where log_type = 1 and create_time &gt;= #{dayStart} and create_time &lt; #{dayEnd}
     </select>
     </select>
-    
+
    	<!-- 首页访问统计 -->
    	<!-- 首页访问统计 -->
     <select id="findVisitCount" resultType="java.util.HashMap">
     <select id="findVisitCount" resultType="java.util.HashMap">
        <if test="dbType == 'MYSQL'">
        <if test="dbType == 'MYSQL'">
@@ -29,7 +29,7 @@
         	   ,count(distinct(ip)) as ip
         	   ,count(distinct(ip)) as ip
         	   ,DATE_FORMAT(create_time, '%Y-%m-%d') as tian
         	   ,DATE_FORMAT(create_time, '%Y-%m-%d') as tian
         	   ,DATE_FORMAT(create_time, '%m-%d') as type
         	   ,DATE_FORMAT(create_time, '%m-%d') as type
-        	   from sys_log 
+        	   from sys_log
          where log_type = 1 and create_time &gt;= #{dayStart} and create_time &lt; #{dayEnd}
          where log_type = 1 and create_time &gt;= #{dayStart} and create_time &lt; #{dayEnd}
          group by tian,type
          group by tian,type
          order by tian asc
          order by tian asc
@@ -39,9 +39,9 @@
         	   ,count(distinct(ip)) as ip
         	   ,count(distinct(ip)) as ip
         	  ,to_char(create_time, 'yyyy-mm-dd') as tian
         	  ,to_char(create_time, 'yyyy-mm-dd') as tian
         	   ,to_char(create_time, 'mm-dd') as type
         	   ,to_char(create_time, 'mm-dd') as type
-         from sys_log 
+         from sys_log
          where log_type = 1 and create_time &gt;= #{dayStart} and create_time &lt; #{dayEnd}
          where log_type = 1 and create_time &gt;= #{dayStart} and create_time &lt; #{dayEnd}
-         group by to_char(create_time, 'yyyy-mm-dd'),to_char(create_time, 'mm-dd') 
+         group by to_char(create_time, 'yyyy-mm-dd'),to_char(create_time, 'mm-dd')
          order by to_char(create_time, 'yyyy-mm-dd') asc
          order by to_char(create_time, 'yyyy-mm-dd') asc
        </if>
        </if>
       <if test="dbType == 'POSTGRESQL'">
       <if test="dbType == 'POSTGRESQL'">
@@ -49,20 +49,20 @@
         	   ,count(distinct(ip)) as ip
         	   ,count(distinct(ip)) as ip
         	  ,to_char(create_time, 'yyyy-mm-dd') as tian
         	  ,to_char(create_time, 'yyyy-mm-dd') as tian
         	   ,to_char(create_time, 'mm-dd') as type
         	   ,to_char(create_time, 'mm-dd') as type
-         from sys_log 
+         from sys_log
          where log_type = 1 and create_time &gt;= #{dayStart} and create_time &lt; #{dayEnd}
          where log_type = 1 and create_time &gt;= #{dayStart} and create_time &lt; #{dayEnd}
-         group by tian,type 
-         order by tian asc 	   
+         group by tian,type
+         order by tian asc
      </if>
      </if>
      <if test="dbType == 'SQLSERVER'">
      <if test="dbType == 'SQLSERVER'">
         select count(*) as visit
         select count(*) as visit
         	   ,count(distinct(ip)) as ip
         	   ,count(distinct(ip)) as ip
              ,CONVERT(varchar(100), create_time, 23) as tian
              ,CONVERT(varchar(100), create_time, 23) as tian
         	   ,RIGHT(CONVERT(varchar(100), create_time, 23),5) as type
         	   ,RIGHT(CONVERT(varchar(100), create_time, 23),5) as type
-         from sys_log 
-         where log_type = 1 and create_time &gt;= #{dayStart} and create_time &lt; #{dayEnd} 
-         group by CONVERT(varchar(100), create_time, 23),RIGHT(CONVERT(varchar(100), create_time, 23),5)  
-         order by CONVERT(varchar(100), create_time, 23) asc	  
+         from sys_log
+         where log_type = 1 and create_time &gt;= #{dayStart} and create_time &lt; #{dayEnd}
+         group by CONVERT(varchar(100), create_time, 23),RIGHT(CONVERT(varchar(100), create_time, 23),5)
+         order by CONVERT(varchar(100), create_time, 23) asc
      </if>
      </if>
     </select>
     </select>
 
 

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.system.model;
+package cn.com.ctop.common.module.model;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 7 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java

@@ -1,10 +1,11 @@
-package org.jeecg.modules.system.model;
+package cn.com.ctop.common.module.model;
 
 
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.io.Serializable;
+
 /**
 /**
  * @Title: DuplicateCheckVo
  * @Title: DuplicateCheckVo
  * @Description: 重复校验VO
  * @Description: 重复校验VO
@@ -22,23 +23,23 @@ public class DuplicateCheckVo implements Serializable {
 	 */
 	 */
 	@ApiModelProperty(value="表名",name="tableName",example="sys_log")
 	@ApiModelProperty(value="表名",name="tableName",example="sys_log")
 	private String tableName;
 	private String tableName;
-	
+
 	/**
 	/**
 	 * 字段名
 	 * 字段名
 	 */
 	 */
 	@ApiModelProperty(value="字段名",name="fieldName",example="id")
 	@ApiModelProperty(value="字段名",name="fieldName",example="id")
 	private String fieldName;
 	private String fieldName;
-	
+
 	/**
 	/**
 	 * 字段值
 	 * 字段值
 	 */
 	 */
 	@ApiModelProperty(value="字段值",name="fieldVal",example="1000")
 	@ApiModelProperty(value="字段值",name="fieldVal",example="1000")
 	private String fieldVal;
 	private String fieldVal;
-	
+
 	/**
 	/**
 	 * 数据ID
 	 * 数据ID
 	*/
 	*/
 	@ApiModelProperty(value="数据ID",name="dataId",example="2000")
 	@ApiModelProperty(value="数据ID",name="dataId",example="2000")
 	private String dataId;
 	private String dataId;
 
 
-}
+}

+ 9 - 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/TreeSelectModel.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.system.model;
+package cn.com.ctop.common.module.model;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.List;
 import java.util.List;
@@ -11,19 +11,19 @@ public class TreeSelectModel implements Serializable {
 	private static final long serialVersionUID = 9016390975325574747L;
 	private static final long serialVersionUID = 9016390975325574747L;
 
 
 	private String key;
 	private String key;
-	
+
 	private String title;
 	private String title;
-	
+
 	private boolean isLeaf;
 	private boolean isLeaf;
-	
+
 	private String icon;
 	private String icon;
-	
+
 	private String parentId;
 	private String parentId;
-	
+
 	private String value;
 	private String value;
-	
+
 	private String code;
 	private String code;
-	
+
 	public String getValue() {
 	public String getValue() {
 		return value;
 		return value;
 	}
 	}
@@ -79,7 +79,7 @@ public class TreeSelectModel implements Serializable {
 	public void setCode(String code) {
 	public void setCode(String code) {
 		this.code = code;
 		this.code = code;
 	}
 	}
-	
+
 	private List<TreeSelectModel> children;
 	private List<TreeSelectModel> children;
 
 
 	public List<TreeSelectModel> getChildren() {
 	public List<TreeSelectModel> getChildren() {

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

@@ -1,7 +1,7 @@
-package org.jeecg.modules.system.service;
+package cn.com.ctop.common.module.service;
 
 
+import cn.com.ctop.common.module.entity.SysDataSource;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.system.entity.SysDataSource;
 
 
 /**
 /**
  * @Description: 多数据源管理
  * @Description: 多数据源管理

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

@@ -1,7 +1,7 @@
-package org.jeecg.modules.system.service;
+package cn.com.ctop.common.module.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.system.entity.SysDictItem;
+import cn.com.ctop.common.module.entity.SysDictItem;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 4 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDictService.java

@@ -1,11 +1,11 @@
-package org.jeecg.modules.system.service;
+package cn.com.ctop.common.module.service;
 
 
+import cn.com.ctop.common.module.entity.SysDict;
+import cn.com.ctop.common.module.entity.SysDictItem;
+import cn.com.ctop.common.module.model.TreeSelectModel;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.DictQuery;
 import org.jeecg.common.system.vo.DictQuery;
-import org.jeecg.modules.system.entity.SysDict;
-import org.jeecg.modules.system.entity.SysDictItem;
-import org.jeecg.modules.system.model.TreeSelectModel;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;

+ 6 - 13
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java

@@ -1,16 +1,13 @@
-package org.jeecg.modules.system.service.impl;
-
-import cn.com.ctop.common.module.entity.SysDepart;
-import cn.com.ctop.common.module.entity.SysRole;
-import cn.com.ctop.common.module.entity.SysUser;
-import cn.com.ctop.common.module.mapper.SysDepartMapper;
-import cn.com.ctop.common.module.mapper.SysRoleMapper;
-import cn.com.ctop.common.module.mapper.SysUserMapper;
-import cn.com.ctop.common.module.mapper.SysUserRoleMapper;
+package cn.com.ctop.common.module.service.impl;
+
+import cn.com.ctop.common.module.entity.*;
+import cn.com.ctop.common.module.mapper.*;
 import cn.com.ctop.common.module.message.entity.SysMessageTemplate;
 import cn.com.ctop.common.module.message.entity.SysMessageTemplate;
 import cn.com.ctop.common.module.message.service.ISysMessageTemplateService;
 import cn.com.ctop.common.module.message.service.ISysMessageTemplateService;
 import cn.com.ctop.common.module.message.websocket.WebSocket;
 import cn.com.ctop.common.module.message.websocket.WebSocket;
+import cn.com.ctop.common.module.service.ISysDataSourceService;
 import cn.com.ctop.common.module.service.ISysDepartService;
 import cn.com.ctop.common.module.service.ISysDepartService;
+import cn.com.ctop.common.module.service.ISysDictService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -31,10 +28,6 @@ import org.jeecg.common.system.api.ISysBaseApi;
 import org.jeecg.common.system.vo.*;
 import org.jeecg.common.system.vo.*;
 import org.jeecg.common.util.*;
 import org.jeecg.common.util.*;
 import org.jeecg.common.util.oss.OssBootUtil;
 import org.jeecg.common.util.oss.OssBootUtil;
-import org.jeecg.modules.system.entity.*;
-import org.jeecg.modules.system.mapper.*;
-import org.jeecg.modules.system.service.ISysDataSourceService;
-import org.jeecg.modules.system.service.ISysDictService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.cache.annotation.Cacheable;

+ 4 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDataSourceServiceImpl.java

@@ -1,9 +1,9 @@
-package org.jeecg.modules.system.service.impl;
+package cn.com.ctop.common.module.service.impl;
 
 
+import cn.com.ctop.common.module.entity.SysDataSource;
+import cn.com.ctop.common.module.mapper.SysDataSourceMapper;
+import cn.com.ctop.common.module.service.ISysDataSourceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.system.entity.SysDataSource;
-import org.jeecg.modules.system.mapper.SysDataSourceMapper;
-import org.jeecg.modules.system.service.ISysDataSourceService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 /**
 /**

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

@@ -1,12 +1,12 @@
-package org.jeecg.modules.system.service.impl;
+package cn.com.ctop.common.module.service.impl;
 
 
+import cn.com.ctop.common.module.entity.SysDictItem;
+import cn.com.ctop.common.module.mapper.SysDictItemMapper;
+import cn.com.ctop.common.module.service.ISysDictItemService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.system.entity.SysDictItem;
-import org.jeecg.modules.system.mapper.SysDictItemMapper;
-import org.jeecg.modules.system.service.ISysDictItemService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -20,7 +20,7 @@ import java.util.List;
 @Service
 @Service
 public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDictItem> implements ISysDictItemService {
 public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDictItem> implements ISysDictItemService {
 
 
-    @Autowired
+    @Resource
     private SysDictItemMapper sysDictItemMapper;
     private SysDictItemMapper sysDictItemMapper;
 
 
     @Override
     @Override

+ 11 - 11
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java

@@ -1,5 +1,11 @@
-package org.jeecg.modules.system.service.impl;
-
+package cn.com.ctop.common.module.service.impl;
+
+import cn.com.ctop.common.module.entity.SysDict;
+import cn.com.ctop.common.module.entity.SysDictItem;
+import cn.com.ctop.common.module.mapper.SysDictItemMapper;
+import cn.com.ctop.common.module.mapper.SysDictMapper;
+import cn.com.ctop.common.module.model.TreeSelectModel;
+import cn.com.ctop.common.module.service.ISysDictService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -7,16 +13,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.DictQuery;
 import org.jeecg.common.system.vo.DictQuery;
-import org.jeecg.modules.system.entity.SysDict;
-import org.jeecg.modules.system.entity.SysDictItem;
-import org.jeecg.modules.system.mapper.SysDictItemMapper;
-import org.jeecg.modules.system.mapper.SysDictMapper;
-import org.jeecg.modules.system.model.TreeSelectModel;
-import org.jeecg.modules.system.service.ISysDictService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
@@ -35,9 +35,9 @@ import java.util.stream.Collectors;
 @Slf4j
 @Slf4j
 public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> implements ISysDictService {
 public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> implements ISysDictService {
 
 
-    @Autowired
+    @Resource
     private SysDictMapper sysDictMapper;
     private SysDictMapper sysDictMapper;
-    @Autowired
+    @Resource
     private SysDictItemMapper sysDictItemMapper;
     private SysDictItemMapper sysDictItemMapper;
 
 
 	/**
 	/**

+ 2 - 1
module-job-bytedance/src/main/resources/application.yml

@@ -2,7 +2,8 @@ server:
   port: 8091
   port: 8091
 spring:
 spring:
   profiles:
   profiles:
-    active: @activatedProperties@
+#    active: @activatedProperties@
+    active: test
   application:
   application:
     name: system-web
     name: system-web
 swagger:
 swagger:

+ 1 - 6
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/material/entity/EtlKuaishouVideoInfo.java

@@ -23,9 +23,6 @@ import org.jeecgframework.poi.excel.annotation.Excel;
  */
  */
 @Data
 @Data
 @TableName("ctop_etl_kuaishou_video_info")
 @TableName("ctop_etl_kuaishou_video_info")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="ctop_etl_kuaishou_video_info对象", description="快手视频报表信息")
 public class EtlKuaishouVideoInfo {
 public class EtlKuaishouVideoInfo {
 
 
 	/**id*/
 	/**id*/
@@ -33,6 +30,7 @@ public class EtlKuaishouVideoInfo {
 	private Long id;
 	private Long id;
 	/**视频唯一标识*/
 	/**视频唯一标识*/
 	private String videoCode;
 	private String videoCode;
+	private String videoName;
 	/**初次产生消耗时间*/
 	/**初次产生消耗时间*/
 	private Date stateDate;
 	private Date stateDate;
 	/**url*/
 	/**url*/
@@ -43,9 +41,6 @@ public class EtlKuaishouVideoInfo {
 	private String channelType;
 	private String channelType;
 	/**渠道名称*/
 	/**渠道名称*/
 	private String channelName;
 	private String channelName;
-	/**companyName*/
-	private String companyId;
-	private String companyName;
 	/**planId*/
 	/**planId*/
 	private String planId;
 	private String planId;
 	/**planName*/
 	/**planName*/

+ 13 - 7
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/material/service/impl/EtlKuaishouVideoInfoServiceImpl.java

@@ -1,9 +1,12 @@
 package cn.com.ctop.kuaishou.modules.material.service.impl;
 package cn.com.ctop.kuaishou.modules.material.service.impl;
 
 
 import cn.com.ctop.common.module.entity.MaterialAscription;
 import cn.com.ctop.common.module.entity.MaterialAscription;
+import cn.com.ctop.common.module.entity.MaterialInfo;
 import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.entity.UserCompany;
 import cn.com.ctop.common.module.entity.UserCompany;
+import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
 import cn.com.ctop.common.module.service.IMaterialAscriptionService;
 import cn.com.ctop.common.module.service.IMaterialAscriptionService;
+import cn.com.ctop.common.module.service.IMaterialInfoService;
 import cn.com.ctop.common.module.service.ISysUserService;
 import cn.com.ctop.common.module.service.ISysUserService;
 import cn.com.ctop.common.module.service.IUserCompanyService;
 import cn.com.ctop.common.module.service.IUserCompanyService;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideoGet;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideoGet;
@@ -37,22 +40,29 @@ public class EtlKuaishouVideoInfoServiceImpl extends ServiceImpl<EtlKuaishouVide
     @Autowired
     @Autowired
     private IMaterialAscriptionService ascriptionService;
     private IMaterialAscriptionService ascriptionService;
     @Autowired
     @Autowired
-    private IUserCompanyService userCompanyService;
-    @Autowired
     private ISysUserService sysUserService;
     private ISysUserService sysUserService;
+    @Autowired
+    private IMaterialInfoService materialInfoService;
     @Override
     @Override
     public void etlKuaishouVideoInfo(String date) {
     public void etlKuaishouVideoInfo(String date) {
         //1:查询当前日期内的所有存在md5码信息的视频数据
         //1:查询当前日期内的所有存在md5码信息的视频数据
         List<KuaiShouVideoGet> videoGets = videoGetService.getVideoInfoGroupBySignature(date);
         List<KuaiShouVideoGet> videoGets = videoGetService.getVideoInfoGroupBySignature(date);
         if(null!=videoGets&&!videoGets.isEmpty()){
         if(null!=videoGets&&!videoGets.isEmpty()){
             videoGets.forEach(videoGet -> {
             videoGets.forEach(videoGet -> {
+                //1:查询素材名称
                 EtlKuaishouVideoInfo etlKuaishouVideoInfo = new EtlKuaishouVideoInfo();
                 EtlKuaishouVideoInfo etlKuaishouVideoInfo = new EtlKuaishouVideoInfo();
+                MaterialInfo materialInfo = materialInfoService.getMaterialInfoByCode(videoGet.getSignature());
+                if(null == materialInfo){
+                    etlKuaishouVideoInfo.setVideoName(materialInfo.getMaterialName());
+                }else{
+                    etlKuaishouVideoInfo.setVideoName(videoGet.getPhotoName());
+                }
                 etlKuaishouVideoInfo.setVideoCode(videoGet.getSignature());
                 etlKuaishouVideoInfo.setVideoCode(videoGet.getSignature());
                 etlKuaishouVideoInfo.setUrl(videoGet.getUrl());
                 etlKuaishouVideoInfo.setUrl(videoGet.getUrl());
                 etlKuaishouVideoInfo.setCoverUrl(videoGet.getCoverUrl());
                 etlKuaishouVideoInfo.setCoverUrl(videoGet.getCoverUrl());
                 etlKuaishouVideoInfo.setChannelType(videoGet.getChannelType().toString());
                 etlKuaishouVideoInfo.setChannelType(videoGet.getChannelType().toString());
                 if(videoGet.getChannelType() == 0){
                 if(videoGet.getChannelType() == 0){
-                    etlKuaishouVideoInfo.setChannelName("自产");
+                    etlKuaishouVideoInfo.setChannelName("内部");
                 }else {
                 }else {
                     etlKuaishouVideoInfo.setChannelName("素造");
                     etlKuaishouVideoInfo.setChannelName("素造");
                 }
                 }
@@ -62,10 +72,6 @@ public class EtlKuaishouVideoInfoServiceImpl extends ServiceImpl<EtlKuaishouVide
                     String clipId = ascription.getString("clipId");
                     String clipId = ascription.getString("clipId");
                     if(null!=clipId&&!clipId.trim().equals("")){
                     if(null!=clipId&&!clipId.trim().equals("")){
                         etlKuaishouVideoInfo.setClipId(clipId);
                         etlKuaishouVideoInfo.setClipId(clipId);
-                        UserCompany userCompany = userCompanyService.getByUserId(clipId);
-                        if(null!=userCompany){
-                            etlKuaishouVideoInfo.setCompanyName(userCompany.getCompanyName());
-                        }
                         //根据id查询剪辑所属的设计负责人
                         //根据id查询剪辑所属的设计负责人
                         SysUser user = sysUserService.getById(clipId);
                         SysUser user = sysUserService.getById(clipId);
                         SysUser designTeamLeader = sysUserService.getDesignerTeamLeaderBy(user.getOrgCode());
                         SysUser designTeamLeader = sysUserService.getDesignerTeamLeaderBy(user.getOrgCode());

+ 107 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/EtlKuaishouAccountMaterialReportDaily.java

@@ -0,0 +1,107 @@
+package cn.com.ctop.kuaishou.modules.report.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 快手账户素材报表清洗表
+ * @author jeecg-boot
+ * @date   2021-02-25
+ * @version V1.0
+ */
+@Data
+@TableName("ctop_etl_kuaishou_account_material_report_daily")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ctop_etl_kuaishou_account_material_report_daily对象", description="快手账户素材报表清洗表")
+public class EtlKuaishouAccountMaterialReportDaily {
+
+	/**id*/
+	@TableId(type = IdType.AUTO)
+	private Long id;
+	/**账户ID*/
+	private Long accountId;
+	/**channelType*/
+	private Integer channelType;
+	/**signature*/
+	private String signature;
+	/**companyId*/
+	private String companyId;
+	/**companyName*/
+	private String companyName;
+	/**projectId*/
+	private String projectId;
+	/**projectName*/
+	private String projectName;
+	/**封面url*/
+	private String coverUrl;
+	/**视频url*/
+	private String photoUrl;
+	/**素材类型*/
+	private String materialType;
+	/**花费(元)*/
+	private java.math.BigDecimal charge;
+	/**曝光数*/
+	private Integer photoShow;
+	/**素材曝光数*/
+	private Integer aclick;
+	/**行为数*/
+	private Integer bclick;
+	/**应用下载数据-安卓下载开始数*/
+	private Integer downloadStarted;
+	/**应用下载数据-安卓下载完成数*/
+	private Integer downloadCompleted;
+	/**应用下载数据-激活数*/
+	private Integer activation;
+	/**提交按钮点击数*/
+	private Integer submit;
+	/**日期*/
+	private Date statDate;
+	/**封面点击数*/
+	private Integer photoClick;
+	/**应用下载数据-首日付费次数*/
+	private Integer eventPayFirstDay;
+	/**应用下载数据-首日付费金额*/
+	private java.math.BigDecimal eventPayPurchaseAmountFirstDay;
+	/**应用下载数据-付费次数*/
+	private Integer eventPay;
+	/**应用下载数据-付费金额*/
+	private java.math.BigDecimal eventPayPurchaseAmount;
+	/**应用下载数据-注册数*/
+	private Integer eventRegister;
+	/**应用下载数据-完件数*/
+	private Integer eventJinJianApp;
+	/**应用下载数据-授信数*/
+	private Integer eventCreditGrantApp;
+	/**应用下载数据-付款成功数*/
+	private Integer eventOrderPaid;
+	/**应用下载数据-付款成功金额*/
+	private java.math.BigDecimal eventOrderPaidPurchaseAmount;
+	/**落地页数据-落地页完件数*/
+	private Integer eventJinJianLandingPage;
+	/**落地页数据-落地页授信数*/
+	private Integer eventCreditGrantLandingPage;
+	/**应用下载数据-次留数(仅支持分日查询)*/
+	private Integer eventNextDayStay;
+	/**落地页数据-表单提交数*/
+	private Integer formCount;
+	/**3s播放数*/
+	@TableField(value = "play_3s_count")
+	private Long play3sCount;
+	/**创建时间*/
+	private Date createTime;
+	/**修改时间*/
+	private Date updateTime;
+}

+ 22 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/EtlKuaishouAccountMaterialReportDailyMapper.java

@@ -0,0 +1,22 @@
+package cn.com.ctop.kuaishou.modules.report.mapper;
+
+import cn.com.ctop.kuaishou.modules.report.entity.EtlKuaishouAccountMaterialReportDaily;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 快手账户素材报表清洗表
+ * @author: jeecg-boot
+ * @date:   2021-02-25
+ * @cersion: V1.0
+ */
+public interface EtlKuaishouAccountMaterialReportDailyMapper extends BaseMapper<EtlKuaishouAccountMaterialReportDaily> {
+
+    void etlKuaishouAccountMaterialReportDailyData(@Param(value = "date") String date);
+
+    List<EtlKuaishouAccountMaterialReportDaily> etlKuaishouAccountMaterialReportDailyList(@Param(value = "date")String date,@Param(value = "accountId")Long accountId);
+
+    void replaceBatch(@Param(value = "records")List<EtlKuaishouAccountMaterialReportDaily> getList);
+}

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/EtlKuaishouReportVideoDailyMapper.java

@@ -13,3 +13,4 @@ import org.apache.ibatis.annotations.Param;
 public interface EtlKuaishouReportVideoDailyMapper extends BaseMapper<EtlKuaishouReportVideoDaily> {
 public interface EtlKuaishouReportVideoDailyMapper extends BaseMapper<EtlKuaishouReportVideoDaily> {
     void etlKuaishouVideoReportDailyByDate(@Param(value = "data") String date);
     void etlKuaishouVideoReportDailyByDate(@Param(value = "data") String date);
 }
 }
+

+ 184 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/EtlKuaishouAccountMaterialReportDailyMapper.xml

@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.ctop.kuaishou.modules.report.mapper.EtlKuaishouAccountMaterialReportDailyMapper">
+
+    <insert id="etlKuaishouAccountMaterialReportDailyData">
+        replace into ctop_etl_kuaishou_account_material_report_daily (
+            company_id ,
+            company_name ,
+            project_id ,
+            project_name,
+            account_id,
+            signature,
+            charge ,
+            photo_show ,
+            aclick ,
+            bclick ,
+            download_started ,
+            download_completed ,
+            activation ,
+           submit ,
+           stat_date ,
+           photo_click ,
+           event_pay_first_day ,
+           event_pay_purchase_amount_first_day ,
+           event_pay ,
+           event_pay_purchase_amount ,
+           event_register ,
+           event_jin_jian_app ,
+           event_credit_grant_app ,
+           event_order_paid ,
+           event_order_paid_purchase_amount ,
+           event_jin_jian_landing_page ,
+           event_credit_grant_landing_page ,
+           event_next_day_stay ,
+           form_count,
+           play_3s_count)
+   select
+    c.company_id ,
+    c.company_name ,
+    u.project_id ,
+    p.project_name,
+    m.account_id,
+    m.signature,
+    sum(m.charge)as charge ,
+    sum(m.photo_show)as photo_show ,
+    sum(m.aclick)as aclick ,
+    sum(m.bclick)as bclick ,
+    sum(m.download_started)as download_started ,
+    sum(m.download_completed)as download_completed,
+    sum(m.activation)as activation ,
+    sum(m.submit)as submit,
+    stat_date,
+    sum(m.photo_click)as photo_click,
+    sum(m.event_pay_first_day)as event_pay_first_day,
+    sum(m.event_pay_purchase_amount_first_day)as event_pay_purchase_amount_first_day,
+    sum(m.event_pay)as event_pay,
+    sum(m.event_pay_purchase_amount)as event_pay_purchase_amount,
+    sum(m.event_register)as event_register,
+    sum(m.event_jin_jian_app)as event_jin_jian_app,
+    sum(m.event_credit_grant_app)as event_credit_grant_app,
+    sum(m.event_order_paid)as event_order_paid,
+    sum(m.event_order_paid_purchase_amount)as event_order_paid_purchase_amount,
+    sum(m.event_jin_jian_landing_page)as event_jin_jian_landing_page,
+    sum(m.event_credit_grant_landing_page )as event_credit_grant_landing_page,
+    sum(m.event_next_day_stay)as event_next_day_stay,
+    sum(m.form_count)as form_count,
+     round(sum(m.play_3s_ratio*m.photo_show))as play_3s_count
+    from ctop_kuaishou_report_daily_material m left join ctop_user_allocation u on u.account_id = m.account_id
+left join ctop_project p on p.id = u.project_id
+left join user_company c on c.user_id = u.account_id
+where m.signature is not null
+and m.stat_date = #{date}
+group by m.account_id,m.signature
+    </insert>
+    <insert id="replaceBatch">
+        replace into ctop_etl_kuaishou_account_material_report_daily(
+        company_id ,
+        company_name ,
+        project_id ,
+        project_name,
+        account_id,
+        signature,
+        charge,
+        photo_show ,
+        aclick ,
+        bclick ,
+        download_started ,
+        download_completed ,
+        activation ,
+        submit ,
+        stat_date ,
+        photo_click ,
+        event_pay_first_day ,
+        event_pay_purchase_amount_first_day ,
+        event_pay ,
+        event_pay_purchase_amount ,
+        event_register ,
+        event_jin_jian_app ,
+        event_credit_grant_app ,
+        event_order_paid ,
+        event_order_paid_purchase_amount ,
+        event_jin_jian_landing_page ,
+        event_credit_grant_landing_page ,
+        event_next_day_stay ,
+        form_count,
+        play_3s_count)
+        values
+        <foreach collection="records" item="record" separator=",">
+            (
+            #{record.companyId} ,
+            #{record.companyName} ,
+            #{record.projectId} ,
+            #{record.projectName} ,
+            #{record.accountId} ,
+            #{record.signature} ,
+            #{record.charge} ,
+            #{record.photoShow} ,
+            #{record.aclick} ,
+            #{record.bclick} ,
+            #{record.downloadStarted} ,
+            #{record.downloadCompleted} ,
+            #{record.activation} ,
+            #{record.submit} ,
+            #{record.statDate} ,
+            #{record.photoClick} ,
+            #{record.eventPayFirstDay} ,
+            #{record.eventPayPurchaseAmountFirstDay} ,
+            #{record.eventPay} ,
+            #{record.eventPayPurchaseAmount} ,
+            #{record.eventRegister} ,
+            #{record.eventJinJianApp} ,
+            #{record.eventCreditGrantApp} ,
+            #{record.eventOrderPaid} ,
+            #{record.eventOrderPaidPurchaseAmount} ,
+            #{record.eventJinJianLandingPage} ,
+            #{record.eventCreditGrantLandingPage} ,
+            #{record.eventNextDayStay} ,
+            #{record.formCount} ,
+            #{record.play3sCount})
+        </foreach>
+    </insert>
+    <select id="etlKuaishouAccountMaterialReportDailyList"
+            resultType="cn.com.ctop.kuaishou.modules.report.entity.EtlKuaishouAccountMaterialReportDaily">
+    select
+    c.company_id ,
+    c.company_name ,
+    u.project_id ,
+    p.project_name,
+    m.account_id,
+    m.signature,
+    sum(m.charge)as charge ,
+    sum(m.photo_show)as photo_show ,
+    sum(m.aclick)as aclick ,
+    sum(m.bclick)as bclick ,
+    sum(m.download_started)as download_started ,
+    sum(m.download_completed)as download_completed,
+    sum(m.activation)as activation ,
+    sum(m.submit)as submit,
+    stat_date,
+    sum(m.photo_click)as photo_click,
+    sum(m.event_pay_first_day)as event_pay_first_day,
+    sum(m.event_pay_purchase_amount_first_day)as event_pay_purchase_amount_first_day,
+    sum(m.event_pay)as event_pay,
+    sum(m.event_pay_purchase_amount)as event_pay_purchase_amount,
+    sum(m.event_register)as event_register,
+    sum(m.event_jin_jian_app)as event_jin_jian_app,
+    sum(m.event_credit_grant_app)as event_credit_grant_app,
+    sum(m.event_order_paid)as event_order_paid,
+    sum(m.event_order_paid_purchase_amount)as event_order_paid_purchase_amount,
+    sum(m.event_jin_jian_landing_page)as event_jin_jian_landing_page,
+    sum(m.event_credit_grant_landing_page )as event_credit_grant_landing_page,
+    sum(m.event_next_day_stay)as event_next_day_stay,
+    sum(m.form_count)as form_count,
+     round(sum(m.play_3s_ratio*m.photo_show))as play_3s_count
+    from ctop_kuaishou_report_daily_material m left join ctop_user_allocation u on u.account_id = m.account_id
+left join ctop_project p on p.id = u.project_id
+left join user_company c on c.user_id = u.account_id
+where m.signature is not null
+and m.stat_date = #{date} and m.account_id = #{accountId}
+group by m.account_id,m.signature
+    </select>
+
+
+</mapper>

+ 15 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IEtlKuaishouAccountMaterialReportDailyService.java

@@ -0,0 +1,15 @@
+package cn.com.ctop.kuaishou.modules.report.service;
+
+import cn.com.ctop.kuaishou.modules.report.entity.EtlKuaishouAccountMaterialReportDaily;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 快手账户素材报表清洗表
+ * @Author: jeecg-boot
+ * @Date:   2021-02-25
+ * @Version: V1.0
+ */
+public interface IEtlKuaishouAccountMaterialReportDailyService extends IService<EtlKuaishouAccountMaterialReportDaily> {
+
+    void etlKuaishouAccountMaterialReportDailyData(String date);
+}

+ 54 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/EtlKuaishouAccountMaterialReportDailyServiceImpl.java

@@ -0,0 +1,54 @@
+package cn.com.ctop.kuaishou.modules.report.service.impl;
+
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
+import cn.com.ctop.kuaishou.modules.report.entity.EtlKuaishouAccountMaterialReportDaily;
+import cn.com.ctop.kuaishou.modules.report.mapper.EtlKuaishouAccountMaterialReportDailyMapper;
+import cn.com.ctop.kuaishou.modules.report.service.IEtlKuaishouAccountMaterialReportDailyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * 快手账户素材报表清洗表
+ * @author jeecg-boot
+ * @date   2021-02-25
+ * @version V1.0
+ */
+@Service
+@Slf4j
+public class EtlKuaishouAccountMaterialReportDailyServiceImpl extends ServiceImpl<EtlKuaishouAccountMaterialReportDailyMapper, EtlKuaishouAccountMaterialReportDaily> implements IEtlKuaishouAccountMaterialReportDailyService {
+    @Resource
+    private EtlKuaishouAccountMaterialReportDailyMapper etlKuaishouAccountMaterialReportDailyMapper;
+    @Autowired
+    private ICtopOauthTokenService tokenService;
+    static ExecutorService executorService = Executors.newFixedThreadPool(10);
+    @Override
+    public void etlKuaishouAccountMaterialReportDailyData(String date){
+        List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
+        CountDownLatch countDownLatch = new CountDownLatch(tokens.size());
+        tokens.forEach(token -> executorService.submit(()->{
+            try {
+                List<EtlKuaishouAccountMaterialReportDaily> getList = etlKuaishouAccountMaterialReportDailyMapper.etlKuaishouAccountMaterialReportDailyList(date,token.getAccountId());
+                etlKuaishouAccountMaterialReportDailyMapper.replaceBatch(getList);
+            }catch (Exception e){
+                e.printStackTrace();
+            }finally {
+                countDownLatch.countDown();
+            }
+        }));
+        try {
+            countDownLatch.await();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        log.info("{}数据获取完成",date);
+    }
+}