feature(消息实体类修改): 消息实体类修改

消息实体类修改

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/audit/service/LogSendService.java

@@ -6,10 +6,14 @@ import com.dragoninfo.dcuc.auth.audit.dto.AuthenticationLogDto;
 import com.dragoninfo.dcuc.auth.audit.dto.AuthorizeLogDto;
 import com.dragoninfo.dcuc.auth.config.DcucAuthKafkaConfig;
 import com.dragoninfo.duceap.commons.util.kafka.KafkaServer;
-import com.dragoninfo.mq.client.model.entity.MessageInfoVo;
-import com.dragoninfo.mq.client.model.entity.RequestVo;
+import com.dragonsoft.duceap.base.entity.security.BaseSecurityUser;
+import com.dragonsoft.duceap.base.entity.security.SecurityUser;
 import com.dragonsoft.duceap.base.utils.UserContextUtils;
+import com.dragonsoft.duceap.commons.util.date.DateConst;
+import com.dragonsoft.duceap.commons.util.date.DateUtils;
 import com.dragonsoft.duceap.core.entity.response.ResponseResult;
+import com.dragonsoft.mq.client.model.vo.MessageInfoReqVo;
+import com.dragonsoft.mq.client.model.vo.MessageInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -39,12 +43,13 @@ public class LogSendService {
     public void sendAuthorizeLog(AuthorizeLogDto log) {
         String title = "推送授权日志";
         String content = "推送授权日志";
-        MessageInfoVo messages = new MessageInfoVo(UserContextUtils.getCurrentUser(), title, content, auditConfig.getAuthorizeTopic());
+        SecurityUser securityUser = (SecurityUser) UserContextUtils.getCurrentUser();
+        MessageInfoVo messages = getMessageVo(securityUser, title, content, auditConfig.getAuthorizeTopic());
         messages.setContent(JSON.toJSONString(log));
         List<MessageInfoVo> msg = new ArrayList<>();
         msg.add(messages);
 
-        RequestVo requestVo = new RequestVo();
+        MessageInfoReqVo requestVo = new MessageInfoReqVo();
         requestVo.setTopic(auditConfig.getAuthorizeTopic());
         requestVo.setAppKey(dcucAuthKafkaConfig.getAppkey());
         requestVo.setAppSecret(dcucAuthKafkaConfig.getAppSecret());
@@ -58,12 +63,13 @@ public class LogSendService {
     public void sendAuthenticationLog(AuthenticationLogDto log) {
         String title = "推送鉴权日志";
         String content = "推送鉴权日志";
-        MessageInfoVo messages = new MessageInfoVo(UserContextUtils.getCurrentUser(), title, content, auditConfig.getAuthenticationTopic());
+        SecurityUser securityUser = (SecurityUser) UserContextUtils.getCurrentUser();
+        MessageInfoVo messages = getMessageVo(securityUser, title, content, auditConfig.getAuthenticationTopic());
         messages.setContent(JSON.toJSONString(log));
         List<MessageInfoVo> msg = new ArrayList<>();
         msg.add(messages);
 
-        RequestVo requestVo = new RequestVo();
+        MessageInfoReqVo requestVo = new MessageInfoReqVo();
         requestVo.setTopic(auditConfig.getAuthenticationTopic());
         requestVo.setAppKey(dcucAuthKafkaConfig.getAppkey());
         requestVo.setAppSecret(dcucAuthKafkaConfig.getAppSecret());
@@ -71,4 +77,29 @@ public class LogSendService {
         ResponseResult result = kafkaServer.send(requestVo, dcucAuthKafkaConfig.getKafkaServers());
     }
 
+
+    private MessageInfoVo getMessageVo(SecurityUser securityUser, String title, String content, String topic) {
+        MessageInfoVo messageInfoVo = new MessageInfoVo();
+        if (securityUser == null) {
+            messageInfoVo.setUserCode("dcuc");
+            messageInfoVo.setUserName("用户中心");
+        } else {
+            //账号名称
+            messageInfoVo.setUserCode(securityUser.getUserName());
+            //用户名
+            messageInfoVo.setUserName(securityUser.getName());
+            messageInfoVo.setUserPoliceNo(securityUser.getPoliceNo());
+            messageInfoVo.setUserDeptId(securityUser.getSecurityOrg());
+        }
+        messageInfoVo.setUserSystemCode("dcuc");
+        messageInfoVo.setUserSystem("usercenter");
+        //消息类型,与消息主题一致
+        messageInfoVo.setInfoType(topic);
+        messageInfoVo.setTitle(title);
+        messageInfoVo.setContent(content);
+        messageInfoVo.setCreateTime(DateUtils.getCurrTime(DateConst.DB_STORE_TIME));
+        return messageInfoVo;
+    }
+
+
 }

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/async/subscribe/ApprovalSendMessage.java

@@ -4,11 +4,13 @@ import com.dragoninfo.dcuc.auth.auth.entity.FuncApproval;
 import com.dragoninfo.dcuc.auth.auth.enumresources.MessageTypeEnum;
 import com.dragoninfo.dcuc.auth.config.DcucAuthKafkaConfig;
 import com.dragoninfo.duceap.commons.util.kafka.KafkaServer;
-import com.dragoninfo.mq.client.model.entity.MessageInfoVo;
-import com.dragoninfo.mq.client.model.entity.RequestVo;
 import com.dragonsoft.duceap.base.entity.security.SecurityUser;
+import com.dragonsoft.duceap.commons.util.date.DateConst;
+import com.dragonsoft.duceap.commons.util.date.DateUtils;
 import com.dragonsoft.duceap.commons.util.enums.EnumUtils;
 import com.dragonsoft.duceap.core.entity.response.ResponseResult;
+import com.dragonsoft.mq.client.model.vo.MessageInfoReqVo;
+import com.dragonsoft.mq.client.model.vo.MessageInfoVo;
 import com.google.common.eventbus.Subscribe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,12 +47,13 @@ public class ApprovalSendMessage {
             //消息自定义内容key-value
             List<Map<String, String>> infoSetList = infoSetVal(approval);
             //构造消息
-            MessageInfoVo messages = new MessageInfoVo(securityUser, "动态授权审批结果", messageTypeEnum.getLabel(), topic);
+            MessageInfoVo messages = getMessageVo(securityUser, "动态授权审批结果", messageTypeEnum.getLabel(), topic);
+
             messages.setInfoSet(infoSetList);
             List<MessageInfoVo> msg = new ArrayList<>();
             msg.add(messages);
             //构造发送请求参数体
-            RequestVo requestVo = new RequestVo();
+            MessageInfoReqVo requestVo = new MessageInfoReqVo();
             requestVo.setTopic(topic);
             requestVo.setAppKey(dcucAuthKafkaConfig.getAppkey());
             requestVo.setAppSecret(dcucAuthKafkaConfig.getAppSecret());
@@ -64,6 +67,29 @@ public class ApprovalSendMessage {
 
     }
 
+    private MessageInfoVo getMessageVo(SecurityUser securityUser, String title, String content, String topic) {
+        MessageInfoVo messageInfoVo = new MessageInfoVo();
+        if (securityUser == null) {
+            messageInfoVo.setUserCode("dcuc");
+            messageInfoVo.setUserName("用户中心");
+            } else {
+                //账号名称
+            messageInfoVo.setUserCode(securityUser.getUserName());
+                //用户名
+            messageInfoVo.setUserName(securityUser.getName());
+            messageInfoVo.setUserPoliceNo(securityUser.getPoliceNo());
+            messageInfoVo.setUserDeptId(securityUser.getSecurityOrg());
+            }
+        messageInfoVo.setUserSystemCode("dcuc");
+        messageInfoVo.setUserSystem("usercenter");
+            //消息类型,与消息主题一致
+        messageInfoVo.setInfoType(topic);
+        messageInfoVo.setTitle(title);
+        messageInfoVo.setContent(content);
+        messageInfoVo.setCreateTime(DateUtils.getCurrTime(DateConst.DB_STORE_TIME));
+        return messageInfoVo;
+    }
+
     private List<Map<String, String>> infoSetVal(FuncApproval approval) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
         List<Map<String, String>> mapList = new ArrayList<>();

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/async/subscribe/StaffAssignAuthSendMessage.java

@@ -13,12 +13,14 @@ import com.dragoninfo.dcuc.auth.config.DcucAuthKafkaConfig;
 import com.dragoninfo.dcuc.user.user.entity.UserInfo;
 import com.dragoninfo.dcuc.user.user.facade.IUserInfoFacade;
 import com.dragoninfo.duceap.commons.util.kafka.KafkaServer;
-import com.dragoninfo.mq.client.model.entity.MessageInfoVo;
-import com.dragoninfo.mq.client.model.entity.RequestVo;
 import com.dragonsoft.duceap.base.entity.security.SecurityUser;
 import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
+import com.dragonsoft.duceap.commons.util.date.DateConst;
+import com.dragonsoft.duceap.commons.util.date.DateUtils;
 import com.dragonsoft.duceap.commons.util.string.StringUtils;
 import com.dragonsoft.duceap.core.entity.response.ResponseResult;
+import com.dragonsoft.mq.client.model.vo.MessageInfoReqVo;
+import com.dragonsoft.mq.client.model.vo.MessageInfoVo;
 import com.google.common.eventbus.Subscribe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -64,12 +66,12 @@ public class StaffAssignAuthSendMessage {
             //消息自定义内容key-value
             List<Map<String, String>> infoSetList = infoSetVal(staffObjList, appId);
             //构造消息
-            MessageInfoVo messages = new MessageInfoVo(securityUser, "角色授权变更", MessageTypeEnum.JSSQBG.getLabel(), topic);
+            MessageInfoVo messages = getMessageVo(securityUser, "角色授权变更", MessageTypeEnum.JSSQBG.getLabel(), topic);
             messages.setInfoSet(infoSetList);
             List<MessageInfoVo> msg = new ArrayList<>();
             msg.add(messages);
             //构造发送请求参数体
-            RequestVo requestVo = new RequestVo();
+            MessageInfoReqVo requestVo = new MessageInfoReqVo();
             requestVo.setTopic(topic);
             requestVo.setAppKey(dcucAuthKafkaConfig.getAppkey());
             requestVo.setAppSecret(dcucAuthKafkaConfig.getAppSecret());
@@ -122,5 +124,29 @@ public class StaffAssignAuthSendMessage {
         return infoSetList;
     }
 
+    private MessageInfoVo getMessageVo(SecurityUser securityUser, String title, String content, String topic) {
+        MessageInfoVo messageInfoVo = new MessageInfoVo();
+        if (securityUser == null) {
+            messageInfoVo.setUserCode("dcuc");
+            messageInfoVo.setUserName("用户中心");
+        } else {
+            //账号名称
+            messageInfoVo.setUserCode(securityUser.getUserName());
+            //用户名
+            messageInfoVo.setUserName(securityUser.getName());
+            messageInfoVo.setUserPoliceNo(securityUser.getPoliceNo());
+            messageInfoVo.setUserDeptId(securityUser.getSecurityOrg());
+        }
+        messageInfoVo.setUserSystemCode("dcuc");
+        messageInfoVo.setUserSystem("usercenter");
+        //消息类型,与消息主题一致
+        messageInfoVo.setInfoType(topic);
+        messageInfoVo.setTitle(title);
+        messageInfoVo.setContent(content);
+        messageInfoVo.setCreateTime(DateUtils.getCurrTime(DateConst.DB_STORE_TIME));
+        return messageInfoVo;
+    }
+
+
 
 }