代码提交

ad-platform-pojo/src/main/java/com/baiye/model/dto/ClueQueryCriteria.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Set;
 
 
 /**
@@ -35,7 +36,7 @@ public class ClueQueryCriteria {
     private Integer memberStatus;
 
     @ApiModelProperty(value = "选取的组员ID")
-    private List<Long> userIds;
+    private Set<Long> userIds;
 
 
     private Integer page;

ad-platform-pojo/src/main/java/com/baiye/model/dto/OrganizeQueryCriteria.java

@@ -1,6 +1,7 @@
 package com.baiye.model.dto;
 
 import com.baiye.annotation.Query;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -24,4 +25,7 @@ public class OrganizeQueryCriteria {
     private Long organizeId;
 
     private Long taskId;
+
+    @ApiModelProperty("是否显示组长，0：不显示 1：显示")
+    private int isShowLeader = 0;
 }

manage/ad-platform-management/src/main/java/com/baiye/feign/SourceClueClient.java

@@ -2,6 +2,7 @@ package com.baiye.feign;
 
 import com.baiye.model.dto.ClueQueryCriteria;
 import com.baiye.model.dto.DistributeResponseDTO;
+import com.baiye.model.dto.OrganizeQueryCriteria;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
@@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * 资源服务
@@ -39,5 +41,9 @@ public interface SourceClueClient {
     @ApiOperation("修改组员")
     @GetMapping(API_PREFIX + "/updateMember")
     void updateMember(@RequestParam("userId") Long userId, @RequestParam(value = "replaceUserId") Long replaceUserId);
+
+    @ApiOperation("查询组员ID")
+    @PostMapping(API_PREFIX + "/findMemberIdList")
+    ResponseEntity<Set<Long>> findMemberIdList(OrganizeQueryCriteria organizeQueryCriteria);
 }
 

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/dto/OrganizeMemberDistributionDTO.java

@@ -10,6 +10,7 @@ import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.sql.Timestamp;
 import java.util.List;
+import java.util.Set;
 
 /**
  * @author
@@ -21,7 +22,7 @@ public class OrganizeMemberDistributionDTO {
 
     @NotEmpty(message = "组员不能为空")
     @ApiModelProperty("小组成员id集合")
-    private List<Long> userIds;
+    private Set<Long> userIds;
 
     @ApiModelProperty("资源标签")
     private List<String> sourceLabel;

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java

@@ -148,7 +148,7 @@ public class OrganizeServiceImpl implements OrganizeService {
             // 重新分配资源
             ClueQueryCriteria clueQueryCriteria = new ClueQueryCriteria();
             clueQueryCriteria.setMemberId(userId);
-            clueQueryCriteria.setUserIds(organizeMemberId);
+            clueQueryCriteria.setUserIds((Set<Long>) organizeMemberId);
             sourceClueClient.queryOrganizeIdList(clueQueryCriteria);
         }
     }
@@ -313,15 +313,9 @@ public class OrganizeServiceImpl implements OrganizeService {
      */
     @Override
     public TaskOrganize queryDetails(OrganizeQueryCriteria organizeQueryCriteria) {
-        List<Long> userIds = new ArrayList<>();
         TaskOrganize updateTaskOrganize = taskOrganizeRepository.findByOrganizeIdAndTaskId(organizeQueryCriteria.getOrganizeId(), organizeQueryCriteria.getTaskId());
-        List<OrganizeUser> organize = organizeUserRepository.findByOrganizeId(organizeQueryCriteria.getOrganizeId());
-        organize.stream().forEach(c -> {
-            if (!c.getIsLeader()) {
-                userIds.add(c.getUserId());
-            }
-        });
-        List<Map<String, Object>> list = findUser(userIds, null);
+        Set<Long> memberIdList = sourceClueClient.findMemberIdList(organizeQueryCriteria).getBody();
+        List<Map<String, Object>> list = findUser((List<Long>) memberIdList, null);
         updateTaskOrganize.setUserList(list);
         return updateTaskOrganize;
     }
@@ -368,7 +362,7 @@ public class OrganizeServiceImpl implements OrganizeService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity<Object> saveMemberDistribution(OrganizeMemberDistributionDTO organizeMemberDistributionDTO) {
-        List<Long> userIds = organizeMemberDistributionDTO.getUserIds();
+        Set<Long> userIds = organizeMemberDistributionDTO.getUserIds();
         Long organizeId = organizeMemberDistributionDTO.getOrganizeId();
         Long taskId = organizeMemberDistributionDTO.getTaskId();
         // 查询所有的组员
@@ -415,8 +409,9 @@ public class OrganizeServiceImpl implements OrganizeService {
         // 判断角色，管理员只查组长角色的用户
         if (roleId != RoleNumberConstants.MINUS_EIGHT_NUMBER) {
             roles.add(RoleNumberConstants.MINUS_FIVE_NUMBER);
-        }
+        }else {
             roles.add(RoleNumberConstants.MINUS_NINE_NUMBER);
+        }
         //查询角色下所有用户
         List<UserDto> userDtoList = userService.findByManager(roles);
         //查询所有组员
@@ -438,6 +433,11 @@ public class OrganizeServiceImpl implements OrganizeService {
                 }
             }
         }
