浏览代码

feat(message): message发布

huey 2 年之前
父节点
当前提交
ef8cc52d95

+ 2 - 0
src/main/java/com/dragon/tj/portal/entity/MessageInfo.java

@@ -60,11 +60,13 @@ public class MessageInfo implements Serializable {
      * 创建人
      */
     private String createBy;
+    private String createUser;
 
     /**
      * 修改人
      */
     private String updateBy;
+    private String updateUser;
 
     /**
      * 创建时间

+ 8 - 6
src/main/java/com/dragon/tj/portal/service/impl/MessageInfoServiceImpl.java

@@ -53,7 +53,7 @@ public class MessageInfoServiceImpl extends ServiceImpl<MessageInfoMapper, Messa
 
     @Override
     public R push(MessageInfoReq messageInfoReq, LoginUser loginUser) {
-        return R.ok(this.doMessage(messageInfoReq));
+        return R.ok(this.doMessage(messageInfoReq,loginUser));
     }
 
     /**
@@ -61,10 +61,10 @@ public class MessageInfoServiceImpl extends ServiceImpl<MessageInfoMapper, Messa
      * @Description : 预先处理 TODO message 没走字典
      * @Date Created in 2023/6/16 11:25
      */
-    private boolean doMessage(MessageInfoReq messageInfoReq) {
+    private boolean doMessage(MessageInfoReq messageInfoReq, LoginUser loginUser) {
 
         this.validate(messageInfoReq);
-        return this.transferIds(messageInfoReq);
+        return this.transferIds(messageInfoReq,loginUser);
     }
 
     /**
@@ -72,7 +72,7 @@ public class MessageInfoServiceImpl extends ServiceImpl<MessageInfoMapper, Messa
      * @Description :
      * @Date Created in 2023/6/16 11:44
      */
-    private boolean transferIds(MessageInfoReq messageInfoReq) {
+    private boolean transferIds(MessageInfoReq messageInfoReq, LoginUser loginUser) {
         // 120101510000 120000450200
         //120222197001010001 120222197001010002
         boolean isSend = false;
@@ -81,13 +81,13 @@ public class MessageInfoServiceImpl extends ServiceImpl<MessageInfoMapper, Messa
         Set<String> messageClientIds = this.getMessageClientIds(messageType, scopeIds);
 
         if (CollUtil.isNotEmpty(messageClientIds)) {
-            MessageInfoSend messageInfoSend = this.doSaveMessageInfo(messageInfoReq, messageClientIds);
+            MessageInfoSend messageInfoSend = this.doSaveMessageInfo(messageInfoReq, messageClientIds,loginUser);
             isSend = producer.send(KafkaInitialConfiguration.sseTopic, JSON.toJSONString(messageInfoSend));
         }
         return isSend;
     }
 
-    private MessageInfoSend doSaveMessageInfo(MessageInfoReq messageInfoReq, Set<String> messageClientIds) {
+    private MessageInfoSend doSaveMessageInfo(MessageInfoReq messageInfoReq, Set<String> messageClientIds, LoginUser loginUser) {
         Integer messageType = messageInfoReq.getMessageType();
         ScopeEnums scopeEnums = ScopeEnums.ofMessageType(messageType);
         List<MessageInfoScope> insertList = Lists.newArrayList();
@@ -103,6 +103,8 @@ public class MessageInfoServiceImpl extends ServiceImpl<MessageInfoMapper, Messa
         });
 
         MessageInfo messageInfo = messageReqConvert.reqToInfo(messageInfoReq);
+        messageInfo.setCreateBy(loginUser.getIdCard());
+        messageInfo.setCreateUser(loginUser.getUsername());
         // 存储
         boolean isSaveBatchSuccess = false;
         try {