Merge remote-tracking branch 'origin/master'

src/main/java/com/project/interaction/config/WebClientConfig.java

@@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit;
 
 @Configuration
 public class WebClientConfig {
-    @Value("${algo.baseUrl:''}")
+    @Value("http://172.16.204.50:8002")
     private String baseUrl;
 
     @Bean(name = "algorithmWebClient")

src/main/java/com/project/interaction/domain/service/impl/PostToClusteringDomainServiceImpl.java

@@ -19,7 +19,7 @@ public class PostToClusteringDomainServiceImpl implements PostToClusteringDomain
     @Resource(name = "algorithmWebClient")
     private WebClient algorithmWebClient;
 
-    @Value("${algo.clusterUrl:/api/algorithm/v1/cluster}")
+    @Value("${algo.clusterUrl:/semantic-cluster}")
     private String clusterUrl;
 
 

src/main/java/com/project/task/domain/dto/TaskDTO.java

@@ -2,6 +2,7 @@ package com.project.task.domain.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.project.base.domain.dto.BaseDTO;
+import com.project.ding.domain.dto.UserDTO;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -54,6 +55,6 @@ public class TaskDTO extends BaseDTO {
     private String examResultText;
 
     private Long businessId;
-
+    private List<UserDTO> participantUserDTOList;
 
 }

src/main/java/com/project/task/domain/dto/TaskUserDTO.java

@@ -1,7 +1,6 @@
 package com.project.task.domain.dto;
 
 import com.project.base.domain.dto.BaseDTO;
-import com.project.task.domain.enums.TaskUserStatusEnum;
 import lombok.Data;
 
 @Data
@@ -9,6 +8,7 @@ public class TaskUserDTO extends BaseDTO {
     private Long id;
     private Long taskId;
     private String userId;
+    private String userName;
     private Integer status;
     private Long lastRecordId;
     private Integer attemptNum = 0;

src/main/java/com/project/task/domain/entity/TaskUserEntity.java

@@ -29,6 +29,10 @@ public class TaskUserEntity extends BaseEntity {
     @Column(name = "user_id" , columnDefinition="varchar(255) comment '用户id'")
     private String userId;
 
+    @TableField("user_name")
+    @Column(name = "user_name" , columnDefinition="varchar(255) comment '用户名称'")
+    private String userName;
+
     @Column(name = "status")
     @Comment("考试状态：0-未考, 1-不通过, 2-已通过")
     private Integer status = TaskUserStatusEnum.Not_Start.getValue();

src/main/java/com/project/task/domain/service/impl/SaveOrUpdateTaskDomainServiceImpl.java

@@ -8,6 +8,8 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.project.base.domain.exception.BusinessErrorException;
 import com.project.base.domain.result.Result;
+import com.project.ding.domain.entity.UserEntity;
+import com.project.ding.domain.service.UserBaseService;
 import com.project.information.domain.entity.ProductLineEntity;
 import com.project.information.domain.service.ProductLineBaseService;
 import com.project.task.config.ExamScoreRatioConfig;
@@ -23,7 +25,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Service
 public class SaveOrUpdateTaskDomainServiceImpl implements SaveOrUpdateTaskDomainService {
@@ -40,6 +44,9 @@ public class SaveOrUpdateTaskDomainServiceImpl implements SaveOrUpdateTaskDomain
     @Autowired
     private TaskBaseService taskBaseService;
 
+    @Autowired
+    private UserBaseService userBaseService;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -84,10 +91,16 @@ public class SaveOrUpdateTaskDomainServiceImpl implements SaveOrUpdateTaskDomain
                 .eq(TaskUserEntity::getTaskId , saveEntity.getId()));
 
         List<TaskUserEntity> taskUserEntityList = new ArrayList<>();
+        Map<String, String> userMap = userBaseService.lambdaQuery().select(UserEntity::getId, UserEntity::getName)
+                .in(UserEntity::getId, dto.getParticipantUserIdList()).list()
+                .stream()
+                .collect(Collectors.toMap(UserEntity::getId, UserEntity::getName));
+
         for (String userId : dto.getParticipantUserIdList()) {
             TaskUserEntity taskUserEntity = new TaskUserEntity();
             taskUserEntity.setTaskId(saveEntity.getId());
             taskUserEntity.setUserId(userId);
+            taskUserEntity.setUserName(userMap.get(userId));
             taskUserEntityList.add(taskUserEntity);
         }
         taskUserBaseService.saveBatch(taskUserEntityList);

src/main/java/com/project/task/domain/service/impl/SearchTaskDomainServiceImpl.java

@@ -7,11 +7,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.project.base.domain.result.PageResult;
 import com.project.base.domain.result.Result;
 import com.project.base.domain.utils.PageConverter;
+import com.project.ding.domain.dto.UserDTO;
 import com.project.task.domain.dto.TaskDTO;
 import com.project.task.domain.entity.TaskEntity;
+import com.project.task.domain.entity.TaskUserEntity;
 import com.project.task.domain.enums.TaskStatusEnum;
 import com.project.task.domain.param.TaskParam;
 import com.project.task.domain.service.SearchTaskDomainService;
+import com.project.task.domain.service.TaskUserBaseService;
 import com.project.task.mapper.TaskMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,6 +29,8 @@ public class SearchTaskDomainServiceImpl implements SearchTaskDomainService {
 
     @Autowired
     private TaskMapper taskMapper;
+    @Autowired
+    private TaskUserBaseService taskUserBaseService;
     @Override
     public Result<PageResult<TaskDTO>> search(TaskParam param) throws Exception {
         LambdaQueryWrapper<TaskEntity> queryWrapper = new LambdaQueryWrapper<>();
@@ -56,6 +61,15 @@ public class SearchTaskDomainServiceImpl implements SearchTaskDomainService {
         } else {
             dto.setStatusText(TaskStatusEnum.Cut_Off.getValue());
         }
+        // 构造参与用户
+        List<UserDTO> participantUserDTOList = taskUserBaseService.lambdaQuery().select(TaskUserEntity::getUserId, TaskUserEntity::getUserName)
+                .list().stream().map(taskUserEntity -> {
+                    UserDTO userDTO = new UserDTO();
+                    userDTO.setId(taskUserEntity.getUserId());
+                    userDTO.setName(taskUserEntity.getUserName());
+                    return userDTO;
+                }).toList();
+        dto.setParticipantUserDTOList(participantUserDTOList);
         return dto;
     }