+        // 小组分配资源时，显示组长自己的信息，组长给自己分配资源
+        if (organizeQueryCriteria.getIsShowLeader() == 1){
+            UserDto leaderUser = userService.findById(SecurityUtils.getCurrentUserId());
+            userDtoList.add(leaderUser);
+        }
         return userDtoList;
     }
 

services/ad-platform-source/src/main/java/com/baiye/module/controller/ClueController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 @RequiredArgsConstructor
 @RestController
@@ -92,6 +93,12 @@ public class ClueController {
         return CommonResponse.createBySuccess();
     }
 
+    @ApiOperation("查询组员ID")
+    @PostMapping("/findMemberIdList")
+    public ResponseEntity<Set<Long>> findMemberIdList(@RequestBody ClueMiddle clueMiddle) {
+        return new ResponseEntity<>(clueService.findMemberIdList(clueMiddle), HttpStatus.OK);
+    }
+
     @ApiOperation("查询组员资源总数")
     @GetMapping("/queryMemberNum")
     public ResponseEntity<Object> queryMemberNum(@RequestParam("memberId") Long memberId) {

services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueMiddleRepository.java

@@ -93,4 +93,12 @@ public interface ClueMiddleRepository extends JpaRepository<ClueMiddle, Long>, J
      * @return
      */
     List<ClueMiddle> findByMemberId(Long memberId);
+
+    /**
+     * 查询组员
+     * @param taskId
+     * @param organizeId
+     * @return
+     */
+    List<ClueMiddle> findByTaskIdAndOrganizeId(Long taskId, Long organizeId);
 }

services/ad-platform-source/src/main/java/com/baiye/module/service/ClueService.java

@@ -13,6 +13,7 @@ import org.springframework.data.domain.Pageable;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public interface ClueService {
 
@@ -114,4 +115,12 @@ public interface ClueService {
      * @param replaceUserId
      */
     void updateMember(Long userId, Long replaceUserId);
+
+    /**
+     * 查询组员ID
+     *
+     * @param clueMiddle
+     * @return
+     */
+    Set<Long> findMemberIdList(ClueMiddle clueMiddle);
 }

services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java

@@ -26,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -107,7 +108,7 @@ public class ClueServiceImpl implements ClueService {
             clueMiddleList.stream().forEach(ct -> clueIds.add(ct.getClueId()));
             //小组内资源分配
             //Map<Long, List<Long>>：用户id -> 资源ID集合
-            List<Map<Long, List<Long>>> maps = AverageDataUtil.averageData(clueIds, clueQueryCriteria.getUserIds());
+            List<Map<Long, List<Long>>> maps = AverageDataUtil.averageData(clueIds, (List<Long>) clueQueryCriteria.getUserIds());
             //批量更新组员信息
             for (Map<Long, List<Long>> map : maps) {
                 for (Long userId : map.keySet()) {
@@ -235,4 +236,15 @@ public class ClueServiceImpl implements ClueService {
     public void updateMember(Long userId, Long replaceUserId) {
         clueMiddleRepository.updateMember(userId, replaceUserId);
     }
+
+    @Override
+    public Set<Long> findMemberIdList(ClueMiddle clueMiddle) {
+        if (clueMiddle.getTaskId() != null && clueMiddle.getOrganizeId() != null){
+            List<ClueMiddle> clueMiddleList = clueMiddleRepository.findByTaskIdAndOrganizeId(clueMiddle.getTaskId(), clueMiddle.getOrganizeId());
+            Map<Long, List<ClueMiddle>> collect = clueMiddleList.stream().collect(Collectors.groupingBy(ClueMiddle::getMemberId));
+            Set<Long> memberIdList = collect.keySet();
+            return memberIdList;
+        }
+        return null;
+    }
 }

services/ad-platform-source/src/main/resources/application-dev.yml

@@ -66,7 +66,6 @@ storage:
 #  symbol:/
   url: C:\Users\Admin\Desktop\
   de_symbol: \\
-  se_symbol: \
   download-template: /usr/local/webapp/ad-platform/ad-platform-source/custom.xlsx
 
 # 线程池配置

services/ad-platform-source/src/main/resources/application-prod.yml

@@ -4,6 +4,12 @@ spring:
     nacos:
       discovery:
         server-addr: ${NACOS_HOST:118.178.137.129}:${NACOS_PORT:8848}
+
+  redis:
+    database: 2
+    host: 118.178.137.129
+    timeout: 5000
+
   datasource:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource