Prechádzať zdrojové kódy

Merge branch 'master' into jiaoyang

# Conflicts:
#	jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java
yumeng 4 rokov pred
rodič
commit
db40026af4
100 zmenil súbory, kde vykonal 949 pridanie a 425 odobranie
  1. 2 7
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/MD5Util.java
  2. 3 0
      jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java
  3. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java
  4. 6 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdvertiserController.java
  5. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceVideoEtlInfoController.java
  6. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java
  7. 0 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/JhsBakendDataController.java
  8. 0 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouChannelRegInfoController.java
  9. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouVideoEtlInfoController.java
  10. 0 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java
  11. 5 23
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java
  12. 1 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouHourlyAccountReportLoadJob.java
  13. 0 55
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouSuZaoLoadJob.java
  14. 25 16
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/ProjectMemberMapper.xml
  15. 4 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ImageReportDailyServiceImpl.java
  16. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/PerformanceSaleServiceImpl.java
  17. 53 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectMemberServiceImpl.java
  18. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectTransferRecordServiceImpl.java
  19. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/UReportFileServiceImpl.java
  20. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java
  21. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/PlatformOrderCtrl.java
  22. 10 9
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/xml/PlatformScriptMapper.xml
  23. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/util/DictHandler.java
  24. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/service/impl/OperateDetailServiceImpl.java
  25. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/service/impl/PerformanceInfoInfoServiceImpl.java
  26. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/service/impl/SalePerformanceDetailServiceImpl.java
  27. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/authc/ShiroRealm.java
  28. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/authc/interceptor/OnlineInterceptor.java
  29. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/web/TestWebController.java
  30. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/PermissionDataAspect.java
  31. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java
  32. 6 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
  33. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java
  34. 6 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java
  35. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
  36. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java
  37. 7 7
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
  38. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java
  39. 6 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/UserCompanyController.java
  40. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java
  41. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.java
  42. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDepartPermissionService.java
  43. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDepartRolePermissionService.java
  44. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleUserService.java
  45. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.java
  46. 0 52
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java
  47. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.java
  48. 7 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
  49. 10 9
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartPermissionServiceImpl.java
  50. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java
  51. 7 7
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.java
  52. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java
  53. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
  54. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java
  55. 6 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java
  56. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/impl/WpsFileServiceImpl.java
  57. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/impl/WpsUserServiceImpl.java
  58. 24 11
      jeecg-boot-module-system/src/main/resources/application-jiaoyang.yml
  59. 6 3
      jeecg-boot-module-system/src/main/resources/jeecg/jeecg_database.properties
  60. 195 46
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  61. 245 0
      module-common/src/main/java/cn/com/ctop/common/module/controller/KuaiShouOcpxActionTypeConfigController.java
  62. 65 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/KuaiShouOcpxActionTypeConfig.java
  63. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
  64. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java
  65. 8 8
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java
  66. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java
  67. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java
  68. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermission.java
  69. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java
  70. 5 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java
  71. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/UserCompany.java
  72. 44 0
      module-common/src/main/java/cn/com/ctop/common/module/enums/SceneIdEnum.java
  73. 15 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/KuaiShouOcpxActionTypeConfigMapper.java
  74. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java
  75. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartPermissionMapper.java
  76. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java
  77. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRolePermissionMapper.java
  78. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.java
  79. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java
  80. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java
  81. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java
  82. 2 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/SysUserMapper.java
  83. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java
  84. 2 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/UserAllocationMapper.java
  85. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/UserCompanyMapper.java
  86. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/KuaiShouOcpxActionTypeConfigMapper.xml
  87. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml
  88. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRolePermissionMapper.xml
  89. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleMapper.xml
  90. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SysDepartRolePermissionMapper.xml
  91. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartPermissionMapper.xml
  92. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml
  93. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml
  94. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml
  95. 11 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SysUserMapper.xml
  96. 29 10
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/UserAllocationMapper.xml
  97. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/UserCompanyMapper.xml
  98. 3 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java
  99. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
  100. 0 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysUserDepartsVO.java

+ 2 - 7
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/MD5Util.java

@@ -28,10 +28,10 @@ public class MD5Util {
 		}
 		return String.valueOf(str);
 	}
-	public static String getMd5(String msg) {
+	public static String getMd5(String url) {
 		MessageDigest md5 = MD5.get();
 		md5.reset();
-		return toHexStr(md5.digest(msg.getBytes()));
+		return toHexStr(md5.digest(url.getBytes()));
 	}
 
 	public static String byteArrayToHexString(byte b[]) {
@@ -89,9 +89,4 @@ public class MD5Util {
 	public static String getFileMd5(String path) throws Exception {
 		return DigestUtils.md5Hex(new FileInputStream(path));
 	}
-
-	public static void main(String[] args) throws Exception {
-		System.out.println(getFileMd5("D:\\mnt\\0427有缘3-帆楠E打车-同城热恋-1587982341839.mp4"));
-		System.out.println(getFileMd5("D:\\mnt\\0427有缘4-帆楠E洗脚-同城热恋-1593661309704.mp4"));
-	}
 }

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

@@ -187,6 +187,9 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/batch/kuaiShouGroupTemplate/*", "anon");
         filterChainDefinitionMap.put("/kuaishouBatch/**", "anon");
         filterChainDefinitionMap.put("/kuaishou/creative/*", "anon");
+        filterChainDefinitionMap.put("/ai/aiKuaiShouAppInfo/*", "anon");
+        filterChainDefinitionMap.put("/explore/*", "anon");
+        filterChainDefinitionMap.put("/ai/batchUpdate/*", "anon");
 
         // 添加自己的过滤器并且取名为jwt
         Map<String, Filter> filterMap = new HashMap<>(1);

+ 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;

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

@@ -83,7 +83,7 @@ public class BytedanceVideoEtlInfoController {
 				if(null!=endDate&&!"".equals(endDate.trim())){
 					queryWrapper.le("faddish_date",endDate);
 				}
-				queryWrapper.le("faddish_day_num",30);
+				queryWrapper.le("faddish_day_num",14);
 			}else {
 				//上线
 				if(null!=startDate&&!"".equals(startDate.trim())){
@@ -195,7 +195,7 @@ public class BytedanceVideoEtlInfoController {
 			  if(null!=endDate&&!"".equals(endDate.trim())){
 				  queryWrapper.le("faddish_date",endDate);
 			  }
-			  queryWrapper.le("faddish_day_num",30);
+			  queryWrapper.le("faddish_day_num",14);
 		  }else {
 			  //上线
 			  if(null!=startDate&&!"".equals(startDate.trim())){

+ 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/JhsBakendDataController.java

@@ -217,7 +217,6 @@ public class JhsBakendDataController {
 			  fis = (FileInputStream) file.getInputStream();
 			  AnalysisEventListener listener = new JhsBakendDataExcelListener();
 			  Boolean flag = ExcelUtils.readExcel(fis, JhsBakendDataEntity.class, listener);
-			  System.out.println("导入是否成功:" + flag);
 		  } catch (Exception e) {
 			  e.printStackTrace();
 		  } finally {

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

@@ -191,7 +191,6 @@ public class KuaishouChannelRegInfoController {
                 fis = (FileInputStream) file.getInputStream();
                 AnalysisEventListener listener = new KuaishouChannelRegInfoExcelListener();
                 Boolean flag = ExcelUtils.readExcel(fis, KuaishouChannelRegInfoEntity.class, listener);
-                System.out.println("导入是否成功:" + flag);
             } catch (Exception e) {
                 e.printStackTrace();
             } finally {

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

@@ -80,7 +80,7 @@ public class KuaishouVideoEtlInfoController {
 				if(null!=endDate&&!"".equals(endDate.trim())){
 					queryWrapper.le("faddish_date",endDate);
 				}
-				queryWrapper.le("faddish_day_num",30);
+				queryWrapper.le("faddish_day_num",14);
 			}else {
 				//上线
 				if(null!=startDate&&!"".equals(startDate.trim())){
@@ -192,7 +192,7 @@ public class KuaishouVideoEtlInfoController {
 			  if(null!=endDate&&!"".equals(endDate.trim())){
 				  queryWrapper.le("faddish_date",endDate);
 			  }
-			  queryWrapper.lt("faddish_day_num",30);
+			  queryWrapper.lt("faddish_day_num",14);
 		  }else {
 			  //上线
 			  if(null!=startDate&&!"".equals(startDate.trim())){

+ 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.*;
 

+ 5 - 23
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,23 +23,11 @@ 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.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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 项目成员
@@ -191,9 +176,10 @@ public class ProjectMemberController {
             List<JSONObject> projectList = projectMemberService.getProjectByUserIdAndMediaIds(userId, mediaIds);
             List<JSONObject> haveList = new ArrayList<>();
             if (!Check.isNull(projectList)) {
+                Map<Long, List<JSONObject>> accountMap = userAllocationService.getAccountListByProjectList(projectList);
                 for (int i = 0; i < projectList.size(); i++) {
                     JSONObject project = projectList.get(i);
-                    List<JSONObject> accountList = userAllocationService.getAccountListByProject(project.getLong("projectId"));
+                    List<JSONObject> accountList = accountMap.get(project.getLong("projectId"));
                     if (!Check.isNull(accountList)) {
                         project.put("accountList", accountList);
                         haveList.add(project);
@@ -596,9 +582,5 @@ public class ProjectMemberController {
 
     }
 
-    public static void main(String[] args) {
-
-    }
-
 
 }

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

@@ -29,7 +29,7 @@ public class KuaishouHourlyAccountReportLoadJob implements Job {
     @Autowired
     private IKuaishouInterfaceService kuaishouInterfaceService;
 
-    static ExecutorService executorService = null;
+    static ExecutorService executorService = Executors.newFixedThreadPool(8);
     //线程计数器
     static CountDownLatch countDownLatch = null;
 
@@ -50,7 +50,6 @@ public class KuaishouHourlyAccountReportLoadJob implements Job {
                     log.info("定时获取快手数据异常:未获取到可用的token");
                     return;
                 }
-                executorService = Executors.newFixedThreadPool(5);
                 countDownLatch = new CountDownLatch(tokens.size());
                 Date finalGetDate = getDate;
                 tokens.forEach(token -> {

+ 0 - 55
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouSuZaoLoadJob.java

@@ -1,55 +0,0 @@
-package org.jeecg.modules.ctop.job;
-
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.util.DateUtils;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-@Slf4j
-public class KuaishouSuZaoLoadJob implements Job {
-    @Autowired
-    private ICtopOauthTokenService tokenService;
-    @Autowired
-    private IKuaishouInterfaceService kuaishouInterfaceService;
-
-    static ExecutorService executorService = null;
-
-    @Override
-    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        Thread thread = new Thread() {
-            @Override
-            public void run() {
-                List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
-                executorService = Executors.newFixedThreadPool(8);
-                tokens.forEach(token -> {
-                    executorService.submit(new Runnable() {
-                        @Override
-                        public void run() {
-                            try {
-                                String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-                                String endDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, 1);
-                                String startDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
-                                kuaishouInterfaceService.getSuZaoList(token.getAccessToken(), token.getAccountId(), 1, startDate, endDate);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            } finally {
-                            }
-                        }
-                    });
-                });
-                log.info("快手素造数据同步完成");
-            }
-        };
-        thread.start();
-
-    }
-}

+ 25 - 16
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/ProjectMemberMapper.xml

@@ -110,28 +110,37 @@
     </select>
 
     <select id="queryProjectMemberByUserId" resultType="org.jeecg.modules.ctop.entity.ProjectMember">
-        select
-        distinct b.project_id as projectId,
-         (
-         select project_name  from ctop_project
-         where id = b.project_id
-        )as projectName,
-        a.advertiser_id as advertiserId,
+        SELECT
+        t1.id AS 'projectId',
+        project_name AS 'projectName',
+        t1.advertiser_id AS 'advertiserId',
         (
-        select name from ctop_advertiser where id = a.advertiser_id
+        SELECT
+        NAME
+        FROM
+        ctop_advertiser
+        WHERE
+        id = t1.advertiser_id
+        ) AS 'advertiserName',
+        t1.media_id as 'mediaId'
+        FROM
+        ctop_project t1
+        WHERE
+        t1.id IN (
+        SELECT
+        project_id
+        FROM
+        ctop_project_member
+        where user_id = #{userId}
+        GROUP BY
+        project_id
         )
-        as advertiserName,
-        (SELECT media_id from ctop_project c where c.id=a.project_id limit 1) as mediaId
-        from
-        ctop_user_allocation a
-        left join ctop_project_member b on a.project_id = b.project_id
-        where b.user_id = #{userId}
-        and a.media_id in
+        AND t1.media_id IN
         <foreach collection="mediaIds" item="item" separator=","
                  open="(" close=")">
             #{item}
         </foreach>
-        order by b.create_time desc
+        order by t1.create_time desc
     </select>
 
     <select id="getSaleProjects" resultType="org.jeecg.modules.ctop.entity.ProjectMember">

+ 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;
 

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

@@ -5,6 +5,7 @@ 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.ISysRoleExtService;
+import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import com.alibaba.fastjson.JSONArray;
@@ -104,6 +105,9 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
         return projectMemberList;
     }
 
+    @Autowired
+    private IUserAllocationService userAllocationService;
+
     @Override
     public List<Map<String, Object>> getProjectAccountByUserId(String userId, String mediaType) {
         List<Map<String, Object>> result = new ArrayList<>();
@@ -121,15 +125,63 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
         if (projectMemberList.isEmpty()) {
             return result;
         }
+
+        // Map<Long, List<JSONObject>> accountMap = userAllocationService.getAccountListByProjectMemberList(projectMemberList);
+        Map<Long, List<JSONObject>> accountMap = this.getAccountListByProjectMemberList(projectMemberList);
+
+
+      /*  temp.put("project", projectMember);
+        QueryWrapper<UserAllocation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("project_id", projectMember.getProjectId());
+        queryWrapper.isNotNull("account_id");
+        List<UserAllocation> userAllocations = userAllocationMapper.selectList(queryWrapper);
+        if (userAllocations.isEmpty()) {
+            temp = null;
+        } else {
+            temp.put("account", userAllocations);*/
+
+/*
         projectMemberList.forEach(ProjectMember -> {
             Map<String, Object> temp = this.queryAccountByProjectId(ProjectMember);
             if (temp != null) {
                 result.add(temp);
             }
-        });
+        });*/
+
+        for (ProjectMember member : projectMemberList) {
+            Map<String, Object> temp = new HashMap<>();
+            temp.put("project", member);
+            List<JSONObject> jsonObjects = accountMap.get(member.getProjectId());
+            if (Check.isNull(jsonObjects)) {
+                continue;
+            }
+            temp.put("account", jsonObjects);
+            result.add(temp);
+        }
+
         return result;
     }
 
+    private Map<Long, List<JSONObject>> getAccountListByProjectMemberList(List<ProjectMember> projectMemberList) {
+        Map<Long, List<JSONObject>> map = new HashMap<>();
+        List list = new ArrayList();
+        for (ProjectMember member : projectMemberList) {
+            list.add(member.getProjectId());
+            map.put(member.getProjectId(), new ArrayList<>());
+        }
+
+        List<JSONObject> jsonList = userAllocationMapper.getAccountListByProjectList(list);
+        for (int i = 0; i < jsonList.size(); i++) {
+            JSONObject jsonObject = jsonList.get(i);
+            Long projectId = jsonObject.getLong("projectId");
+            List<JSONObject> jsonObjects = map.get(projectId);
+            jsonObjects.add(jsonObject);
+        }
+        return map;
+
+
+    }
+
     @Override
     public ProjectMember getProjectByParams(Long targetProject, String userId) {
         QueryWrapper<ProjectMember> queryWrapper = new QueryWrapper<>();

+ 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.*;
 

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

@@ -4,17 +4,18 @@
 
     <select id="pageQuery" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        t1.id,
-        t1.`name`,
-        t1.size,
-        t1.create_time,
+            t1.id,
+            t1.`name`,
+            t1.size,
+            t1.create_time,
         FROM_UNIXTIME(ROUND((t1.create_time/1000),0)) as createTime,
-        (SELECT realname from sys_user where id=t1.creator limit 1) as creatorName,
-        (SELECT project_name from ctop_project where id=t1.project_id limit 1) as projectName,
-        t2.material_name as materialName
+            (SELECT realname from sys_user where id=t1.creator limit 1) as creatorName,
+            (SELECT project_name from ctop_project where id=t1.project_id limit 1) as projectName,
+            t2.material_name as materialName
+
         FROM
-        ctop_platform_script t1
-        LEFT JOIN ctop_platform_material t2 ON t1.id = t2.script_id
+            ctop_platform_script t1
+                LEFT JOIN ctop_platform_material t2 ON t1.id = t2.script_id
         where t2.material_code is not null
         <if test="projectId != null">
             AND t1.project_id= #{projectId}

+ 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;

+ 24 - 11
jeecg-boot-module-system/src/main/resources/application-jiaoyang.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8804
+  port: 8805
   ip: 39.97.120.42
   servlet:
     context-path: /jeecg-boot
@@ -28,8 +28,8 @@ spring:
           starttls:
             enable: true
             required: true
-  ## quartz定时任务,采用数据库方式
-  #quartz:
+    ## quartz定时任务,采用数据库方式
+    #quartz:
     #job-store-type: jdbc
   #json 时间戳统一转换
   jackson:
@@ -67,14 +67,14 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://172.30.0.4:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://172.30.0.4:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&allowMultiQueries=true&useSSL=false
     username: hcst
     password: hcst@2020
     driver-class-name: com.mysql.jdbc.Driver
     druid:
       stat-view-servlet:
         loginUsername: admin
-        loginPassword: hcst20161
+        loginPassword: hcst2016
         enabled: true
       web-stat-filter:
         enabled: true
@@ -106,10 +106,16 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://172.30.0.4:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://172.30.0.4:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&allowMultiQueries=true&useSSL=false
           username: hcst
           password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver
+          # 多数据源配置
+          #multi-datasource1:
+          #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
+          #username: root
+          #password: root
+          #driver-class-name: com.mysql.jdbc.Driver
   #redis 配置
   redis:
     database: 0
@@ -138,6 +144,13 @@ mybatis-plus:
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 #jeecg专用配置
 jeecg:
+  #积木报表设置
+  jmreport:
+    mode: dev
+    #是否需要校验token
+    is_verify_token: false
+    #必须校验方法
+    verify_methods: remove,delete,save,add,update
   elasticsearch:
     cluster-nodes:
     check-enabled: false
@@ -175,12 +188,12 @@ jeecg:
 kuaishou:
   api-url: https://ad.e.kuaishou.com
   auth-url: https://ad.e.kuaishou.com
-  appid: 328
+  appid: 27
   third-appid: 328
   oauth-type: agent
-  secret: 1iFTBiMdohkyEQQs
+  secret: QovprB1tNhXptgDc
   third-secret: 1iFTBiMdohkyEQQs
-  callback-url: http://callback.shyouteng.com.cn/kuaishou
+  callback-url: http://adsp.c-top.com.cn:8080/jeecg-boot/kuaishou
   third-callback-url: http://callback.shyouteng.com.cn/kuaishou
   apk-sava-path: /mnt/file/apk
   image-sava-path: /mnt/file/image
@@ -246,5 +259,5 @@ bytedance:
     advertiser-fund-daily-stat: /2/advertiser/fund/daily_stat/
 ai:
   callback:
-    callback-unit-url: http://192.168.1.193:31012/ai_callback_add_group
-    callback-creative-url: http://192.168.1.193:31012/ai_callback_add_creative
+    callback-unit-url: http://139.186.27.96:31012/ai_callback_add_group
+    callback-creative-url: http://139.186.27.96:31012/ai_callback_add_creative

+ 6 - 3
jeecg-boot-module-system/src/main/resources/jeecg/jeecg_database.properties

@@ -1,8 +1,11 @@
 #mysql
 diver_name=com.mysql.jdbc.Driver
-url=jdbc:mysql://139.186.151.174:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-username=hcst
-password=hcst@2020
+#url=jdbc:mysql://139.186.151.174:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+#username=hcst
+#password=hcst@2020
+url=jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+username=data
+password=hcst@2021
 database_name=jeecg-boot
 #oracle
 #diver_name=oracle.jdbc.driver.OracleDriver

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

@@ -3,10 +3,8 @@ package org.jeecg;
 import cn.com.ctop.common.module.entity.BindAccountLogin;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.UserAllocation;
-import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
 import cn.com.ctop.common.module.service.IBindAccountLoginService;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.common.module.service.IOauthConfigService;
 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;
@@ -15,15 +13,18 @@ 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;
 import cn.com.ctop.oa.modules.service.IWechatNoListService;
 import cn.com.ctop.oa.modules.service.IWechatUserListService;
+import cn.com.ctop.toutiao.modules.link.service.IETLReportBytedanceVideoService;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
 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.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.junit.Test;
@@ -47,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
@@ -66,42 +67,36 @@ public class SampleTest {
     private IBindAccountLoginService bindAccountLoginService;
     @Autowired
     private IKuaishouWebInterfaceService kuaishouWebInterfaceService;
-    @Autowired
-    private IOauthConfigService configService;
-    @Autowired
-    private CtopOauthTokenMapper oauthTokenMapper;
-    @Autowired
-    private IKuaishouInterfaceService iKuaishouInterfaceService;
+ /*   @Autowired
+    private IByteDanceAdvertiserDataService advertiserDataService;
+
+*/
 
 
     @Test
     public void loadBytedanceCreativeData() throws ParseException {
-        CtopOauthToken token = oauthTokenMapper.selectByAccountId(9784689L);
-
-        iKuaishouInterfaceService.getVideoList(token, null, null);
-
-      /*  List<CtopOauthToken> oauthTokens = oauthTokenMapper.selectKuaiShouTokens(CtopAdConstant.PLATFORM_TYPE_KUAISHOU);
-        if (!Check.isNull(oauthTokens)) {
-            Map<Long, String> configMap = configService.getConfigMapByMediaId(CtopAdConstant.PLATFORM_TYPE_KUAISHOU_INT);
-            for (CtopOauthToken oauthToken : oauthTokens) {
-                XxlJobHelper.log("刷新token,accountId:{}", oauthToken.getAccountId());
-                //快手
-                if (CtopAdConstant.PLATFORM_TYPE_KUAISHOU.equals(oauthToken.getMediaId().trim())) {
-                    String secret = configMap.get(oauthToken.getAppId());
-                    System.err.println(secret);
-                    oauthTokenService.getKuaiShouRefreshToken(oauthToken.getAccountId(), oauthToken.getAccessToken(), oauthToken.getRefreshToken(), oauthToken.getAppId(), secret);
-                }
-            }
-        } else {
-            XxlJobHelper.log("----------------------刷新token获取数据返回结果为空----------------------------------");
-        }*/
+        //    1662234704806924
+       /* CtopOauthToken token = new CtopOauthToken();
+        token.setAccountId(9549277L);
+        token.setAccessToken("bc5327c8f2bd8a67513e51148c9206c8");
+
+
 
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date parse = simpleDateFormat.parse("2021-02-02");
+        kuaishouInterfaceService.getAdvertiserReportDaily(token, parse, parse);*/
 
-      /*  Map<Long, String> configMap = configService.getConfigMapByMediaId(CtopAdConstant.PLATFORM_TYPE_KUAISHOU_INT);
-        System.err.println(configMap);*/
+        CtopOauthToken token = new CtopOauthToken();
+        token.setAccountId(9767055L);
+        token.setAccessToken("28e4e6b124e1443d6971ba4c699de6c9");
 
+        kuaishouInterfaceService.getVideoList(token, null, null);
+        kuaishouInterfaceService.getVideoInfo("28e4e6b124e1443d6971ba4c699de6c9",9767055L,"5208131540349742192");
 
-      /*  List<KuaiShouVideoGet> KuaiShouVideoGets = videoGetService.selectPhotoIdsByAccountId(9743746L);
+     /*   CtopOauthToken tokenByAccountId = tokenService.getTokenByAccountId(1662234704806924L);
+        advertiserDataService.getMaterialList(tokenByAccountId);*/
+       /* getVideoByPage(token, "", 1);
+        List<KuaiShouVideoGet> KuaiShouVideoGets = videoGetService.selectPhotoIdsByAccountId(9743746L);
         if (!Check.isNull(KuaiShouVideoGets)) {
             JSONArray dateList = new JSONArray();
             JSONArray photoIds = new JSONArray();
@@ -290,16 +285,6 @@ public class SampleTest {
     }
 
     @Test
-    public void testData11() {
-        CtopOauthToken token = tokenService.getTokenByAccountId(9556344L);
-        int dimeDiff = 5;
-        Date now = new Date();
-        String startTime = DateUtils.formatDate("2021-01-11 18:25:00");
-        String endTime = DateUtils.formatDate(now, "2021-01-11 18:35:00");
-        kuaishouInterfaceService.getSuZaoList(token.getAccessToken(), token.getAccountId(), 1, startTime, endTime);
-    }
-
-    @Test
     public void loadKuaishouAgentData() {
         kuaishouReportDailyAgentService.loginAgent();
         try {
@@ -534,17 +519,181 @@ public class SampleTest {
 //                aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate2,50);
 //            }
 //        }
+        /**
+         * 120002
+         * 150001
+         * 150002
+         * 150003
+         * 150004
+         */
+
+        AiKuaishouAccountTargetTemplate accountTargetTemplate2 = aiKuaishouAccountTargetTemplateService.getById(120002);
+        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate2, 250);
+        accountTargetTemplate2 = aiKuaishouAccountTargetTemplateService.getById(150001);
+        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate2, 250);
+        accountTargetTemplate2 = aiKuaishouAccountTargetTemplateService.getById(150002);
+        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate2, 250);
+        accountTargetTemplate2 = aiKuaishouAccountTargetTemplateService.getById(150003);
+        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate2, 250);
+        accountTargetTemplate2 = aiKuaishouAccountTargetTemplateService.getById(150004);
+        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate2, 250);
+    }
 
-        AiKuaishouAccountTargetTemplate accountTargetTemplate2 = aiKuaishouAccountTargetTemplateService.getById(120001);
-        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate2, 1);
+    @Test
+    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);
+        }
     }
 
-    @Autowired
-    private IBytedancePlanDailyReportService planDailyReportService;
 
     @Test
+    public void checkBytedanceReport(){
+        CtopOauthToken token = tokenService.getTokenByAccountId(1678959391271949L);
+        String startDate = "2021-01-01 00:00:00";
+        String endDate = "2021-01-31 00:00:00";
+        bytedanceReportService.checkoutData(token,startDate,endDate);
+    }
+    @Test
     public void etlKuaishouProjectData() {
         CtopOauthToken token = tokenService.getTokenByAccountId(1660666858777607L);
         reportService.getAdvertiserPlanReport(token, DateUtils.parseDate("2021-01-25", "yyyy-MM-dd"), DateUtils.parseDate("2021-01-25", "yyyy-MM-dd"), CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
     }
-}
+
+    @Autowired
+    IBytedanceVideoReportService bytedanceVideoReportService;
+
+    @Test
+    public void etlBytedanceVideoReport() {
+
+        for (int i = 27; i <= 35; i++) {
+            etlBytedanceVideo(DateUtils.formatDate(DateUtils.addDay(new Date(), -i)));
+        }
+        //etlBytedanceVideo("2021-02-03");
+
+    }
+
+    private void etlBytedanceVideo(String statDate) {
+        List<CtopOauthToken> tokens = oauthTokenService.selectToutiaoToken();
+        executorService = Executors.newFixedThreadPool(10);
+        countDownLatch = new CountDownLatch(tokens.size());
+        tokens.forEach(token -> executorService.submit(() -> {
+            try {
+                Long[] materials={6904990807503634445L,6904990807503634445L};
+                bytedanceVideoReportService.pullVideoReportByMaterialId(token, statDate, statDate, materials,1);
+                //bytedanceVideoReportService.pullVideoReport(token, statDate, statDate, 1);
+            } catch (Exception e) {
+
+            } finally {
+                countDownLatch.countDown();
+            }
+        }));
+        try {
+            countDownLatch.await();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Autowired
+    IETLReportBytedanceVideoService ietlReportBytedanceVideoService;
+
+    @Test
+    public void etlBytedanceVideoReportClean() {
+        //for (int i = 1; i <= 1; i++) {
+          //  String statDate = DateUtils.formatDate(DateUtils.addDay(new Date(), -i));
+            ietlReportBytedanceVideoService.cleanETL("2020-12-31");
+        //}
+    }
+
+    @Test
+    public void etlBytedanceVideoReportClean1() {
+
+        for (int i = 3; i <= 31; i++) {
+            String statDate = DateUtils.formatDate(DateUtils.addDay(new Date(), -i));
+            ietlReportBytedanceVideoService.cleanETL(statDate);
+        }
+    }
+
+
+    @Autowired
+    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();
+        }
+    }
+
+    }

+ 245 - 0
module-common/src/main/java/cn/com/ctop/common/module/controller/KuaiShouOcpxActionTypeConfigController.java

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

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

@@ -0,0 +1,65 @@
+package cn.com.ctop.common.module.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 转化目标字典表
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2021-02-22
+ */
+@Data
+@TableName("ctop_kuaishou_ocpx_action_type_config")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_kuaishou_ocpx_action_type_config对象", description = "转化目标字典表")
+public class KuaiShouOcpxActionTypeConfig {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+    private Long id;
+    /**
+     * 优化目标
+     */
+    @Excel(name = "优化目标", width = 15)
+    @ApiModelProperty(value = "优化目标")
+    private Integer ocpxActionType;
+    /**
+     * 优化名称
+     */
+    @Excel(name = "优化名称", width = 15)
+    @ApiModelProperty(value = "优化名称")
+    private String ocpxActionName;
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+}

+ 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;

+ 44 - 0
module-common/src/main/java/cn/com/ctop/common/module/enums/SceneIdEnum.java

@@ -0,0 +1,44 @@
+package cn.com.ctop.common.module.enums;
+
+/**
+ * 条件枚举
+ *
+ * @param
+ * @author ZHAOXA
+ * @return
+ * @throws
+ */
+public enum SceneIdEnum {
+    ONE(1, "优选广告位"),
+    THREE(3, "视频播放页广告"),
+    FIVE(5, "联盟广告"),
+    SIX(6, "上下滑大屏广告"),
+    SEVEN(7, "信息流广告"),
+    TEN(10, "激励视频"),
+    ELEVEN(11, "快看点场景");
+
+    private Integer id;
+    private String name;
+
+    private SceneIdEnum(Integer id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public static SceneIdEnum getEnumById(Integer id) {
+        for (SceneIdEnum em : SceneIdEnum.values()) {
+            if (em.id == id) {
+                return em;
+            }
+        }
+        return null;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+}

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

@@ -0,0 +1,15 @@
+package cn.com.ctop.common.module.mapper;
+
+import cn.com.ctop.common.module.entity.KuaiShouOcpxActionTypeConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 转化目标字典表
+ *
+ * @author: jeecg-boot
+ * @date: 2021-02-22
+ * @cersion: V1.0
+ */
+public interface KuaiShouOcpxActionTypeConfigMapper extends BaseMapper<KuaiShouOcpxActionTypeConfig> {
+
+}

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

@@ -42,4 +42,6 @@ public interface UserAllocationMapper extends BaseMapper<UserAllocation> {
     String getCompanyNameByUserId(@Param("planId") String planId);
 
     List<UserAllocation> listByMediaId(@Param("mediaId")String mediaId, @Param("accountStatus")Integer accountStatus);
+
+    List<JSONObject> getAccountListByProjectList(@Param("list") List 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 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/KuaiShouOcpxActionTypeConfigMapper.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.KuaiShouOcpxActionTypeConfigMapper">
+
+</mapper>

+ 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>

+ 29 - 10
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/UserAllocationMapper.xml

@@ -31,14 +31,33 @@
 
     <select id="getAccountListByProject" resultType="com.alibaba.fastjson.JSONObject">
        select
-       account_id as 'accountId',
-       user_name as 'userName',
-       auth_name as 'authName'
-       from ctop_user_allocation
-       where project_id = #{projectId}
-       order by create_time desc
+       t1.account_id as 'accountId',
+       (select  realname  from sys_user where  id = t1.user_id ) as 'userName',
+       t1.auth_name as 'authName'
+       from ctop_user_allocation t1
+       where t1.project_id = #{projectId}
+       order by t1.create_time desc
     </select>
 
+    <select id="getAccountListByProjectList" resultType="com.alibaba.fastjson.JSONObject">
+        select
+        t1.project_id as 'projectId',
+        t1.account_id as 'accountId',
+        (select realname from sys_user where id = t1.user_id ) as 'userName',
+        t1.auth_name as 'authName',
+        t1.account_status as 'accountStatus'
+        from ctop_user_allocation t1
+        where t1.project_id in
+        <foreach collection="list" item="item" separator=","
+                 open="(" close=")">
+            #{item}
+        </foreach>
+
+
+        order by t1.create_time desc
+    </select>
+
+
     <select id="getUserIdListByProjectId" resultType="com.alibaba.fastjson.JSONObject">
    SELECT t1.user_id as 'userId',
     t1.account_id as 'accountId',
@@ -128,10 +147,10 @@
         select a.* from ctop_user_allocation a
         left join ctop_project p on p.id = a.project_id
         where
-            1=1
-            <if test="null!=accountStatus">
-                and a.account_status = #{accountStatus}
-            </if>
+        1=1
+        <if test="null!=accountStatus">
+            and a.account_status = #{accountStatus}
+        </if>
         <if test="null!=mediaId">
             and p.media_id = #{mediaId}
         </if>

+ 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;

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


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov