Explorar el Código

Merge branch 'master' into dimension

yumeng hace 3 años
padre
commit
ee31100bb5

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

@@ -192,10 +192,12 @@ public class ProjectMemberController {
                 Map<Long, List<JSONObject>> accountMap = userAllocationService.getAccountListByProjectList(projectList);
                 for (int i = 0; i < projectList.size(); i++) {
                     JSONObject project = projectList.get(i);
-                    List<JSONObject> accountList = accountMap.get(project.getLong("projectId"));
-                    if (!Check.isNull(accountList)) {
-                        project.put("accountList", accountList);
-                        haveList.add(project);
+                    if (!Check.isNull(project)) {
+                        List<JSONObject> accountList = accountMap.get(project.getLong("projectId"));
+                        if (!Check.isNull(accountList)) {
+                            project.put("accountList", accountList);
+                            haveList.add(project);
+                        }
                     }
                 }
             }
@@ -326,7 +328,7 @@ public class ProjectMemberController {
                 throw new Exception("请选择项目");
             }
             Project project = projectService.getById(projectId);
-            if(Check.isNull(project)){
+            if (Check.isNull(project)) {
                 throw new Exception("项目不存在");
             }
             JSONArray memberArr = jsonObject.getJSONArray("memberArr");

+ 7 - 4
module-common/src/main/java/cn/com/ctop/common/module/service/impl/UserAllocationServiceImpl.java

@@ -3,6 +3,7 @@ package cn.com.ctop.common.module.service.impl;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.UserAllocationMapper;
 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 cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.StatusCode;
@@ -169,8 +170,10 @@ public class UserAllocationServiceImpl extends ServiceImpl<UserAllocationMapper,
         List list = new ArrayList();
         for (int i = 0; i < projectList.size(); i++) {
             JSONObject jsonObject = projectList.get(i);
-            list.add(jsonObject.getLong("projectId"));
-            map.put(jsonObject.getLong("projectId"), new ArrayList<>());
+            if (!Check.isNull(jsonObject)) {
+                list.add(jsonObject.getLong("projectId"));
+                map.put(jsonObject.getLong("projectId"), new ArrayList<>());
+            }
         }
         List<JSONObject> jsonList = userAllocationMapper.getAccountListByProjectList(list);
         for (int i = 0; i < jsonList.size(); i++) {
@@ -209,8 +212,8 @@ public class UserAllocationServiceImpl extends ServiceImpl<UserAllocationMapper,
 
     @Override
     public boolean updateProjectStrategyStatus(Long accountId, Integer projectStrategy) {
-        int num  = userAllocationMapper.updateProjectStrategyStatus(accountId, projectStrategy);
-        return num>0;
+        int num = userAllocationMapper.updateProjectStrategyStatus(accountId, projectStrategy);
+        return num > 0;
     }
 
     @Override

+ 7 - 4
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouVideoGetMapper.xml

@@ -317,11 +317,14 @@
     </select>
 
     <select id="getAccountIds" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT account_id 'accountId',DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 65 MINUTE), '%Y-%m-%d %H:%i:%s') 'startDate'
-        FROM ctop_kuaishou_video_get
+        SELECT t1.account_id 'accountId',DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 15 MINUTE), '%Y-%m-%d %H:%i:%s') 'startDate'
+        FROM ctop_kuaishou_video_get t1
+                 LEFT JOIN ctop_user_allocation t2 ON t1.account_id = t2.account_id
         where channel_type = 1
-          and status = 0
-        GROUP BY account_id
+          AND t2.account_status = 0
+          AND t1.status = 0
+          AND t1.stat_date >=DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 2 DAY), '%Y-%m-%d')
+        GROUP BY t1.account_id
     </select>
 
     <select id="queryPhotoIdsByProjectAndMd5" resultType="java.lang.String">