Kaynağa Gözat

合并代码

syh 4 yıl önce
ebeveyn
işleme
5deb794be8
100 değiştirilmiş dosya ile 541 ekleme ve 385 silme
  1. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java
  2. 6 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdvertiserController.java
  3. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java
  4. 0 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java
  5. 1 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java
  6. 4 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ImageReportDailyServiceImpl.java
  7. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/PerformanceSaleServiceImpl.java
  8. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectTransferRecordServiceImpl.java
  9. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/UReportFileServiceImpl.java
  10. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java
  11. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/PlatformOrderCtrl.java
  12. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/util/DictHandler.java
  13. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/service/impl/OperateDetailServiceImpl.java
  14. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/service/impl/PerformanceInfoInfoServiceImpl.java
  15. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/service/impl/SalePerformanceDetailServiceImpl.java
  16. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/authc/ShiroRealm.java
  17. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/authc/interceptor/OnlineInterceptor.java
  18. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/web/TestWebController.java
  19. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/PermissionDataAspect.java
  20. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java
  21. 6 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
  22. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java
  23. 6 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java
  24. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
  25. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java
  26. 7 7
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
  27. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java
  28. 6 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/UserCompanyController.java
  29. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java
  30. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.java
  31. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDepartPermissionService.java
  32. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDepartRolePermissionService.java
  33. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleUserService.java
  34. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.java
  35. 0 52
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java
  36. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.java
  37. 7 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
  38. 10 9
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartPermissionServiceImpl.java
  39. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java
  40. 7 7
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.java
  41. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java
  42. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
  43. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java
  44. 6 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java
  45. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/impl/WpsFileServiceImpl.java
  46. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/impl/WpsUserServiceImpl.java
  47. 8 8
      jeecg-boot-module-system/src/main/resources/application-wps.yml
  48. 110 47
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  49. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
  50. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java
  51. 8 8
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java
  52. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java
  53. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java
  54. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermission.java
  55. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java
  56. 5 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java
  57. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/UserCompany.java
  58. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java
  59. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartPermissionMapper.java
  60. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java
  61. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRolePermissionMapper.java
  62. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.java
  63. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java
  64. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java
  65. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java
  66. 2 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/SysUserMapper.java
  67. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java
  68. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/UserCompanyMapper.java
  69. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml
  70. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRolePermissionMapper.xml
  71. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleMapper.xml
  72. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SysDepartRolePermissionMapper.xml
  73. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartPermissionMapper.xml
  74. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml
  75. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml
  76. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml
  77. 11 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SysUserMapper.xml
  78. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/UserCompanyMapper.xml
  79. 3 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java
  80. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
  81. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysUserDepartsVO.java
  82. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/TreeModel.java
  83. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleService.java
  84. 7 7
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java
  85. 22 0
      module-common/src/main/java/cn/com/ctop/common/module/service/ISysUserDepartService.java
  86. 3 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
  87. 4 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IUserCompanyService.java
  88. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleServiceImpl.java
  89. 14 13
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
  90. 10 10
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java
  91. 18 15
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
  92. 20 14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/UserCompanyServiceImpl.java
  93. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java
  94. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java
  95. 1 1
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouDailyImageReportLoadJob.java
  96. 22 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouGroupController.java
  97. 44 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaishouBatchCampaignPreviewController.java
  98. 2 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaishouBatchCreativePreviewController.java
  99. 23 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaishouBatchGroupPreviewController.java
  100. 0 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaishouTemplateController.java

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java

@@ -1,6 +1,9 @@
 package org.jeecg.modules.cas.controller;
 
+import cn.com.ctop.common.module.entity.SysDepart;
 import cn.com.ctop.common.module.entity.SysUser;
+import cn.com.ctop.common.module.service.ISysDepartService;
+import cn.com.ctop.common.module.service.ISysUserService;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -10,9 +13,6 @@ import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.modules.cas.util.CASServiceUtil;
 import org.jeecg.modules.cas.util.XmlUtils;
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.service.ISysDepartService;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;

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

@@ -5,7 +5,9 @@ import cn.com.ctop.common.module.constant.CtopRoleCodeConstant;
 import cn.com.ctop.common.module.entity.Advertiser;
 import cn.com.ctop.common.module.entity.Project;
 import cn.com.ctop.common.module.entity.UserAllocation;
+import cn.com.ctop.common.module.entity.UserCompany;
 import cn.com.ctop.common.module.mapper.ProjectMapper;
+import cn.com.ctop.common.module.mapper.UserCompanyMapper;
 import cn.com.ctop.common.module.service.IProductService;
 import cn.com.ctop.common.module.service.ISysRoleExtService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
@@ -32,12 +34,11 @@ import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
 import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.excelutil.entity.*;
-import org.jeecg.modules.system.entity.UserCompany;
-import org.jeecg.modules.system.mapper.UserCompanyMapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -58,13 +59,13 @@ import java.util.*;
 public class AdvertiserController {
     @Autowired
     private IAdvertiserService advertiserService;
-    @Autowired
+    @Resource
     private UserCompanyMapper userCompanyMapper;
     @Autowired
     private ISysRoleExtService sysRoleService;
-    @Autowired
+    @Resource
     private ProjectMapper projectMapper;
-    @Autowired
+    @Resource
     private ProjectMemberMapper projectMemberMapper;
     @Autowired
     private IUserAllocationService userAllocationService;

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

@@ -1,11 +1,14 @@
 package org.jeecg.modules.ctop.controller;
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.entity.SysDepart;
 import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.UserAllocationMapper;
 import cn.com.ctop.common.module.service.IBindAccountAuthService;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.service.ISysDepartService;
+import cn.com.ctop.common.module.service.ISysUserService;
 import cn.com.ctop.common.module.utils.*;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.material.entity.KuaishouAccessToken;
@@ -21,9 +24,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.RedisUtil;
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.service.ISysDepartService;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -23,7 +23,6 @@ import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecg.modules.ctop.service.ITransferAccountService;
 import org.jeecg.modules.system.service.ISysCategoryService;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -4,10 +4,7 @@ import cn.com.ctop.common.module.entity.Advertiser;
 import cn.com.ctop.common.module.entity.Product;
 import cn.com.ctop.common.module.entity.Project;
 import cn.com.ctop.common.module.entity.SysUser;
-import cn.com.ctop.common.module.service.IProductService;
-import cn.com.ctop.common.module.service.IProjectService;
-import cn.com.ctop.common.module.service.ISysRoleExtService;
-import cn.com.ctop.common.module.service.IUserAllocationService;
+import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.StatusCode;
@@ -26,7 +23,6 @@ import org.jeecg.modules.ctop.entity.ProjectMember;
 import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
 import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.service.impl;
 
+import cn.com.ctop.common.module.service.ISysUserService;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.StatusCode;
 import cn.com.ctop.common.module.vo.*;
@@ -10,19 +11,19 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.jeecg.modules.ctop.service.IImageReportDailyService;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 @Service
 public class ImageReportDailyServiceImpl implements IImageReportDailyService {
-    @Autowired
+    @Resource
     private BytedanceReportMaterialDailyMapper bytedanceReportMaterialDailyMapper;
-    @Autowired
+    @Resource
     private KuaishouReportDailyImageMapper kuaishouReportDailyImageMapper;
     @Autowired
     private ISysUserService sysUserService;

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

@@ -2,7 +2,9 @@ package org.jeecg.modules.ctop.service.impl;
 
 import cn.com.ctop.common.module.entity.Advertiser;
 import cn.com.ctop.common.module.entity.SysUser;
+import cn.com.ctop.common.module.entity.SysUserRole;
 import cn.com.ctop.common.module.entity.UserAllocation;
+import cn.com.ctop.common.module.service.ISysUserService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
@@ -11,9 +13,7 @@ import org.jeecg.modules.ctop.service.IPerformanceSaleService;
 import org.jeecg.modules.performance.entity.SalePerformanceDetail;
 import org.jeecg.modules.performance.service.IPerformanceService;
 import org.jeecg.modules.performance.service.ISalePerformanceDetailService;
-import org.jeecg.modules.system.entity.SysUserRole;
 import org.jeecg.modules.system.service.ISysUserRoleService;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -4,6 +4,7 @@ import cn.com.ctop.common.module.entity.Project;
 import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.service.IProjectService;
+import cn.com.ctop.common.module.service.ISysUserService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.StatusCode;
@@ -15,7 +16,6 @@ import org.jeecg.modules.ctop.entity.ProjectTransferRecord;
 import org.jeecg.modules.ctop.mapper.ProjectTransferRecordMapper;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecg.modules.ctop.service.IProjectTransferRecordService;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.ctop.service.impl;
 
 import cn.com.ctop.common.module.entity.SysUser;
+import cn.com.ctop.common.module.service.ISysUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.ctop.entity.UReportFile;
 import org.jeecg.modules.ctop.entity.UReportFileBindUser;
@@ -11,7 +12,6 @@ import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.StatusCode;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,11 +1,11 @@
 package org.jeecg.modules.ngalain.service.impl;
 
+import cn.com.ctop.common.module.entity.SysPermission;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ngalain.mapper.NgAlainMapper;
 import org.jeecg.modules.ngalain.service.NgAlainService;
-import org.jeecg.modules.system.entity.SysPermission;
 import org.jeecg.modules.system.service.ISysPermissionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.orderplatform.controller;
 
 import cn.com.ctop.common.module.entity.SysUser;
+import cn.com.ctop.common.module.service.ISysUserService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import com.github.pagehelper.PageHelper;
@@ -11,7 +12,6 @@ import org.jeecg.modules.orderplatform.entity.PlatformOrder;
 import org.jeecg.modules.orderplatform.service.IPlatformOrderService;
 
 import org.jeecg.modules.orderplatform.util.DictHandler;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/util/DictHandler.java

@@ -1,9 +1,9 @@
 package org.jeecg.modules.orderplatform.util;
 
 import cn.com.ctop.common.module.service.IProjectService;
+import cn.com.ctop.common.module.service.ISysUserService;
 import org.jeecg.modules.orderplatform.entity.PlatformMaterial;
 import org.jeecg.modules.orderplatform.entity.PlatformOrder;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.performance.service.impl;
 
 import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.entity.UserAllocation;
+import cn.com.ctop.common.module.service.ISysUserService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
@@ -18,7 +19,6 @@ import org.jeecg.modules.performance.mapper.OperateDetailMapper;
 import org.jeecg.modules.performance.service.IOperateDetailService;
 import org.jeecg.modules.performance.vo.TransferDetailVO;
 import org.jeecg.modules.system.service.ISysUserRoleService;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -3,6 +3,7 @@ package org.jeecg.modules.performance.service.impl;
 import cn.com.ctop.common.module.entity.SysCompany;
 import cn.com.ctop.common.module.service.ISysCompanyService;
 import cn.com.ctop.common.module.service.ISysRoleExtService;
+import cn.com.ctop.common.module.service.ISysUserService;
 import cn.com.ctop.common.module.utils.CtopMediaTypeUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.shiro.SecurityUtils;
@@ -10,7 +11,6 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
 import org.jeecg.modules.performance.service.IPerformanceInfoService;
 import org.jeecg.modules.performance.service.IPerformanceQuarterService;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -2,7 +2,9 @@ package org.jeecg.modules.performance.service.impl;
 
 import cn.com.ctop.common.module.entity.Advertiser;
 import cn.com.ctop.common.module.entity.SysUser;
+import cn.com.ctop.common.module.entity.SysUserRole;
 import cn.com.ctop.common.module.entity.UserAllocation;
+import cn.com.ctop.common.module.service.ISysUserService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,9 +16,7 @@ import org.jeecg.modules.performance.entity.SalePerformanceDetail;
 import org.jeecg.modules.performance.mapper.SalePerformanceDetailMapper;
 import org.jeecg.modules.performance.service.IPerformanceService;
 import org.jeecg.modules.performance.service.ISalePerformanceDetailService;
-import org.jeecg.modules.system.entity.SysUserRole;
 import org.jeecg.modules.system.service.ISysUserRoleService;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/authc/ShiroRealm.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.shiro.authc;
 
+import cn.com.ctop.common.module.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
@@ -16,7 +17,6 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/authc/interceptor/OnlineInterceptor.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.shiro.authc.interceptor;
 
+import cn.com.ctop.common.module.entity.SysPermission;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
@@ -7,7 +8,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.OnlineAuth;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysPermission;
 import org.jeecg.modules.system.service.ISysPermissionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.method.HandlerMethod;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/web/TestWebController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.shiro.web;
 
 import cn.com.ctop.common.module.entity.SysUser;
+import cn.com.ctop.common.module.service.ISysUserService;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.apache.shiro.authz.annotation.Logical;
@@ -11,7 +12,6 @@ import org.apache.shiro.subject.Subject;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.modules.shiro.vo.ResponseBean;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;

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

@@ -1,6 +1,8 @@
 package org.jeecg.modules.system.aspect;
 
 import cn.com.ctop.common.module.annotation.PermissionData;
+import cn.com.ctop.common.module.entity.SysPermission;
+import cn.com.ctop.common.module.service.ISysUserService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -14,11 +16,9 @@ import org.jeecg.common.system.vo.SysPermissionDataRuleModel;
 import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysPermission;
 import org.jeecg.modules.system.entity.SysPermissionDataRule;
 import org.jeecg.modules.system.service.ISysPermissionDataRuleService;
 import org.jeecg.modules.system.service.ISysPermissionService;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.AntPathMatcher;

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

@@ -2,9 +2,12 @@ package org.jeecg.modules.system.controller;
 
 import cn.com.ctop.common.module.entity.CorpFeishuUser;
 import cn.com.ctop.common.module.entity.CtopCorpWexinUser;
+import cn.com.ctop.common.module.entity.SysDepart;
 import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.service.ICorpFeishuUserService;
 import cn.com.ctop.common.module.service.ICtopCorpWexinUserService;
+import cn.com.ctop.common.module.service.ISysDepartService;
+import cn.com.ctop.common.module.service.ISysUserService;
 import cn.com.ctop.common.module.utils.AesEncryptUtil;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.StatusCode;
@@ -34,12 +37,9 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.*;
 import org.jeecg.common.util.encryption.EncryptedString;
 import org.jeecg.modules.shiro.vo.DefContants;
-import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.model.SysLoginModel;
-import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.system.service.ISysDictService;
 import org.jeecg.modules.system.service.ISysLogService;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecg.modules.system.util.RandImageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

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

@@ -1,5 +1,11 @@
 package org.jeecg.modules.system.controller;
 
+import cn.com.ctop.common.module.entity.SysDepart;
+import cn.com.ctop.common.module.model.DepartIdModel;
+import cn.com.ctop.common.module.model.SysDepartTreeModel;
+import cn.com.ctop.common.module.service.ISysDepartService;
+import cn.com.ctop.common.module.service.ISysUserDepartService;
+import cn.com.ctop.common.module.service.ISysUserService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
@@ -12,12 +18,6 @@ import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.ImportExcelUtil;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.model.DepartIdModel;
-import org.jeecg.modules.system.model.SysDepartTreeModel;
-import org.jeecg.modules.system.service.ISysDepartService;
-import org.jeecg.modules.system.service.ISysUserDepartService;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;

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

@@ -1,5 +1,7 @@
 package org.jeecg.modules.system.controller;
 
+import cn.com.ctop.common.module.entity.SysPermission;
+import cn.com.ctop.common.module.model.TreeModel;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -13,11 +15,9 @@ import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysDepartPermission;
-import org.jeecg.modules.system.entity.SysDepartRolePermission;
-import org.jeecg.modules.system.entity.SysPermission;
+import cn.com.ctop.common.module.entity.SysDepartPermission;
+import cn.com.ctop.common.module.entity.SysDepartRolePermission;
 import org.jeecg.modules.system.entity.SysPermissionDataRule;
-import org.jeecg.modules.system.model.TreeModel;
 import org.jeecg.modules.system.service.ISysDepartPermissionService;
 import org.jeecg.modules.system.service.ISysDepartRolePermissionService;
 import org.jeecg.modules.system.service.ISysPermissionDataRuleService;

+ 6 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java

@@ -4,6 +4,12 @@ import java.util.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.com.ctop.common.module.entity.SysDepart;
+import cn.com.ctop.common.module.entity.SysDepartRole;
+import cn.com.ctop.common.module.entity.SysDepartRolePermission;
+import cn.com.ctop.common.module.entity.SysDepartRoleUser;
+import cn.com.ctop.common.module.service.ISysDepartRoleService;
+import cn.com.ctop.common.module.service.ISysDepartService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.shiro.SecurityUtils;

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

@@ -1,5 +1,7 @@
 package org.jeecg.modules.system.controller;
 
+import cn.com.ctop.common.module.entity.SysPermission;
+import cn.com.ctop.common.module.model.TreeModel;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -10,17 +12,15 @@ import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.MD5Util;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysDepartPermission;
-import org.jeecg.modules.system.entity.SysPermission;
+import cn.com.ctop.common.module.entity.SysDepartPermission;
 import org.jeecg.modules.system.entity.SysPermissionDataRule;
 import org.jeecg.modules.system.entity.SysRolePermission;
 import org.jeecg.modules.system.model.SysPermissionTree;
-import org.jeecg.modules.system.model.TreeModel;
 import org.jeecg.modules.system.service.ISysDepartPermissionService;
 import org.jeecg.modules.system.service.ISysPermissionDataRuleService;
 import org.jeecg.modules.system.service.ISysPermissionService;
 import org.jeecg.modules.system.service.ISysRolePermissionService;
-import org.jeecg.modules.system.util.PermissionDataUtil;
+import cn.com.ctop.common.module.utils.PermissionDataUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -1,7 +1,9 @@
 package org.jeecg.modules.system.controller;
 
 
+import cn.com.ctop.common.module.entity.SysPermission;
 import cn.com.ctop.common.module.entity.SysRole;
+import cn.com.ctop.common.module.model.TreeModel;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,10 +16,8 @@ import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysPermission;
 import org.jeecg.modules.system.entity.SysPermissionDataRule;
 import org.jeecg.modules.system.entity.SysRolePermission;
-import org.jeecg.modules.system.model.TreeModel;
 import org.jeecg.modules.system.service.ISysPermissionDataRuleService;
 import org.jeecg.modules.system.service.ISysPermissionService;
 import org.jeecg.modules.system.service.ISysRolePermissionService;
@@ -370,7 +370,7 @@ public class SysRoleController {
 		return result;
 	}
 
-	private void getTreeModelList(List<TreeModel> treeList,List<SysPermission> metaList,TreeModel temp) {
+	private void getTreeModelList(List<TreeModel> treeList, List<SysPermission> metaList, TreeModel temp) {
 		for (SysPermission permission : metaList) {
 			String tempPid = permission.getParentId();
 			TreeModel tree = new TreeModel(permission.getId(), tempPid, permission.getName(),permission.getRuleFlag(), permission.isLeaf());

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

@@ -2,9 +2,12 @@ package org.jeecg.modules.system.controller;
 
 
 import cn.com.ctop.common.module.annotation.PermissionData;
-import cn.com.ctop.common.module.entity.SysRole;
-import cn.com.ctop.common.module.entity.SysUser;
+import cn.com.ctop.common.module.entity.*;
+import cn.com.ctop.common.module.mapper.UserCompanyMapper;
+import cn.com.ctop.common.module.model.DepartIdModel;
+import cn.com.ctop.common.module.model.SysUserDepartsVO;
 import cn.com.ctop.common.module.model.SysUserSysDepartModel;
+import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.StatusCode;
@@ -37,10 +40,6 @@ import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.ProjectMember;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
-import org.jeecg.modules.system.entity.*;
-import org.jeecg.modules.system.mapper.UserCompanyMapper;
-import org.jeecg.modules.system.model.DepartIdModel;
-import org.jeecg.modules.system.model.SysUserDepartsVO;
 import org.jeecg.modules.system.service.*;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -54,6 +53,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
@@ -123,7 +123,7 @@ public class SysUserController {
     }
 
 
-    @Autowired
+    @Resource
     private UserCompanyMapper userCompanyMapper;
 
     /**

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.system.controller;
 
 import cn.com.ctop.common.module.entity.SysUser;
+import cn.com.ctop.common.module.service.ISysUserService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.xkcoding.justauth.AuthRequestFactory;
@@ -16,7 +17,6 @@ import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;

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

@@ -2,7 +2,10 @@ package org.jeecg.modules.system.controller;
 
 import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.SysUser;
+import cn.com.ctop.common.module.entity.UserCompany;
 import cn.com.ctop.common.module.mapper.SysUserMapper;
+import cn.com.ctop.common.module.mapper.UserCompanyMapper;
+import cn.com.ctop.common.module.service.IUserCompanyService;
 import cn.com.ctop.common.module.utils.Check;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,9 +17,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.UserCompany;
-import org.jeecg.modules.system.mapper.UserCompanyMapper;
-import org.jeecg.modules.system.service.IUserCompanyService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -28,6 +28,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -51,9 +52,9 @@ import java.util.Map;
 public class UserCompanyController {
     @Autowired
     private IUserCompanyService userCompanyService;
-    @Autowired
+    @Resource
     private SysUserMapper sysUserMapper;
-    @Autowired
+    @Resource
     private UserCompanyMapper userCompanyMapper;
 
 

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

@@ -1,6 +1,6 @@
 package org.jeecg.modules.system.model;
 
-import org.jeecg.modules.system.entity.SysPermission;
+import cn.com.ctop.common.module.entity.SysPermission;
 
 import java.io.Serializable;
 import java.util.ArrayList;

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

@@ -1,13 +1,13 @@
 package org.jeecg.modules.system.rule;
 
+import cn.com.ctop.common.module.entity.SysDepart;
+import cn.com.ctop.common.module.service.ISysDepartService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.netty.util.internal.StringUtil;
 import org.jeecg.common.handler.IFillRuleHandler;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.YouBianCodeUtil;
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.service.ISysDepartService;
 
 import java.util.ArrayList;
 import java.util.List;

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

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

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

@@ -1,7 +1,7 @@
 package org.jeecg.modules.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.system.entity.SysDepartRolePermission;
+import cn.com.ctop.common.module.entity.SysDepartRolePermission;
 
 /**
  * @Description: 部门角色权限

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

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

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

@@ -1,9 +1,9 @@
 package org.jeecg.modules.system.service;
 
+import cn.com.ctop.common.module.entity.SysPermission;
+import cn.com.ctop.common.module.model.TreeModel;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.modules.system.entity.SysPermission;
-import org.jeecg.modules.system.model.TreeModel;
 
 import java.util.List;
 

+ 0 - 52
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java

@@ -1,52 +0,0 @@
-package org.jeecg.modules.system.service;
-
-
-import cn.com.ctop.common.module.entity.SysUser;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.system.entity.SysUserDepart;
-import org.jeecg.modules.system.model.DepartIdModel;
-import org.jeecg.modules.system.model.SysUserDepartsVO;
-
-import java.util.List;
-
-/**
- * <p>
- * SysUserDpeart用户组织机构service
- * </p>
- * @Author ZhiLin
- *
- */
-public interface ISysUserDepartService extends IService<SysUserDepart> {
-
-	/**
-	 * 根据指定用户添加部门信息
-	 * @param sysUserDepartsVO
-	 * @return
-	 */
-	boolean addSysUseWithrDepart(SysUserDepartsVO sysUserDepartsVO);
-
-	/**
-	 * 根据指定用户id查询部门信息
-	 * @param userId
-	 * @return
-	 */
-	List<DepartIdModel> queryDepartIdsOfUser(String userId);
-
-	/**
-	 * 根据指定用户id编辑部门信息
-	 * @param sysUserDepartsVO
-	 * @return
-	 */
-	boolean editSysUserWithDepart(SysUserDepartsVO sysUserDepartsVO);
-
-	/**
-	 * 根据部门id查询用户信息
-	 * @param depId
-	 * @return
-	 */
-	List<SysUser> queryUserByDepId(String depId);
-  	/**
-	 * 根据部门code,查询当前部门和下级部门的用户信息
-	 */
-	public List<SysUser> queryUserByDepCode(String depCode,String realname);
-}

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

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

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

@@ -1,11 +1,16 @@
 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;
 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.websocket.WebSocket;
+import cn.com.ctop.common.module.service.ISysDepartService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -29,7 +34,6 @@ 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.ISysDepartService;
 import org.jeecg.modules.system.service.ISysDictService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,9 +71,9 @@ public class SysBaseApiImpl implements ISysBaseApi {
     private ISysMessageTemplateService sysMessageTemplateService;
     @Resource
     private SysLogMapper sysLogMapper;
-    @Autowired
+    @Resource
     private SysUserMapper userMapper;
-    @Autowired
+    @Resource
     private SysUserRoleMapper sysUserRoleMapper;
     @Autowired
     private ISysDepartService sysDepartService;

+ 10 - 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartPermissionServiceImpl.java

@@ -1,18 +1,19 @@
 package org.jeecg.modules.system.service.impl;
 
+import cn.com.ctop.common.module.entity.SysDepartRole;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysDepartPermission;
-import org.jeecg.modules.system.entity.SysDepartRole;
-import org.jeecg.modules.system.entity.SysDepartRolePermission;
+import cn.com.ctop.common.module.entity.SysDepartPermission;
+import cn.com.ctop.common.module.entity.SysDepartRolePermission;
 import org.jeecg.modules.system.entity.SysPermissionDataRule;
-import org.jeecg.modules.system.mapper.SysDepartPermissionMapper;
-import org.jeecg.modules.system.mapper.SysDepartRoleMapper;
-import org.jeecg.modules.system.mapper.SysDepartRolePermissionMapper;
+import cn.com.ctop.common.module.mapper.SysDepartPermissionMapper;
+import cn.com.ctop.common.module.mapper.SysDepartRolePermissionMapper;
 import org.jeecg.modules.system.mapper.SysPermissionDataRuleMapper;
 import org.jeecg.modules.system.service.ISysDepartPermissionService;
+import cn.com.ctop.common.module.service.ISysDepartRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -31,8 +32,8 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl<SysDepartPermiss
     @Resource
     private SysPermissionDataRuleMapper ruleMapper;
 
-    @Resource
-    private SysDepartRoleMapper sysDepartRoleMapper;
+    @Autowired
+    private ISysDepartRoleService sysDepartRoleService;
 
     @Resource
     private SysDepartRolePermissionMapper departRolePermissionMapper;
@@ -56,7 +57,7 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl<SysDepartPermiss
             for (String permissionId : delete) {
                 this.remove(new QueryWrapper<SysDepartPermission>().lambda().eq(SysDepartPermission::getDepartId, departId).eq(SysDepartPermission::getPermissionId, permissionId));
                 //删除部门权限时,删除部门角色中已授权的权限
-                List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList(new LambdaQueryWrapper<SysDepartRole>().eq(SysDepartRole::getDepartId,departId));
+                List<SysDepartRole> sysDepartRoleList = sysDepartRoleService.list(new LambdaQueryWrapper<SysDepartRole>().eq(SysDepartRole::getDepartId,departId));
                 List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
                 if(roleIds != null && roleIds.size()>0){
                     departRolePermissionMapper.delete(new LambdaQueryWrapper<SysDepartRolePermission>().eq(SysDepartRolePermission::getPermissionId,permissionId));

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

@@ -3,8 +3,8 @@ package org.jeecg.modules.system.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysDepartRolePermission;
-import org.jeecg.modules.system.mapper.SysDepartRolePermissionMapper;
+import cn.com.ctop.common.module.entity.SysDepartRolePermission;
+import cn.com.ctop.common.module.mapper.SysDepartRolePermissionMapper;
 import org.jeecg.modules.system.service.ISysDepartRolePermissionService;
 import org.springframework.stereotype.Service;
 

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

@@ -1,12 +1,12 @@
 package org.jeecg.modules.system.service.impl;
 
+import cn.com.ctop.common.module.entity.SysDepartRole;
+import cn.com.ctop.common.module.entity.SysDepartRoleUser;
+import cn.com.ctop.common.module.mapper.SysDepartRoleUserMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysDepartRole;
-import org.jeecg.modules.system.entity.SysDepartRoleUser;
-import org.jeecg.modules.system.mapper.SysDepartRoleMapper;
-import org.jeecg.modules.system.mapper.SysDepartRoleUserMapper;
+import cn.com.ctop.common.module.service.ISysDepartRoleService;
 import org.jeecg.modules.system.service.ISysDepartRoleUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 @Service
 public class SysDepartRoleUserServiceImpl extends ServiceImpl<SysDepartRoleUserMapper, SysDepartRoleUser> implements ISysDepartRoleUserService {
     @Autowired
-    private SysDepartRoleMapper sysDepartRoleMapper;
+    private ISysDepartRoleService sysDepartRoleService;
 
     @Override
     public void deptRoleUserAdd(String userId, String newRoleId, String oldRoleId) {
@@ -51,9 +51,9 @@ public class SysDepartRoleUserServiceImpl extends ServiceImpl<SysDepartRoleUserM
     @Transactional(rollbackFor = Exception.class)
     public void removeDeptRoleUser(List<String> userIds, String depId) {
         for(String userId : userIds){
-            List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList(new QueryWrapper<SysDepartRole>().eq("depart_id",depId));
+            List<SysDepartRole> sysDepartRoleList = sysDepartRoleService.list(new QueryWrapper<SysDepartRole>().eq("depart_id",depId));
             List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
-            if(roleIds != null && roleIds.size()>0){
+            if(roleIds.size()>0){
                 QueryWrapper<SysDepartRoleUser> query = new QueryWrapper<>();
                 query.eq("user_id",userId).in("drole_id",roleIds);
                 this.remove(query);

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

@@ -1,15 +1,15 @@
 package org.jeecg.modules.system.service.impl;
 
+import cn.com.ctop.common.module.entity.SysPermission;
+import cn.com.ctop.common.module.mapper.SysPermissionMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysPermission;
 import org.jeecg.modules.system.entity.SysPermissionDataRule;
 import org.jeecg.modules.system.mapper.SysPermissionDataRuleMapper;
-import org.jeecg.modules.system.mapper.SysPermissionMapper;
 import org.jeecg.modules.system.service.ISysPermissionDataRuleService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+ 5 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java

@@ -1,5 +1,8 @@
 package org.jeecg.modules.system.service.impl;
 
+import cn.com.ctop.common.module.entity.SysPermission;
+import cn.com.ctop.common.module.mapper.SysPermissionMapper;
+import cn.com.ctop.common.module.model.TreeModel;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -7,13 +10,10 @@ import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysPermission;
 import org.jeecg.modules.system.entity.SysPermissionDataRule;
-import org.jeecg.modules.system.mapper.SysDepartPermissionMapper;
-import org.jeecg.modules.system.mapper.SysDepartRolePermissionMapper;
-import org.jeecg.modules.system.mapper.SysPermissionMapper;
+import cn.com.ctop.common.module.mapper.SysDepartPermissionMapper;
+import cn.com.ctop.common.module.mapper.SysDepartRolePermissionMapper;
 import org.jeecg.modules.system.mapper.SysRolePermissionMapper;
-import org.jeecg.modules.system.model.TreeModel;
 import org.jeecg.modules.system.service.ISysPermissionDataRuleService;
 import org.jeecg.modules.system.service.ISysPermissionService;
 import org.springframework.cache.annotation.CacheEvict;

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

@@ -1,12 +1,12 @@
 package org.jeecg.modules.system.service.impl;
 
 import cn.com.ctop.common.module.entity.SysRole;
+import cn.com.ctop.common.module.mapper.SysRoleMapper;
 import cn.com.ctop.common.module.mapper.SysUserMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.ImportExcelUtil;
-import org.jeecg.modules.system.mapper.SysRoleMapper;
 import org.jeecg.modules.system.service.ISysRoleService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.entity.ImportParams;

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

@@ -2,17 +2,18 @@ package org.jeecg.modules.system.service.impl;
 
 import cn.com.ctop.common.module.entity.SysRole;
 import cn.com.ctop.common.module.entity.SysUser;
+import cn.com.ctop.common.module.entity.SysUserRole;
 import cn.com.ctop.common.module.mapper.SysRoleExtMapper;
+import cn.com.ctop.common.module.mapper.SysUserRoleMapper;
+import cn.com.ctop.common.module.service.ISysUserService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.system.entity.SysUserRole;
-import org.jeecg.modules.system.mapper.SysUserRoleMapper;
 import org.jeecg.modules.system.service.ISysRoleService;
 import org.jeecg.modules.system.service.ISysUserRoleService;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
@@ -32,9 +33,9 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
 	private ISysUserService userService;
 	@Autowired
 	private ISysRoleService roleService;
-	@Autowired
+	@Resource
 	private SysUserRoleMapper roleMapper;
-	@Autowired
+	@Resource
 	private SysRoleExtMapper sysRoleExtMapper;
 	/**
 	 * 查询所有用户对应的角色信息

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

@@ -4,6 +4,7 @@ import cn.com.ctop.common.module.entity.Project;
 import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.file.FileUtil;
 import cn.com.ctop.common.module.service.IProjectService;
+import cn.com.ctop.common.module.service.ISysUserService;
 import cn.com.ctop.common.module.utils.CosUtils;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.StatusCode;
@@ -16,7 +17,6 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.orderplatform.entity.PlatformScript;
 import org.jeecg.modules.orderplatform.service.IPlatformScriptService;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecg.modules.wps.config.Context;
 import org.jeecg.modules.wps.dto.*;
 import org.jeecg.modules.wps.entity.WpsFile;

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

@@ -1,10 +1,10 @@
 package org.jeecg.modules.wps.service.impl;
 
 import cn.com.ctop.common.module.entity.SysUser;
+import cn.com.ctop.common.module.service.ISysUserService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecg.modules.wps.entity.WpsUser;
 import org.jeecg.modules.wps.mapper.WpsUserMapper;
 import org.jeecg.modules.wps.service.IWpsUserService;

+ 8 - 8
jeecg-boot-module-system/src/main/resources/application-wps.yml

@@ -95,16 +95,16 @@ spring:
         # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
-        master:
-          url: jdbc:mysql://139.186.151.174:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true
-          username: hcst
-          password: hcst@2020
-          driver-class-name: com.mysql.jdbc.Driver
 #        master:
-#          url: jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-#          username: data
-#          password: hcst@2021
+#          url: jdbc:mysql://139.186.151.174:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true
+#          username: hcst
+#          password: hcst@2020
 #          driver-class-name: com.mysql.jdbc.Driver
+        master:
+          url: jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          username: data
+          password: hcst@2021
+          driver-class-name: com.mysql.jdbc.Driver
   #redis 配置
   redis:
     database: 0

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

@@ -5,7 +5,6 @@ import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.service.IBindAccountLoginService;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.common.module.service.IProjectService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.kuaishou.modules.ai.entity.AiKuaishouAccountTargetTemplate;
@@ -14,6 +13,7 @@ import cn.com.ctop.kuaishou.modules.ai.service.IAiKuaishouNewCreateCampaign;
 import cn.com.ctop.kuaishou.modules.batch.service.*;
 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.oa.modules.service.IWechatCheckinDataService;
@@ -24,8 +24,7 @@ import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataServ
 import cn.com.ctop.toutiao.modules.report.entity.BytedanceAccountReportTaskRecord;
 import cn.com.ctop.toutiao.modules.report.mapper.BytedanceReportMaterialDailyMapper;
 import cn.com.ctop.toutiao.modules.report.service.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.xxl.job.core.context.XxlJobHelper;
+import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.junit.Test;
@@ -49,7 +48,7 @@ import static org.jeecg.common.util.DateUtils.getAnotherDay;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("wps")
+@ActiveProfiles("dev")
 @Slf4j
 public class SampleTest {
     @Autowired
@@ -68,10 +67,6 @@ public class SampleTest {
     private IBindAccountLoginService bindAccountLoginService;
     @Autowired
     private IKuaishouWebInterfaceService kuaishouWebInterfaceService;
-    @Autowired
-    private IProjectService projectService;
-    @Autowired
-    private IUserAllocationService allocationService;
  /*   @Autowired
     private IByteDanceAdvertiserDataService advertiserDataService;
 
@@ -87,27 +82,16 @@ public class SampleTest {
 
 
 
-
-
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         Date parse = simpleDateFormat.parse("2021-02-02");
         kuaishouInterfaceService.getAdvertiserReportDaily(token, parse, parse);*/
 
-        QueryWrapper<UserAllocation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("project_id", 900886);
-        List<UserAllocation> list = allocationService.list(queryWrapper);
-        for (UserAllocation allocation : list) {
-            CtopOauthToken token = tokenService.getTokenByAccountId(allocation.getAccountId());
-            kuaishouInterfaceService.getVideoList(token, null, null);
-        }
-
-
-      /*  CtopOauthToken token = new CtopOauthToken();
+        CtopOauthToken token = new CtopOauthToken();
         token.setAccountId(9767055L);
         token.setAccessToken("28e4e6b124e1443d6971ba4c699de6c9");
 
         kuaishouInterfaceService.getVideoList(token, null, null);
-        kuaishouInterfaceService.getVideoInfo("28e4e6b124e1443d6971ba4c699de6c9", 9767055L, "5208131540349742192");*/
+        kuaishouInterfaceService.getVideoInfo("28e4e6b124e1443d6971ba4c699de6c9",9767055L,"5208131540349742192");
 
      /*   CtopOauthToken tokenByAccountId = tokenService.getTokenByAccountId(1662234704806924L);
         advertiserDataService.getMaterialList(tokenByAccountId);*/
@@ -179,7 +163,8 @@ public class SampleTest {
         }
     }
 
-
+    @Autowired
+    private IUserAllocationService allocationService;
 
     @Test
     public void testLoadBytedanceData() {
@@ -192,6 +177,7 @@ public class SampleTest {
                 reportService.getAdvertiserReport(token, DateUtils.parseDate(startDate, "yyyy-MM-dd"), DateUtils.parseDate(endDate, "yyyy-MM-dd"), CtopAdConstant.BYTEDANCE_REPORT_TYPE_HOURLY);
             }
         }
+        System.out.println("任务结束");
     }
 
     @Test
@@ -465,14 +451,12 @@ public class SampleTest {
 
     @Test
     public void etlKuaishouData() {
-        String dateString = "2020-07-18";
+        String dateString = "2021-01-05";
         Date startDate = DateUtils.parseDate(dateString, "yyyy-MM-dd");
-        for (int i = 0; i <= 450; i++) {
+        for (int i = 0; i <= 10; i++) {
             Date getDate = DateUtils.addDay(startDate, i);
-            kuaishouVideoEtlInfoService.etlKuaishouVideoInfoGroupByProjectId(getDate);
-//            bytedanceVideoEtlInfoService.etlBytedanceVideoInfoByProjectId(getDate);
-//            kuaishouVideoEtlInfoService.etlKuaishouVideoInfo(getDate);
-//            bytedanceVideoEtlInfoService.etlBytedanceVideoInfo(getDate);
+            kuaishouVideoEtlInfoService.etlKuaishouVideoInfo(getDate);
+            bytedanceVideoEtlInfoService.etlBytedanceVideoInfo(getDate);
         }
     }
 
@@ -556,24 +540,76 @@ public class SampleTest {
     }
 
     @Test
-    public void testLoadBytedanceDataV2() {
-        List<CtopOauthToken> tokens = oauthTokenService.selectToutiaoToken();
-        countDownLatch = new CountDownLatch(tokens.size());
-        for(int i=2;i<20;i++){
-            String statDate= DateUtils.formatDate(DateUtils.addDay(new Date(), -i));
-            tokens.forEach(token -> bytedanceVideoReportService.pullVideoReport(token, statDate, statDate, 1));
+    public void testLoadBytedanceDataV2(){
+        String accountIds=
+                "1675440464386062," +
+                        "1688606248211533," +
+                        "1669181787105294," +
+                        "1687571097467912," +
+                        "1650079154438157," +
+                        "1680697900744711," +
+                        "1678156679964680," +
+                        "1670727177043982," +
+                        "1676160388944910," +
+                        "1687559760306190," +
+                        "1687382871519240," +
+                        "1680312075164686," +
+                        "1675440465991688," +
+                        "1664657972166663," +
+                        "1688193173408782," +
+                        "1675616147056647," +
+                        "1687308848716814," +
+                        "1686394621234247," +
+                        "1683594409340935," +
+                        "1683676478859341," +
+                        "1686384860112904," +
+                        "1668290872519693," +
+                        "1674063202781191," +
+                        "1685024266033160," +
+                        "1669714891201544," +
+                        "1687758256277512," +
+                        "1675434231118856," +
+                        "1686394621807687," +
+                        "1678411706704903," +
+                        "1686223489547271," +
+                        "1660120711467022," +
+                        "1686833795211278," +
+                        "1680697899143175," +
+                        "1661313994984462," +
+                        "1661313995480077," +
+                        "1636295780727820," +
+                        "1676540490482759," +
+                        "1675342904713223," +
+                        "1686771461984327," +
+                        "1685841129360391," +
+                        "1683676477736973," +
+                        "1661313994470413," +
+                        "1663465141771272," +
+                        "1687758256732174," +
+                        "1686223482927117," +
+                        "1686835166313479," +
+                        "1642648003678215," +
+                        "1639753233213454," +
+                        "1675239584963662," +
+                        "1674634579279885," +
+                        "1650263841162253," +
+                        "1672178052130888";
+        String [] accountArray = accountIds.split(",");
+        for (int i=0;i<accountArray.length;i++){
+            CtopOauthToken token = tokenService.getTokenByAccountId(Long.parseLong(accountArray[i]));
+
+            reportService.getAdvertiserReport(token, DateUtils.parseDate("2021-01-14","yyyy-MM-dd"), DateUtils.parseDate("2021-01-14","yyyy-MM-dd"),CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
         }
     }
 
 
     @Test
-    public void checkBytedanceReport() {
+    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);
+        bytedanceReportService.checkoutData(token,startDate,endDate);
     }
-
     @Test
     public void etlKuaishouProjectData() {
         CtopOauthToken token = tokenService.getTokenByAccountId(1660666858777607L);
@@ -586,10 +622,10 @@ public class SampleTest {
     @Test
     public void etlBytedanceVideoReport() {
 
-//        for (int i = 1; i <= 62; i++) {
-//            etlBytedanceVideo(DateUtils.formatDate(DateUtils.addDay(new Date(), -i)));
-//        }
-        etlBytedanceVideo("2021-02-03");
+        for (int i = 27; i <= 35; i++) {
+            etlBytedanceVideo(DateUtils.formatDate(DateUtils.addDay(new Date(), -i)));
+        }
+        //etlBytedanceVideo("2021-02-03");
 
     }
 
@@ -599,7 +635,9 @@ public class SampleTest {
         countDownLatch = new CountDownLatch(tokens.size());
         tokens.forEach(token -> executorService.submit(() -> {
             try {
-                bytedanceVideoReportService.pullVideoReport(token, statDate, statDate, 1);
+                Long[] materials={6904990807503634445L,6904990807503634445L};
+                bytedanceVideoReportService.pullVideoReportByMaterialId(token, statDate, statDate, materials,1);
+                //bytedanceVideoReportService.pullVideoReport(token, statDate, statDate, 1);
             } catch (Exception e) {
 
             } finally {
@@ -619,18 +657,43 @@ public class SampleTest {
     @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");
+          //  String statDate = DateUtils.formatDate(DateUtils.addDay(new Date(), -i));
+            ietlReportBytedanceVideoService.cleanETL("2020-12-31");
         //}
     }
 
     @Test
     public void etlBytedanceVideoReportClean1() {
-        //executorService = Executors.newFixedThreadPool(31);
-        //countDownLatch = new CountDownLatch(31);
+
         for (int i = 3; i <= 31; i++) {
             String statDate = DateUtils.formatDate(DateUtils.addDay(new Date(), -i));
             ietlReportBytedanceVideoService.cleanETL(statDate);
         }
     }
-}
+
+
+    @Autowired
+    IKuaishouReportDailyImageService kuaishouReportDailyImageService;
+
+    @Test
+    public void loadKuaiShouImage() {
+        List<CtopOauthToken> tokens = oauthTokenService.selectKuaiShouToken();
+        executorService = Executors.newFixedThreadPool(22);
+        countDownLatch = new CountDownLatch(tokens.size());
+        tokens.forEach(token -> executorService.submit(() -> {
+            try {
+                kuaishouReportDailyImageService.getMaterialImageReport(token.getAccountId(),token.getAccessToken(), "2021-01-17", "2021-01-31", 1);
+            } catch (Exception e) {
+
+            } finally {
+                countDownLatch.countDown();
+            }
+        }));
+        try {
+            countDownLatch.await();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    }

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.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 com.baomidou.mybatisplus.annotation.IdType;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.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.TableId;

+ 8 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.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 com.baomidou.mybatisplus.annotation.IdType;
@@ -29,28 +29,28 @@ public class SysDepartRole {
 	/**id*/
 	@TableId(type = IdType.ID_WORKER_STR)
     @ApiModelProperty(value = "id")
-	private java.lang.String id;
+	private String id;
 	/**部门id*/
 	@Excel(name = "部门id", width = 15)
 	@ApiModelProperty(value = "部门id")
 	@Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
-	private java.lang.String departId;
+	private String departId;
 	/**部门角色名称*/
 	@Excel(name = "部门角色名称", width = 15)
     @ApiModelProperty(value = "部门角色名称")
-	private java.lang.String roleName;
+	private String roleName;
 	/**部门角色编码*/
 	@Excel(name = "部门角色编码", width = 15)
     @ApiModelProperty(value = "部门角色编码")
-	private java.lang.String roleCode;
+	private String roleCode;
 	/**描述*/
 	@Excel(name = "描述", width = 15)
     @ApiModelProperty(value = "描述")
-	private java.lang.String description;
+	private String description;
 	/**创建人*/
 	@Excel(name = "创建人", width = 15)
     @ApiModelProperty(value = "创建人")
-	private java.lang.String createBy;
+	private String createBy;
 	/**创建时间*/
 	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -60,7 +60,7 @@ public class SysDepartRole {
 	/**更新人*/
 	@Excel(name = "更新人", width = 15)
     @ApiModelProperty(value = "更新人")
-	private java.lang.String updateBy;
+	private String updateBy;
 	/**更新时间*/
 	@Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.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.TableId;

+ 4 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.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.TableId;
@@ -26,15 +26,15 @@ public class SysDepartRoleUser {
 	/**主键id*/
 	@TableId(type = IdType.ID_WORKER_STR)
     @ApiModelProperty(value = "主键id")
-	private java.lang.String id;
+	private String id;
 	/**用户id*/
 	@Excel(name = "用户id", width = 15)
     @ApiModelProperty(value = "用户id")
-	private java.lang.String userId;
+	private String userId;
 	/**角色id*/
 	@Excel(name = "角色id", width = 15)
     @ApiModelProperty(value = "角色id")
-	private java.lang.String droleId;
+	private String droleId;
 
 	public SysDepartRoleUser() {
 

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermission.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 com.baomidou.mybatisplus.annotation.IdType;
@@ -146,7 +146,7 @@ public class SysPermission implements Serializable {
 	private Date updateTime;
 
 	/**按钮权限状态(0无效1有效)*/
-	private java.lang.String status;
+	private String status;
 
 	/**alwaysShow*/
     private boolean alwaysShow;

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

@@ -1,12 +1,12 @@
-package org.jeecg.modules.system.entity;
-
-import java.io.Serializable;
+package cn.com.ctop.common.module.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import lombok.Data;
+
+import java.io.Serializable;
+
 @Data
 @TableName("sys_user_depart")
 public class SysUserDepart implements Serializable {

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

@@ -1,14 +1,13 @@
-package org.jeecg.modules.system.entity;
-
-import java.io.Serializable;
+package cn.com.ctop.common.module.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 用户角色表
@@ -26,7 +25,7 @@ public class SysUserRole implements Serializable {
 
     @TableId(type = IdType.ID_WORKER_STR)
     private String id;
-    
+
     /**
      * 用户id
      */
@@ -45,6 +44,6 @@ public class SysUserRole implements Serializable {
 		this.roleId = roleId;
 	}
 
-    
+
 
 }

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/UserCompany.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.TableId;

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.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.SysDepart;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Select;
-import org.jeecg.modules.system.entity.SysDepart;
 import org.springframework.data.repository.query.Param;
 
 import java.util.List;

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

@@ -1,7 +1,7 @@
-package org.jeecg.modules.system.mapper;
+package cn.com.ctop.common.module.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.system.entity.SysDepartPermission;
+import cn.com.ctop.common.module.entity.SysDepartPermission;
 
 /**
  * @Description: 部门权限表

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.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.SysDepartRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.system.entity.SysDepartRole;
 
 import java.util.List;
 

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

@@ -1,7 +1,7 @@
-package org.jeecg.modules.system.mapper;
+package cn.com.ctop.common.module.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.system.entity.SysDepartRolePermission;
+import cn.com.ctop.common.module.entity.SysDepartRolePermission;
 
 /**
  * @Description: 部门角色权限

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.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.SysDepartRoleUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.system.entity.SysDepartRoleUser;
 
 /**
  * @Description: 部门角色人员信息

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

@@ -1,11 +1,11 @@
-package org.jeecg.modules.system.mapper;
+package cn.com.ctop.common.module.mapper;
 
+import cn.com.ctop.common.module.entity.SysPermission;
+import cn.com.ctop.common.module.model.TreeModel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
-import org.jeecg.modules.system.entity.SysPermission;
-import org.jeecg.modules.system.model.TreeModel;
 
 import java.util.List;
 
@@ -34,7 +34,7 @@ public interface SysPermissionMapper extends BaseMapper<SysPermission> {
 	 *   修改菜单状态字段: 是否子节点
 	 */
 	@Update("update sys_permission set is_leaf=#{leaf} where id = #{id}")
-	public int setMenuLeaf(@Param("id") String id,@Param("leaf") int leaf);
+	public int setMenuLeaf(@Param("id") String id, @Param("leaf") int leaf);
 
 	/**
 	  *   获取模糊匹配规则的数据权限URL

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.system.mapper;
+package cn.com.ctop.common.module.mapper;
 
 import cn.com.ctop.common.module.entity.SysRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.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.SysUserDepart;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import io.lettuce.core.dynamic.annotation.Param;
-import org.jeecg.modules.system.entity.SysUserDepart;
 
 import java.util.List;
 

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

@@ -170,4 +170,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     List<SysUserVo> getAllSalesByCompanyId(@Param("companyId") String companyId);
 
     JSONObject selectUserByAccount(@Param("accountId") Long accountId);
+
+    SysUser getDesignerTeamLeaderBy(@Param("orgCode")String orgCode);
 }

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.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.SysUserRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import org.jeecg.modules.system.entity.SysUserRole;
 
 import java.util.List;
 

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/UserCompanyMapper.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.UserCompany;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.system.entity.UserCompany;
 
 /**
  * 用户够公司

+ 5 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml

@@ -1,13 +1,13 @@
 <?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="org.jeecg.modules.system.mapper.SysDepartMapper">
+<mapper namespace="cn.com.ctop.common.module.mapper.SysDepartMapper">
 
-	<select id="queryUserDeparts" parameterType="String" resultType="org.jeecg.modules.system.entity.SysDepart">
+	<select id="queryUserDeparts" parameterType="String" resultType="cn.com.ctop.common.module.entity.SysDepart">
 	   select * from sys_depart where id IN ( select dep_id from sys_user_depart where user_id = #{userId} )
 	</select>
 
     <!-- 根据username查询所拥有的部门 -->
-    <select id="queryDepartsByUsername" parameterType="String" resultType="org.jeecg.modules.system.entity.SysDepart">
+    <select id="queryDepartsByUsername" parameterType="String" resultType="cn.com.ctop.common.module.entity.SysDepart">
         SELECT *
         FROM sys_depart
         WHERE id IN (
@@ -34,11 +34,11 @@
         </foreach>
 	</select>
 
-    <select id="queryUserDepartsByDepartId" parameterType="String" resultType="org.jeecg.modules.system.entity.SysDepart">
+    <select id="queryUserDepartsByDepartId" parameterType="String" resultType="cn.com.ctop.common.module.entity.SysDepart">
 		select * from sys_depart
 			where id = #{departId}
 			limit 1
 	</select>
 
 
-</mapper>
+</mapper>

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

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

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

@@ -1,12 +1,12 @@
 <?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="org.jeecg.modules.system.mapper.SysDepartRoleMapper">
+<mapper namespace="cn.com.ctop.common.module.mapper.SysDepartRoleMapper">
 
     <!--根据用户id,部门id查询可授权所有部门角色 -->
-    <select id="queryDeptRoleByDeptAndUser" resultType="org.jeecg.modules.system.entity.SysDepartRole">
+    <select id="queryDeptRoleByDeptAndUser" resultType="cn.com.ctop.common.module.entity.SysDepartRole">
         SELECT * FROM sys_depart_role WHERE depart_id IN (
             SELECT id FROM sys_depart WHERE id IN (SELECT dep_id FROM sys_user_depart WHERE user_id=#{userId})
             AND org_code LIKE CONCAT(#{orgCode},'%')
         )
     </select>
-</mapper>
+</mapper>

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SysDepartRolePermissionMapper.xml

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

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

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

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

@@ -1,9 +1,9 @@
 <?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="org.jeecg.modules.system.mapper.SysPermissionMapper">
+<mapper namespace="cn.com.ctop.common.module.mapper.SysPermissionMapper">
 
 
-	<resultMap id="TreeModel" type="org.jeecg.modules.system.model.TreeModel" >
+	<resultMap id="TreeModel" type="cn.com.ctop.common.module.model.TreeModel" >
 		<result column="id" property="key" jdbcType="VARCHAR"/>
 		<result column="name" property="title" jdbcType="VARCHAR"/>
 		<result column="icon" property="icon" jdbcType="VARCHAR"/>
@@ -12,7 +12,7 @@
 	</resultMap>
 
 	<!-- 通过<resultMap>映射实体类属性名和表的字段名对应关系 -->
-	<resultMap id="SysPermission" type="org.jeecg.modules.system.entity.SysPermission">
+	<resultMap id="SysPermission" type="cn.com.ctop.common.module.entity.SysPermission">
 	   <!-- result属性映射非匹配字段 -->
 	    <result column="is_route" property="route"/>
 	    <result column="keep_alive" property="keepAlive"/>

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

@@ -1,6 +1,6 @@
 <?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="org.jeecg.modules.system.mapper.SysRoleMapper">
+<mapper namespace="cn.com.ctop.common.module.mapper.SysRoleMapper">
 
     <!-- 根据roleCode获取roleId -->
     <select id="getRoleIdByRoleCode" resultType="java.lang.String">

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

@@ -1,18 +1,18 @@
 <?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="org.jeecg.modules.system.mapper.SysUserDepartMapper">
-    <select id="getUserDepartByUid" parameterType="String" resultType="org.jeecg.modules.system.entity.SysUserDepart">
+<mapper namespace="cn.com.ctop.common.module.mapper.SysUserDepartMapper">
+    <select id="getUserDepartByUid" parameterType="String" resultType="cn.com.ctop.common.module.entity.SysUserDepart">
 		SELECT *
 		FROM sys_user_depart
 		WHERE user_id = #{userId, jdbcType=VARCHAR}
     </select>
 
     <select id="getUserDepartByUserId" parameterType="String"
-            resultType="org.jeecg.modules.system.entity.SysUserDepart">
+            resultType="cn.com.ctop.common.module.entity.SysUserDepart">
 		SELECT *
 		FROM sys_user_depart
 		WHERE user_id = #{userId, jdbcType=VARCHAR}
 		limit 1
     </select>
 
-</mapper>
+</mapper>

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

@@ -260,4 +260,15 @@ SELECT
             where role.role_code in ('plane','plan','shot','clip','designTeamLeader')
             and user.status = 1
     </select>
+    <select id="getDesignerTeamLeaderBy" resultType="cn.com.ctop.common.module.entity.SysUser">
+        SELECT
+            user2.realname,user2.id
+        FROM sys_user user2
+        LEFT JOIN sys_user_role userRole ON user2.id = userRole.user_id
+        LEFT JOIN sys_role role ON userRole.role_id = role.id
+        WHERE
+            user2.org_code = #{orgCode}
+        AND
+            role.role_code = 'designTeamLeader'
+    </select>
 </mapper>

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

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

+ 3 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java

@@ -1,7 +1,8 @@
-package org.jeecg.modules.system.model;
+package cn.com.ctop.common.module.model;
 
+import cn.com.ctop.common.module.entity.SysDepart;
 import lombok.Data;
-import org.jeecg.modules.system.entity.SysDepart;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java

@@ -1,6 +1,6 @@
-package org.jeecg.modules.system.model;
+package cn.com.ctop.common.module.model;
 
-import org.jeecg.modules.system.entity.SysDepart;
+import cn.com.ctop.common.module.entity.SysDepart;
 
 import java.io.Serializable;
 import java.util.ArrayList;

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.system.model;
+package cn.com.ctop.common.module.model;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/TreeModel.java

@@ -1,6 +1,6 @@
-package org.jeecg.modules.system.model;
+package cn.com.ctop.common.module.model;
 
-import org.jeecg.modules.system.entity.SysPermission;
+import cn.com.ctop.common.module.entity.SysPermission;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -99,7 +99,7 @@ public class TreeModel implements Serializable {
 		}
 	}
 
-	 public TreeModel(String key,String parentId,String slotTitle,Integer ruleFlag,boolean isLeaf) {
+	 public TreeModel(String key, String parentId, String slotTitle, Integer ruleFlag, boolean isLeaf) {
     	this.key = key;
     	this.parentId = parentId;
     	this.ruleFlag=ruleFlag;

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleService.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.SysDepartRole;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.system.entity.SysDepartRole;
 
 import java.util.List;
 

+ 7 - 7
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java

@@ -1,9 +1,9 @@
-package org.jeecg.modules.system.service;
+package cn.com.ctop.common.module.service;
 
+import cn.com.ctop.common.module.entity.SysDepart;
+import cn.com.ctop.common.module.model.DepartIdModel;
+import cn.com.ctop.common.module.model.SysDepartTreeModel;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.model.DepartIdModel;
-import org.jeecg.modules.system.model.SysDepartTreeModel;
 
 import java.util.List;
 
@@ -39,14 +39,14 @@ public interface ISysDepartService extends IService<SysDepart>{
      * 保存部门数据
      * @param sysDepart
      */
-    void saveDepartData(SysDepart sysDepart,String username);
+    void saveDepartData(SysDepart sysDepart, String username);
 
     /**
      * 更新depart数据
      * @param sysDepart
      * @return
      */
-    Boolean updateDepartDataById(SysDepart sysDepart,String username);
+    Boolean updateDepartDataById(SysDepart sysDepart, String username);
 
     /**
      * 删除depart数据
@@ -60,7 +60,7 @@ public interface ISysDepartService extends IService<SysDepart>{
      * @param keyWord
      * @return
      */
-    List<SysDepartTreeModel> searhBy(String keyWord,String myDeptSearch,String departIds);
+    List<SysDepartTreeModel> searhBy(String keyWord, String myDeptSearch, String departIds);
 
     /**
      * 根据部门id删除并删除其可能存在的子级部门

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

@@ -0,0 +1,22 @@
+package cn.com.ctop.common.module.service;
+
+import cn.com.ctop.common.module.entity.SysUser;
+import cn.com.ctop.common.module.entity.SysUserDepart;
+import cn.com.ctop.common.module.entity.SysUserRole;
+import cn.com.ctop.common.module.model.DepartIdModel;
+import cn.com.ctop.common.module.model.SysUserDepartsVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+public interface ISysUserDepartService extends IService<SysUserDepart> {
+    boolean addSysUseWithrDepart(SysUserDepartsVO sysUserDepartsVO);
+
+    List<DepartIdModel> queryDepartIdsOfUser(String userId);
+
+    boolean editSysUserWithDepart(SysUserDepartsVO sysUserDepartsVO);
+
+    List<SysUser> queryUserByDepId(String depId);
+
+    List<SysUser> queryUserByDepCode(String depCode, String realname);
+}

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.system.service;
+package cn.com.ctop.common.module.service;
 
 import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.model.SysUserSysDepartModel;
@@ -25,7 +25,7 @@ import java.util.Set;
  * @since 2018-12-20
  */
 public interface ISysUserService extends IService<SysUser> {
-    List<SysUserVo> getUserListByCompany(String companyId,String userName);
+    List<SysUserVo> getUserListByCompany(String companyId, String userName);
 
     List<SysUser> getUserListByRoleId(String roleId);
 
@@ -263,4 +263,5 @@ public interface ISysUserService extends IService<SysUser> {
 
     List<SysUser> getAllDesigner();
 
+    SysUser getDesignerTeamLeaderBy(String orgCode);
 }

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

@@ -1,8 +1,8 @@
-package org.jeecg.modules.system.service;
+package cn.com.ctop.common.module.service;
 
 import cn.com.ctop.common.module.entity.SysUser;
+import cn.com.ctop.common.module.entity.UserCompany;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.system.entity.UserCompany;
 
 /**
  * 用户够公司
@@ -16,4 +16,6 @@ public interface IUserCompanyService extends IService<UserCompany> {
     void addOrUpdateUserWithCompany(SysUser user);
 
     void removeByUserId(String id);
+
+    UserCompany getByUserId(String userId);
 }

+ 4 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleServiceImpl.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.SysDepartRole;
+import cn.com.ctop.common.module.mapper.SysDepartRoleMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.system.entity.SysDepartRole;
-import org.jeecg.modules.system.mapper.SysDepartRoleMapper;
-import org.jeecg.modules.system.service.ISysDepartRoleService;
+import cn.com.ctop.common.module.service.ISysDepartRoleService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

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

@@ -1,6 +1,13 @@
-package org.jeecg.modules.system.service.impl;
+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.model.DepartIdModel;
+import cn.com.ctop.common.module.model.SysDepartTreeModel;
+import cn.com.ctop.common.module.service.ISysDepartRoleService;
+import cn.com.ctop.common.module.service.ISysDepartService;
 import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.FindsDepartsChildrenUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,12 +15,6 @@ import io.netty.util.internal.StringUtil;
 import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.YouBianCodeUtil;
-import org.jeecg.modules.system.entity.*;
-import org.jeecg.modules.system.mapper.*;
-import org.jeecg.modules.system.model.DepartIdModel;
-import org.jeecg.modules.system.model.SysDepartTreeModel;
-import org.jeecg.modules.system.service.ISysDepartService;
-import org.jeecg.modules.system.util.FindsDepartsChildrenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -35,8 +36,8 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 
     @Resource
     private SysUserDepartMapper userDepartMapper;
-    @Resource
-    private SysDepartRoleMapper sysDepartRoleMapper;
+    @Autowired
+    private ISysDepartRoleService sysDepartRoleService;
     @Resource
     private SysDepartPermissionMapper departPermissionMapper;
     @Resource
@@ -227,7 +228,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
         List<String> roleIdList = new ArrayList<>();
         LambdaQueryWrapper<SysDepartRole> query = new LambdaQueryWrapper<>();
         query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList);
-        List<SysDepartRole> depRoleList = sysDepartRoleMapper.selectList(query);
+        List<SysDepartRole> depRoleList = sysDepartRoleService.list(query);
         for (SysDepartRole deptRole : depRoleList) {
             roleIdList.add(deptRole.getId());
         }
@@ -236,7 +237,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
         //根据部门id删除部门授权
         departPermissionMapper.delete(new LambdaQueryWrapper<SysDepartPermission>().in(SysDepartPermission::getDepartId, idList));
         //根据部门id删除部门角色
-        sysDepartRoleMapper.delete(new LambdaQueryWrapper<SysDepartRole>().in(SysDepartRole::getDepartId, idList));
+        sysDepartRoleService.remove(new LambdaQueryWrapper<SysDepartRole>().in(SysDepartRole::getDepartId, idList));
         if (roleIdList != null && roleIdList.size() > 0) {
             //根据角色id删除部门角色授权
             departRolePermissionMapper.delete(new LambdaQueryWrapper<SysDepartRolePermission>().in(SysDepartRolePermission::getRoleId, roleIdList));
@@ -311,7 +312,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
         List<String> roleIdList = new ArrayList<>();
         LambdaQueryWrapper<SysDepartRole> query = new LambdaQueryWrapper<>();
         query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList);
-        List<SysDepartRole> depRoleList = sysDepartRoleMapper.selectList(query);
+        List<SysDepartRole> depRoleList = sysDepartRoleService.list(query);
         for (SysDepartRole deptRole : depRoleList) {
             roleIdList.add(deptRole.getId());
         }
@@ -320,7 +321,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
         //根据部门id删除部门授权
         departPermissionMapper.delete(new LambdaQueryWrapper<SysDepartPermission>().in(SysDepartPermission::getDepartId, idList));
         //根据部门id删除部门角色
-        sysDepartRoleMapper.delete(new LambdaQueryWrapper<SysDepartRole>().in(SysDepartRole::getDepartId, idList));
+        sysDepartRoleService.remove(new LambdaQueryWrapper<SysDepartRole>().in(SysDepartRole::getDepartId, idList));
         if (roleIdList != null && roleIdList.size() > 0) {
             //根据角色id删除部门角色授权
             departRolePermissionMapper.delete(new LambdaQueryWrapper<SysDepartRolePermission>().in(SysDepartRolePermission::getRoleId, roleIdList));

+ 10 - 10
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java

@@ -1,17 +1,17 @@
-package org.jeecg.modules.system.service.impl;
+package cn.com.ctop.common.module.service.impl;
 
+import cn.com.ctop.common.module.entity.SysDepart;
 import cn.com.ctop.common.module.entity.SysUser;
+import cn.com.ctop.common.module.entity.SysUserDepart;
+import cn.com.ctop.common.module.mapper.SysUserDepartMapper;
+import cn.com.ctop.common.module.model.DepartIdModel;
+import cn.com.ctop.common.module.model.SysUserDepartsVO;
+import cn.com.ctop.common.module.service.ISysDepartService;
+import cn.com.ctop.common.module.service.ISysUserDepartService;
+import cn.com.ctop.common.module.service.ISysUserService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.entity.SysUserDepart;
-import org.jeecg.modules.system.mapper.SysUserDepartMapper;
-import org.jeecg.modules.system.model.DepartIdModel;
-import org.jeecg.modules.system.model.SysUserDepartsVO;
-import org.jeecg.modules.system.service.ISysDepartService;
-import org.jeecg.modules.system.service.ISysUserDepartService;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -144,7 +144,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
 	 * 根据部门code,查询当前部门和下级部门的 用户信息
 	 */
 	@Override
-	public List<SysUser> queryUserByDepCode(String depCode,String realname) {
+	public List<SysUser> queryUserByDepCode(String depCode, String realname) {
 		LambdaQueryWrapper<SysDepart> queryByDepCode = new LambdaQueryWrapper<SysDepart>();
 		queryByDepCode.likeRight(SysDepart::getOrgCode,depCode);
 		List<SysDepart> sysDepartList = sysDepartService.list(queryByDepCode);

+ 18 - 15
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.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.SysRole;
-import cn.com.ctop.common.module.entity.SysUser;
-import cn.com.ctop.common.module.mapper.SysUserMapper;
+import cn.com.ctop.common.module.entity.*;
+import cn.com.ctop.common.module.mapper.*;
 import cn.com.ctop.common.module.model.SysUserSysDepartModel;
+import cn.com.ctop.common.module.service.ISysUserService;
 import cn.com.ctop.common.module.vo.SysUserDepVo;
 import cn.com.ctop.common.module.vo.SysUserVo;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -21,14 +21,12 @@ import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.UUIDGenerator;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.*;
-import org.jeecg.modules.system.mapper.*;
-import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -44,23 +42,23 @@ import java.util.stream.Collectors;
 @Slf4j
 public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
 
-    @Autowired
+    @Resource
     private SysUserMapper userMapper;
-    @Autowired
+    @Resource
     private SysPermissionMapper sysPermissionMapper;
-    @Autowired
+    @Resource
     private SysUserRoleMapper sysUserRoleMapper;
-    @Autowired
+    @Resource
     private SysUserDepartMapper sysUserDepartMapper;
     @Autowired
     private ISysBaseApi sysBaseAPI;
-    @Autowired
+    @Resource
     private SysDepartMapper sysDepartMapper;
-    @Autowired
+    @Resource
     private SysRoleMapper sysRoleMapper;
-    @Autowired
+    @Resource
     private SysDepartRoleUserMapper departRoleUserMapper;
-    @Autowired
+    @Resource
     private SysDepartRoleMapper sysDepartRoleMapper;
 
     @Override
@@ -280,6 +278,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
+    public SysUser getDesignerTeamLeaderBy(String orgCode) {
+        return userMapper.getDesignerTeamLeaderBy(orgCode);
+    }
+
+    @Override
     public Map<String, String> getDepNamesByUserIds(List<String> userIds) {
         List<SysUserDepVo> list = this.baseMapper.getDepNamesByUserIds(userIds);
         Map<String, String> res = new HashMap<String, String>();

+ 20 - 14
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/UserCompanyServiceImpl.java

@@ -1,20 +1,20 @@
-package org.jeecg.modules.system.service.impl;
+package cn.com.ctop.common.module.service.impl;
 
+import cn.com.ctop.common.module.entity.SysDepart;
 import cn.com.ctop.common.module.entity.SysUser;
+import cn.com.ctop.common.module.entity.SysUserDepart;
+import cn.com.ctop.common.module.entity.UserCompany;
+import cn.com.ctop.common.module.mapper.SysDepartMapper;
+import cn.com.ctop.common.module.mapper.SysUserDepartMapper;
+import cn.com.ctop.common.module.mapper.UserCompanyMapper;
+import cn.com.ctop.common.module.service.IUserCompanyService;
 import cn.com.ctop.common.module.utils.Check;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.entity.SysUserDepart;
-import org.jeecg.modules.system.entity.UserCompany;
-import org.jeecg.modules.system.mapper.SysDepartMapper;
-import org.jeecg.modules.system.mapper.SysUserDepartMapper;
-import org.jeecg.modules.system.mapper.UserCompanyMapper;
-import org.jeecg.modules.system.service.IUserCompanyService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -29,11 +29,11 @@ import java.util.Map;
 @Slf4j
 @Service
 public class UserCompanyServiceImpl extends ServiceImpl<UserCompanyMapper, UserCompany> implements IUserCompanyService {
-    @Autowired
+    @Resource
     private SysUserDepartMapper userDepartMapper;
-    @Autowired
+    @Resource
     private SysDepartMapper departMapper;
-    @Autowired
+    @Resource
     private UserCompanyMapper userCompanyMapper;
 
     @Override
@@ -79,8 +79,6 @@ public class UserCompanyServiceImpl extends ServiceImpl<UserCompanyMapper, UserC
             }
 
         }
-
-
     }
 
     /**
@@ -95,4 +93,12 @@ public class UserCompanyServiceImpl extends ServiceImpl<UserCompanyMapper, UserC
         userCompanyMapper.deleteByMap(deleteMap);
 
     }
+
+    @Override
+    public UserCompany getByUserId(String userId) {
+        QueryWrapper<UserCompany>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id",userId);
+        queryWrapper.last("limit 1");
+        return null;
+    }
 }

+ 4 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java

@@ -1,9 +1,9 @@
-package org.jeecg.modules.system.util;
+package cn.com.ctop.common.module.utils;
 
+import cn.com.ctop.common.module.entity.SysDepart;
+import cn.com.ctop.common.module.model.DepartIdModel;
+import cn.com.ctop.common.module.model.SysDepartTreeModel;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.model.DepartIdModel;
-import org.jeecg.modules.system.model.SysDepartTreeModel;
 
 import java.util.ArrayList;
 import java.util.List;

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.system.util;
+package cn.com.ctop.common.module.utils;
 
+import cn.com.ctop.common.module.entity.SysPermission;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysPermission;
 
 import java.util.List;
 

+ 1 - 1
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouDailyImageReportLoadJob.java

@@ -19,7 +19,7 @@ public class KuaiShouDailyImageReportLoadJob {
     private ICtopOauthTokenService tokenService;
     @Autowired
     private IKuaishouReportDailyImageService kuaishouReportDailyImageService;
-    static ExecutorService executorService = Executors.newFixedThreadPool(8);
+    private static ExecutorService executorService = Executors.newFixedThreadPool(8);
     @XxlJob("kuaiShouDailyImageReportLoadJob")
     public void execute() throws Exception {
         //增加接口的开始和结束日期

+ 22 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouGroupController.java

@@ -20,7 +20,15 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
@@ -179,6 +187,19 @@ public class KuaiShouGroupController {
         return result;
     }
 
+    @AutoLog(value = "查询当天账户创建数量")
+    @ApiOperation(value = "查询当天账户创建数量", notes = "查询当天账户创建数量")
+    @GetMapping(value = "/queryToDayBuiltCount")
+    public Result<Object> queryToDayBuiltCount(Long accountId) {
+        try {
+            int count =  kuaiShouGroupService.queryToDayBuiltCount(accountId);
+            return Result.ok(600-count);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Result.error("查询失败");
+    }
+
     /**
      * 导出excel
      *

+ 44 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaishouBatchCampaignPreviewController.java

@@ -1,8 +1,11 @@
 package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.common.module.annotation.AutoLog;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouBatchCampaignPreview;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouUpdateService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouBatchCampaignPreviewService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -21,7 +24,6 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -56,6 +58,12 @@ import java.util.Map;
 public class KuaishouBatchCampaignPreviewController {
     @Autowired
     private IKuaishouBatchCampaignPreviewService kuaishouBatchCampaignPreviewService;
+    @Autowired
+    private IKuaishouBatchCampaignPreviewService campaignPreviewService;
+    @Autowired
+    private ICtopOauthTokenService tokenService;
+    @Autowired
+    private IKuaiShouUpdateService kuaiShouUpdateService;
 
     /**
      * 分页列表查询
@@ -168,6 +176,39 @@ public class KuaishouBatchCampaignPreviewController {
     }
 
     /**
+     * 手动修改定时启动
+     *
+     * @param kuaishouBatchCampaignPreview
+     * @return
+     */
+    @AutoLog(value = "手动修改定时启动")
+    @ApiOperation(value = "手动修改定时启动", notes = "手动修改定时启动")
+    @PostMapping(value = "/updateStatus")
+    public Result<Object> kuaishouBatchCampaignTimeStartJob() {
+        try {
+            List<KuaishouBatchCampaignPreview> campaignPreviewList = campaignPreviewService.queryListByTime();
+            if (!Check.isNull(campaignPreviewList)) {
+                for (KuaishouBatchCampaignPreview campaignPreview : campaignPreviewList) {
+                    CtopOauthToken token = tokenService.getTokenByAccountId(campaignPreview.getAccountId());
+                    if (!Check.isNull(token)) {
+                        Map<String, Object> map = kuaiShouUpdateService.updateCampaignStatus(token.getAccessToken(), campaignPreview.getAccountId(), campaignPreview.getCampaignId(), 1, "timingStart");
+                        if ((boolean) map.get("success")) {
+                            QueryWrapper<KuaishouBatchCampaignPreview> queryWrapper = new QueryWrapper<>();
+                            queryWrapper.eq("id", campaignPreview.getId());
+                            KuaishouBatchCampaignPreview campaign = new KuaishouBatchCampaignPreview();
+                            campaign.setMessage("定时启动成功!");
+                            campaignPreviewService.update(campaign, queryWrapper);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            return Result.error("error:" + e.getMessage());
+        }
+        return Result.ok("success");
+    }
+
+    /**
      * 通过id删除
      *
      * @param id
@@ -175,7 +216,7 @@ public class KuaishouBatchCampaignPreviewController {
      */
     @AutoLog(value = "快手-广告计划预览信息-通过id删除")
     @ApiOperation(value = "快手-广告计划预览信息-通过id删除", notes = "快手-广告计划预览信息-通过id删除")
-    @DeleteMapping(value = "/delete")
+    @RequestMapping(value = "/delete")
     public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
         try {
             kuaishouBatchCampaignPreviewService.removeById(id);
@@ -194,7 +235,7 @@ public class KuaishouBatchCampaignPreviewController {
      */
     @AutoLog(value = "快手-广告计划预览信息-批量删除")
     @ApiOperation(value = "快手-广告计划预览信息-批量删除", notes = "快手-广告计划预览信息-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
+    @RequestMapping(value = "/deleteBatch")
     public Result<KuaishouBatchCampaignPreview> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         Result<KuaishouBatchCampaignPreview> result = new Result<>();
         if (ids == null || "".equals(ids.trim())) {

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaishouBatchCreativePreviewController.java

@@ -152,7 +152,7 @@ public class KuaishouBatchCreativePreviewController {
      */
     @AutoLog(value = "快手-广告创意预览信息-通过id删除")
     @ApiOperation(value = "快手-广告创意预览信息-通过id删除", notes = "快手-广告创意预览信息-通过id删除")
-    @DeleteMapping(value = "/delete")
+    @RequestMapping(value = "/delete")
     public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
         try {
             kuaishouBatchCreativePreviewService.removeById(id);
@@ -171,7 +171,7 @@ public class KuaishouBatchCreativePreviewController {
      */
     @AutoLog(value = "快手-广告创意预览信息-批量删除")
     @ApiOperation(value = "快手-广告创意预览信息-批量删除", notes = "快手-广告创意预览信息-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
+    @RequestMapping(value = "/deleteBatch")
     public Result<KuaishouBatchCreativePreview> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         Result<KuaishouBatchCreativePreview> result = new Result<>();
         if (ids == null || "".equals(ids.trim())) {

+ 23 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaishouBatchGroupPreviewController.java

@@ -7,6 +7,7 @@ import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouBatchGroupPreview;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouBatchCreativePreviewService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouBatchGroupPreviewService;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -107,6 +108,25 @@ public class KuaishouBatchGroupPreviewController {
     }
 
     /**
+     * 批量修改
+     *
+     * @param kuaishouBatchGroupPreview
+     * @return
+     */
+    @AutoLog(value = "快手-批量修改")
+    @ApiOperation(value = "快手-批量修改", notes = "快手-批量修改")
+    @PostMapping(value = "/batchEdit")
+    public Result<Object> batchEdit(@RequestBody JSONObject data) {
+        try {
+            return kuaishouBatchGroupPreviewService.batchEdit(data);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            Result.error("操作失败");
+        }
+        return Result.error("修改失败");
+    }
+
+    /**
      * 编辑
      *
      * @param kuaishouBatchGroupPreview
@@ -123,7 +143,7 @@ public class KuaishouBatchGroupPreviewController {
                 result.error500("未找到对应实体");
             } else {
                 boolean ok = kuaishouBatchGroupPreviewService.updateById(kuaishouBatchGroupPreview);
-                if (!Check.isNull(kuaishouBatchGroupPreview.getClickTrackUrl()) && !Check.isNull(kuaishouBatchGroupPreview.getSiteId()) && !Check.isNull(kuaishouBatchGroupPreview.getActionbarClickUrl())) {
+                if (!Check.isNull(kuaishouBatchGroupPreview.getClickTrackUrl()) || !Check.isNull(kuaishouBatchGroupPreview.getSiteId()) || !Check.isNull(kuaishouBatchGroupPreview.getActionbarClickUrl())) {
                     KuaishouBatchCreativePreview creative = new KuaishouBatchCreativePreview();
                     creative.setClickTrackUrl(kuaishouBatchGroupPreview.getClickTrackUrl());
                     creative.setSiteId(kuaishouBatchGroupPreview.getSiteId());
@@ -151,7 +171,7 @@ public class KuaishouBatchGroupPreviewController {
      */
     @AutoLog(value = "快手-广告组预览信息-通过id删除")
     @ApiOperation(value = "快手-广告组预览信息-通过id删除", notes = "快手-广告组预览信息-通过id删除")
-    @DeleteMapping(value = "/delete")
+    @RequestMapping(value = "/delete")
     public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
         try {
             kuaishouBatchGroupPreviewService.removeById(id);
@@ -170,7 +190,7 @@ public class KuaishouBatchGroupPreviewController {
      */
     @AutoLog(value = "快手-广告组预览信息-批量删除")
     @ApiOperation(value = "快手-广告组预览信息-批量删除", notes = "快手-广告组预览信息-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
+    @RequestMapping(value = "/deleteBatch")
     public Result<KuaishouBatchGroupPreview> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         Result<KuaishouBatchGroupPreview> result = new Result<>();
         if (ids == null || "".equals(ids.trim())) {

+ 0 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaishouTemplateController.java


Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor