Procházet zdrojové kódy

Merge branch 'test'

zhaoxian před 3 roky
rodič
revize
ef0ffe798e

+ 10 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/channel/service/impl/KuaishouChannelServiceImpl.java

@@ -15,6 +15,7 @@ import cn.com.ctop.kuaishou.modules.ai.service.IKuaishouAppPackageService;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppList;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAppListService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouMaterialUploadService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.channel.entity.KuaishouChannel;
 import cn.com.ctop.kuaishou.modules.channel.entity.KuaishouChannelAppInfo;
 import cn.com.ctop.kuaishou.modules.channel.entity.KuaishouChannelCreateStrategy;
@@ -94,6 +95,9 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
     private IKuaiShouAppListService kuaiShouAppListService;
 
     @Autowired
+    private IKuaishouInterfaceService kuaishouInterfaceService;
+
+    @Autowired
     private IAiKuaiShouAppInfoService appInfoService;
 
     @Autowired
@@ -324,6 +328,7 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
                             log.error("通过账户ID(" + token.getAccountId() + ")获取图片Token失败,返回信息:" + tokenJson.getString("message"));
                         }
                         //使用范围是账户时,查询旧app来做匹配
+                        kuaishouInterfaceService.getAppList(accountId, token.getAccessToken());
                         List<KuaiShouAppList> oldAppList = kuaiShouAppListService.getAppListByAccountId(accountId);
                         strategy.setImageToken(tokenJson.getString("imageToken"));
                         strategy.setAccountId(accountId);
@@ -360,6 +365,7 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
                     log.error("通过账户ID(" + token.getAccountId() + ")获取图片Token失败,返回信息:" + tokenJson.getString("message"));
                 }
                 //使用范围是账户时,查询旧app来做匹配
+                kuaishouInterfaceService.getAppList(strategy.getAccountId(), token.getAccessToken());
                 List<KuaiShouAppList> oldAppList = kuaiShouAppListService.getAppListByAccountId(strategy.getAccountId());
                 strategy.setImageToken(tokenJson.getString("imageToken"));
                 if (url.contains(CHANNEL_STR)) {
@@ -425,9 +431,9 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
                         KuaishouChannelAppInfo channelAppInfo = new KuaishouChannelAppInfo();
                         BeanUtils.copyProperties(app, channelAppInfo);
                         channelAppInfo.setState(1);
-                        channelAppInfo.setUrl((String)app.getUrl());
+                        channelAppInfo.setUrl((String) app.getUrl());
                         channelAppInfo.setUseSdk(0);
-                        channelAppInfo.setAppIconUrl((String)app.getAppIconUrl());
+                        channelAppInfo.setAppIconUrl((String) app.getAppIconUrl());
                         channelAppInfo.setId(null);
                         channelAppInfo.setType("copy");
                         channelAppInfo.setRemark("copy原有App");
@@ -906,6 +912,7 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
                                 log.error("通过账户ID(" + token.getAccountId() + ")获取图片Token失败,返回信息:" + tokenJson.getString("message"));
                             }
                             //使用范围是账户时,查询旧app来做匹配
+                            kuaishouInterfaceService.getAppList(strategy.getAccountId(), token.getAccessToken());
                             List<KuaiShouAppList> oldAppList = kuaiShouAppListService.getAppListByAccountId(accountId);
                             strategy.setImageToken(tokenJson.getString("imageToken"));
                             strategy.setAccountId(accountId);
@@ -927,6 +934,7 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
                         log.error("通过账户ID(" + token.getAccountId() + ")获取图片Token失败,返回信息:" + tokenJson.getString("message"));
                     }
                     //使用范围是账户时,查询旧app来做匹配
