Skip to content

Commit

Permalink
fix(项目管理): 修复保存消息不正确的接口
Browse files Browse the repository at this point in the history
  • Loading branch information
@xiaomeinvG @fit2-zhao
xiaomeinvG authored and fit2-zhao committed Feb 6, 2024
1 parent def0db3 commit 1ad018b
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 19 deletions.
11 changes: 11 additions & 0 deletions .../project-management/src/main/java/io/metersphere/project/mapper/ExtMessageTaskMapper.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package io.metersphere.project.mapper;

import io.metersphere.project.domain.MessageTask;
import org.apache.ibatis.annotations.Param;

import java.util.List;

public interface ExtMessageTaskMapper {

List<MessageTask> getRobotType(@Param("projectId") String projectId, @Param("taskType") String taskType, @Param("event") String event);
}
10 changes: 10 additions & 0 deletions ...s/project-management/src/main/java/io/metersphere/project/mapper/ExtMessageTaskMapper.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?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="io.metersphere.project.mapper.ExtMessageTaskMapper">


<select id="getRobotType" resultType="io.metersphere.project.domain.MessageTask">
select * from message_task where project_id = #{projectId}
and task_type = #{taskType} and event = #{event} and enable = true group by project_robot_id
</select>
</mapper>
68 changes: 50 additions & 18 deletions ...ect-management/src/main/java/io/metersphere/project/service/NoticeMessageTaskService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import io.metersphere.system.uid.IDGenerator;
import jakarta.annotation.Resource;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.session.ExecutorType;
import org.apache.ibatis.session.SqlSession;
Expand Down Expand Up @@ -57,6 +58,8 @@ public class NoticeMessageTaskService {
private ExtProjectUserRoleMapper extProjectUserRoleMapper;
@Resource
protected CustomFieldMapper customFieldMapper;
@Resource
protected ExtMessageTaskMapper extMessageTaskMapper;


public static final String USER_IDS = "user_ids";
Expand All @@ -74,15 +77,14 @@ public ResultHolder saveMessageTask(MessageTaskRequest messageTaskRequest, Strin
//检查用户是否存在
Map<String, List<String>> stringListMap = checkUserExistProject(messageTaskRequest.getReceiverIds(), projectId);
List<String> existUserIds = stringListMap.get(USER_IDS);

List<MessageTask> robotType = extMessageTaskMapper.getRobotType(projectId, messageTaskRequest.getTaskType(), messageTaskRequest.event);
Map<String, List<MessageTask>> robotEnasleMap = robotType.stream().collect(Collectors.groupingBy(MessageTask::getProjectRobotId));
//检查设置的通知是否存在，如果存在则更新
List<MessageTask> messageTasks = updateMessageTasks(messageTaskRequest, userId, mapper, blobMapper, existUserIds);
//保存消息任务
Map<String, List<MessageTask>> robotMap = messageTasks.stream().collect(Collectors.groupingBy(MessageTask::getProjectRobotId));
//如果新增时只选了用户，没有选机器人，默认机器人为站内信
ProjectRobot projectRobot = getDefaultRobot(messageTaskRequest.getProjectId(), messageTaskRequest.getRobotId());
String robotId = projectRobot.getId();
messageTaskRequest.setRobotId(robotId);
insertMessageTask(messageTaskRequest, userId, mapper, blobMapper, existUserIds, robotMap);
//保存消息任务
insertMessageTask(messageTaskRequest, userId, mapper, blobMapper, existUserIds, robotMap, robotEnasleMap);
sqlSession.flushStatements();
SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
if (CollectionUtils.isNotEmpty(stringListMap.get(NO_USER_NAMES))) {
Expand Down Expand Up @@ -111,14 +113,45 @@ private void deleteUserData(MessageTaskRequest messageTaskRequest, String projec
/**
* 新增MessageTask
*
* @param messageTaskRequest 入参
* @param userId 当前用户i的
* @param mapper MessageTaskMapper
* @param blobMapper MessageTaskBlobMapper
* @param existUserIds 系统中还存在的入参传过来的接收人
* @param robotMap 更新过后机器人消息通知map
* @param messageTaskRequest 入参
* @param userId 当前用户i的
* @param mapper MessageTaskMapper
* @param blobMapper MessageTaskBlobMapper
* @param existUserIds 系统中还存在的入参传过来的接收人
* @param robotMap 更新过后机器人消息通知map
* @param robotEnableMap 数据库里已开起的机器人
*/
private void insertMessageTask(MessageTaskRequest messageTaskRequest, String userId, MessageTaskMapper mapper, MessageTaskBlobMapper blobMapper, List<String> existUserIds, Map<String, List<MessageTask>> robotMap) {
private void insertMessageTask(MessageTaskRequest messageTaskRequest, String userId, MessageTaskMapper mapper, MessageTaskBlobMapper blobMapper, List<String> existUserIds, Map<String, List<MessageTask>> robotMap, Map<String, List<MessageTask>> robotEnableMap) {
if (MapUtils.isEmpty(robotEnableMap) || StringUtils.isNotBlank(messageTaskRequest.getRobotId())) {
//如果新增时只选了用户，没有选机器人，默认机器人为站内信
ProjectRobot projectRobot = getDefaultRobot(messageTaskRequest.getProjectId(), messageTaskRequest.getRobotId());
String robotId = projectRobot.getId();
boolean enable = getEnable(robotMap, robotId);
messageTaskRequest.setRobotId(robotId);
if (messageTaskRequest.getEnable() == null) {
messageTaskRequest.setEnable(enable);
}
setUserMessageTaskInfo(messageTaskRequest, userId, mapper, blobMapper, existUserIds, robotMap);
} else {
robotEnableMap.forEach((robotId, v) -> {
boolean enable = getEnable(robotMap, robotId);
messageTaskRequest.setRobotId(robotId);
messageTaskRequest.setEnable(enable);
setUserMessageTaskInfo(messageTaskRequest, userId, mapper, blobMapper, existUserIds, robotMap);
});
}
}

private boolean getEnable(Map<String, List<MessageTask>> robotMap, String robotId) {
List<MessageTask> messageTasks = robotMap.get(robotId);
if (CollectionUtils.isEmpty(messageTasks)) {
return false;
} else {
return messageTasks.get(0).getEnable();
}
}

private static void setUserMessageTaskInfo(MessageTaskRequest messageTaskRequest, String userId, MessageTaskMapper mapper, MessageTaskBlobMapper blobMapper, List<String> existUserIds, Map<String, List<MessageTask>> robotMap) {
//判断是否需要完整的新增机器人数据
List<MessageTask> messageTasks = robotMap.get(messageTaskRequest.getRobotId());
for (String receiverId : existUserIds) {
Expand Down Expand Up @@ -322,7 +355,7 @@ public Map<String, String> getCustomFielddMap(String projectId) {
public List<MessageTaskDTO> getMessageList(String projectId) throws IOException {
//获取返回数据结构
StringBuilder jsonStr = new StringBuilder();
try{
try {
InputStream inputStream = getClass().getResourceAsStream("/message_task.json");
assert inputStream != null;
BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
Expand All @@ -332,7 +365,7 @@ public List<MessageTaskDTO> getMessageList(String projectId) throws IOException
}
reader.close();
inputStream.close();
} catch (IOException e){
} catch (IOException e) {
throw new RuntimeException(e);
}

Expand Down Expand Up @@ -383,8 +416,8 @@ public List<MessageTaskDTO> getMessageList(String projectId) throws IOException
messageTaskTypeDTO.setTaskTypeName(taskTypeMap.get(messageTaskTypeDTO.getTaskType()));
List<String> eventList = List.of(NoticeConstants.Event.CREATE, NoticeConstants.Event.UPDATE, NoticeConstants.Event.DELETE);
for (MessageTaskDetailDTO messageTaskDetailDTO : messageTaskTypeDTO.getMessageTaskDetailDTOList()) {
if (StringUtils.equalsIgnoreCase(messageTaskTypeDTO.getTaskType(),NoticeConstants.TaskType.API_DEFINITION_TASK) && eventList.contains(messageTaskDetailDTO.getEvent())) {
messageTaskDetailDTO.setEventName("API"+StringUtils.SPACE+eventMap.get(messageTaskDetailDTO.getEvent()));
if (StringUtils.equalsIgnoreCase(messageTaskTypeDTO.getTaskType(), NoticeConstants.TaskType.API_DEFINITION_TASK) && eventList.contains(messageTaskDetailDTO.getEvent())) {
messageTaskDetailDTO.setEventName("API" + StringUtils.SPACE + eventMap.get(messageTaskDetailDTO.getEvent()));
} else {
messageTaskDetailDTO.setEventName(eventMap.get(messageTaskDetailDTO.getEvent()));
}
Expand Down Expand Up @@ -489,7 +522,6 @@ public List<OptionDTO> getUserList(String projectId, String keyword) {
}



public MessageTemplateConfigDTO getTemplateDetail(String projectId, String taskType, String event, String robotId) {
MessageTaskExample messageTaskExample = new MessageTaskExample();
messageTaskExample.createCriteria().andProjectIdEqualTo(projectId).andTaskTypeEqualTo(taskType).andEventEqualTo(event);
Expand Down
2 changes: 1 addition & 1 deletion ...ent/src/test/java/io/metersphere/project/controller/NoticeMessageTaskControllerTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public void addMessageTaskCheckUserSuccess() throws Exception {
messageTaskExample = new MessageTaskExample();
messageTaskExample.createCriteria().andProjectIdEqualTo("project-message-test").andTaskTypeEqualTo(NoticeConstants.TaskType.API_DEFINITION_TASK).andEventEqualTo(NoticeConstants.Event.CREATE);
List<MessageTask> messageTasks = messageTaskMapper.selectByExample(messageTaskExample);
Assertions.assertEquals(2, messageTasks.size());
Assertions.assertEquals(1, messageTasks.size());
messageTaskExample = new MessageTaskExample();
messageTaskExample.createCriteria().andProjectIdEqualTo("project-message-test").andTaskTypeEqualTo(NoticeConstants.TaskType.API_DEFINITION_TASK).andEventEqualTo(NoticeConstants.Event.CREATE).andReceiverEqualTo("project-message-user-3");
messageTasks = messageTaskMapper.selectByExample(messageTaskExample);
Expand Down

0 comments on commit 1ad018b

Please sign in to comment.