From 5d4b981c4752af7c5a86afbe22c39c1353222c75 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 20 Oct 2022 15:48:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=A7=84=E5=88=99=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mq/listener/listener/PointOperationLogListener.java  | 2 ++
 .../commons/rocketmq/messages/PointRuleChangedMQMsg.java | 2 ++
 .../commons/rocketmq/messages/ProjectChangedMQMsg.java   | 3 +++
 .../com/epmet/service/impl/PointRuleServiceImpl.java     | 9 +++++++++
 4 files changed, 16 insertions(+)

diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/PointOperationLogListener.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/PointOperationLogListener.java
index aa4f50a768..e20f4eecb1 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/PointOperationLogListener.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/PointOperationLogListener.java
@@ -80,6 +80,8 @@ public class PointOperationLogListener implements MessageListenerConcurrently {
         logEntity.setOperatorName(operatorInfo.getName());
         logEntity.setOperatingTime(msgObj.getOperatingTime());
         logEntity.setContent(content);
+        logEntity.setOrgId(msgObj.getOrgId());
+        logEntity.setOrgIdPath(msgObj.getOrgIdPath());
 
         DistributedLock distributedLock = null;
         RLock lock = null;
diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PointRuleChangedMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PointRuleChangedMQMsg.java
index 073d18821c..f3d2516276 100644
--- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PointRuleChangedMQMsg.java
+++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PointRuleChangedMQMsg.java
@@ -28,6 +28,8 @@ public class PointRuleChangedMQMsg {
     private String fromApp;
 
     private String fromClient;
+    private String orgId;
+    private String orgIdPath;
 
     private Date operatingTime;
 }
diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java
index 5f33faae98..8e5f60f31c 100644
--- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java
+++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java
@@ -36,5 +36,8 @@ public class ProjectChangedMQMsg implements Serializable {
     private String fromApp;
     private String fromClient;
 
+    private String orgId;
+    private String orgIdPath;
+
 
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
index 251046a50f..358dfd5e92 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
@@ -26,11 +26,14 @@ import com.epmet.commons.rocketmq.messages.PointRuleChangedMQMsg;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.CommonOperateTypeEnum;
 import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -206,6 +209,12 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 			msg.setOperationBrief(messages);
 			msg.setOperatorId(loginUserUtil.getLoginUserId());
 			msg.setRuleId(formDTO.getRuleId());
+			CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDTO.getCustomerId(), tokenDTO.getUserId());
+			if (null == staffInfo){
+				throw new EpmetException("未查询到工作人员信息："+tokenDTO.getUserId());
+			}
+			msg.setOrgId(staffInfo.getAgencyId());
+			msg.setOrgIdPath(StringUtils.isBlank(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyId() : staffInfo.getAgencyPIds().concat(":").concat(staffInfo.getAgencyId()));
 			SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendPointRuleChangedMqMsg(msg);
 		}
 	}