diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/UserMessage.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/UserMessage.java
index 53d36e28..0473268e 100644
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/UserMessage.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/UserMessage.java
@@ -113,6 +113,12 @@ public class UserMessage implements Serializable {
@ApiModelProperty(value = "更新时间")
private Timestamp updateTime;
+
+ @Column(name = "create_user_id")
+ @ApiModelProperty(value = "创建者")
+ private Long createUserId;
+
+
public void copy(UserMessage source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
}
diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/FormUserController.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/FormUserController.java
index 00eb7a16..e8c4af63 100644
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/FormUserController.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/FormUserController.java
@@ -10,13 +10,11 @@ import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.ServletRequest;
import javax.validation.constraints.NotNull;
-import java.util.List;
import java.util.Map;
/**
diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/dto/UserMessageDto.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/dto/UserMessageDto.java
index f7a041d2..9866340b 100644
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/dto/UserMessageDto.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/dto/UserMessageDto.java
@@ -73,9 +73,15 @@ public class UserMessageDto implements Serializable {
/** 更新者 */
private String updateBy;
+ /** 更新者 */
+ private Long messageId;
+
/** 创建日期 */
private Timestamp createTime;
/** 更新时间 */
private Timestamp updateTime;
+
+ /** 创建人id */
+ private Long createUserId;
}
diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/MessageNotificationServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/MessageNotificationServiceImpl.java
index 699a955c..0c2bb4f0 100644
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/MessageNotificationServiceImpl.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/MessageNotificationServiceImpl.java
@@ -16,12 +16,11 @@
package com.baiye.modules.system.service.impl;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.json.JSONUtil;
import com.baiye.constant.DefaultNumberConstants;
import com.baiye.feign.SendMessageClient;
-import com.baiye.model.dto.ChangeMessageDTO;
+import com.baiye.model.dto.UserDto;
import com.baiye.model.entity.BaseTimeTask;
import com.baiye.modules.system.domain.MessageNotification;
import com.baiye.modules.system.repository.MessageNotificationRepository;
@@ -31,7 +30,6 @@ import com.baiye.modules.system.service.UserMessageService;
import com.baiye.modules.system.service.UserService;
import com.baiye.modules.system.service.dto.MessageNotificationDto;
import com.baiye.modules.system.service.dto.MessageNotificationQueryCriteria;
-import com.baiye.model.dto.UserDto;
import com.baiye.modules.system.service.mapstruct.MessageNotificationMapper;
import com.baiye.util.*;
import lombok.RequiredArgsConstructor;
diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java
index f07c2749..dcba0a15 100644
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java
@@ -59,6 +59,8 @@ public class OrganizeServiceImpl implements OrganizeService {
private final ExtensionNumberService extensionNumberService;
private final CompanyRepository companyRepository;
+ private final MessageNotificationRepository messageNotificationRepository;
+
/**
* 新增小组
*/
@@ -331,8 +333,10 @@ public class OrganizeServiceImpl implements OrganizeService {
MessageNotification messageNotification = new MessageNotification();
messageNotification.setMessageTitle("分配通知");
messageNotification.setMessageType(2);
+ messageNotification.setUserId(SecurityUtils.getCurrentUserId());
messageNotification.setMessageContext("接收到" + organizeSaveDTO.getOrganizeTaskName() + "任务分配");
- userMessageService.createUserMessage(userIdList, messageNotification, DefaultNumberConstants.TWO_NUMBER);
+ MessageNotification notification = messageNotificationRepository.save(messageNotification);
+ userMessageService.createUserMessage(userIdList, notification, DefaultNumberConstants.TWO_NUMBER);
return new ResponseEntity<>(CommonResponse.createBySuccess(ResponseCode.SUCCESS), HttpStatus.OK);
}
@@ -509,8 +513,10 @@ public class OrganizeServiceImpl implements OrganizeService {
MessageNotification messageNotification = new MessageNotification();
messageNotification.setMessageTitle("分配通知");
messageNotification.setMessageType(2);
+ messageNotification.setUserId(SecurityUtils.getCurrentUserId());
messageNotification.setMessageContext("接收到" + updateTaskOrganize.getOrganizeTaskName() + "任务分配");
- userMessageService.createUserMessage(userIdList, messageNotification, DefaultNumberConstants.TWO_NUMBER);
+ MessageNotification notification = messageNotificationRepository.save(messageNotification);
+ userMessageService.createUserMessage(userIdList, notification, DefaultNumberConstants.TWO_NUMBER);
return new ResponseEntity<>(CommonResponse.createBySuccess(ResponseCode.SUCCESS), HttpStatus.OK);
}
diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserMessageServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserMessageServiceImpl.java
index 46e32dcd..fd5afbe3 100644
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserMessageServiceImpl.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserMessageServiceImpl.java
@@ -22,6 +22,7 @@ import com.baiye.constant.DefaultNumberConstants;
import com.baiye.http.CommonResponse;
import com.baiye.modules.system.domain.MessageNotification;
import com.baiye.modules.system.domain.UserMessage;
+import com.baiye.modules.system.repository.MessageNotificationRepository;
import com.baiye.modules.system.repository.UserMessageRepository;
import com.baiye.modules.system.service.AutoReminderService;
import com.baiye.modules.system.service.UserMessageService;
@@ -55,8 +56,9 @@ import java.util.*;
@RequiredArgsConstructor
public class UserMessageServiceImpl implements UserMessageService {
- private final UserMessageRepository userMessageRepository;
+
+ private final UserMessageRepository userMessageRepository;
private final AutoReminderService autoReminderService;
private final UserMessageMapper userMessageMapper;
@@ -165,6 +167,7 @@ public class UserMessageServiceImpl implements UserMessageService {
userMessage.setLevel(messageNotification.getLevel());
userMessage.setMessageId(messageNotification.getId());
userMessage.setStatus(DefaultNumberConstants.ONE_NUMBER);
+ userMessage.setCreateUserId(messageNotification.getUserId());
userMessage.setMessageTitle(messageNotification.getMessageTitle());
userMessage.setMessageContext(messageNotification.getMessageContext());
userMessage.setMessageType(messageNotification.getMessageType());
diff --git a/manage/ad-platform-management/src/main/java/com/baiye/timed/SendMessageSync.java b/manage/ad-platform-management/src/main/java/com/baiye/timed/SendMessageSync.java
index 22bd3c18..35aca49e 100644
--- a/manage/ad-platform-management/src/main/java/com/baiye/timed/SendMessageSync.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/timed/SendMessageSync.java
@@ -69,6 +69,7 @@ public class SendMessageSync {
message.setUserId(userId);
message.setLevel(byId.getLevel());
message.setMessageId(byId.getId());
+ message.setCreateUserId(byId.getUserId());
message.setStatus(DefaultNumberConstants.ONE_NUMBER);
message.setMessageTitle(byId.getMessageTitle());
message.setMessageContext(byId.getMessageContext());
diff --git a/pom.xml b/pom.xml
index 86f17435..75458317 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
3.9.0
4.0.0
5.7.1
- 22.0
+ 23.0
5.23
0.11.1
5.1.1
@@ -45,7 +45,6 @@
3.2.0
1.16.18
1.6.2
- 1.6.2
2.2.1
1.7.2
3.11.1