+                    kuaishouInterfaceService.getAppList(strategy.getAccountId(), token.getAccessToken());
                     List<KuaiShouAppList> oldAppList = kuaiShouAppListService.getAppListByAccountId(strategy.getAccountId());
                     strategy.setImageToken(tokenJson.getString("imageToken"));
                     try {

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

@@ -98,7 +98,7 @@ public class ProjectMemberController {
         try {
             QueryWrapper<ProjectMember> queryWrapper = new QueryWrapper<>();
             String roleCode = sysRoleService.getRoleCodeByUserId(userId);
-            if (!"admin".equals(roleCode) && !roleCode.contains("sale") && !"meidaManager".equals(roleCode)) {
+            if (!"admin".equals(roleCode) && !"sale".contains(roleCode) && !"meidaManager".equals(roleCode)) {
                 queryWrapper.eq("user_id", userId);
             }
             queryWrapper.groupBy("project_id");
@@ -169,7 +169,7 @@ public class ProjectMemberController {
             //查询用户角色
             String roleCode = sysRoleService.getRoleCodeByUserId(userId);
             //角色为 管理员 || 销售 || 媒介 查询全部
-            if ("admin".equals(roleCode) || roleCode.contains("sale") || "meidaManager".equals(roleCode)) {
+            if ("admin".equals(roleCode) || "sale".contains(roleCode) || "meidaManager".equals(roleCode)) {
                 userId = null;
             }
             //查询项目信息以及广告主
@@ -199,6 +199,9 @@ public class ProjectMemberController {
                 for (JSONObject object : list) {
                     List<JSONObject> proList = new ArrayList<>();
                     for (JSONObject have : haveList) {
+                        if(Check.isNull(have)){
+                            continue;
+                        }
                         if (Check.isNull(have.getLong("productId"))) {
                             continue;
                         }
@@ -237,7 +240,7 @@ public class ProjectMemberController {
             //查询用户角色
             String roleCode = sysRoleService.getRoleCodeByUserId(userId);
             //角色为 管理员 || 销售 || 媒介 查询全部
-            if ("admin".equals(roleCode) || roleCode.contains("sale") || "meidaManager".equals(roleCode)) {
+            if ("admin".equals(roleCode) || "sale".contains(roleCode) || "meidaManager".equals(roleCode)) {
                 userId = null;
             }
             //查询项目信息以及广告主
@@ -253,6 +256,9 @@ public class ProjectMemberController {
                 for (JSONObject object : list) {
                     List<JSONObject> proList = new ArrayList<>();
                     for (JSONObject have : projectList) {
+                        if(Check.isNull(have)){
+                            continue;
+                        }
                         if (Check.isNull(have.getLong("productId"))) {
                             continue;
                         }
@@ -302,7 +308,7 @@ public class ProjectMemberController {
             //查询用户角色
             String roleCode = sysRoleService.getRoleCodeByUserId(userId);
             //角色为 管理员 || 销售 || 媒介 查询全部
-            if ("admin".equals(roleCode) || roleCode.contains("sale") || "meidaManager".equals(roleCode)) {
+            if ("admin".equals(roleCode) || "sale".contains(roleCode) || "meidaManager".equals(roleCode)) {
                 userId = null;
             }
             //查询项目信息以及广告主
@@ -397,7 +403,7 @@ public class ProjectMemberController {
         try {
 
             String roleCode = sysRoleService.getRoleCodeByUserId(userId);
-            if ("admin".equals(roleCode) || roleCode.contains("sale") || "meidaManager".equals(roleCode)) {
+            if ("admin".equals(roleCode) || "sale".contains(roleCode) || "meidaManager".equals(roleCode)) {
                 List<Project> projects = projectService.list();
                 result.put("data", projects);
                 ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
@@ -434,7 +440,7 @@ public class ProjectMemberController {
         projectMember.setProductId(null);
         QueryWrapper<ProjectMember> queryWrapper = QueryGenerator.initQueryWrapper(projectMember, req.getParameterMap());
         String roleCode = sysRoleService.getRoleCodeByUserId(userId);
-        if (!"admin".equals(roleCode) && !roleCode.contains("sale") && !"meidaManager".equals(roleCode)) {
+        if (!"admin".equals(roleCode) && !"sale".contains(roleCode) && !"meidaManager".equals(roleCode)) {
             queryWrapper.eq("user_id", userId);
         }
         if (!Check.isNull(projectName)) {
@@ -675,7 +681,7 @@ public class ProjectMemberController {
         List<Integer> mediaIds = new ArrayList<>();
         mediaIds.add(1);
         mediaIds.add(3);
-        List<ProjectMember> projectMemberList = projectMemberService.getProjects(mediaIds,userId);
+        List<ProjectMember> projectMemberList = projectMemberService.getProjects(mediaIds, userId);
         if (projectMemberList == null) {
             result.error500("未找到对应实体");
         } else {