不用加之前的日志

epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/AuthOperationLogListener.java

@@ -78,8 +78,6 @@ public class AuthOperationLogListener implements MessageListenerConcurrently {
         logEntity.setOperatorMobile(operatorInfo.getMobile());
         logEntity.setOperatingTime(msgObj.getLoginTime());
         logEntity.setContent("成功登录系统");
-        logEntity.setOrgIdPath(msgObj.getOrgIdPath());
-        logEntity.setOrgId(msgObj.getOrgId());
 
         DistributedLock distributedLock = null;
         RLock lock = null;

epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/PointOperationLogListener.java

@@ -80,8 +80,6 @@ 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;

epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java

@@ -82,7 +82,7 @@ public class IcLoginServiceImpl implements IcLoginService, ResultDataResolver {
 
         //7.发送登录事件
         try {
-            sendLoginEvent(staffId, app, client,agencyInfo.getCustomerId());
+            sendLoginEvent(staffId, app, client);
         } catch (RenException e) {
             log.error(e.getInternalMsg());
         } catch (Exception e) {
@@ -117,20 +117,14 @@ public class IcLoginServiceImpl implements IcLoginService, ResultDataResolver {
      * @author wxz
      * @date 2021.10.26 13:45:59
      */
-    private void sendLoginEvent(String userId, String fromApp, String fromClient, String customerId) {
+    private void sendLoginEvent(String userId, String fromApp, String fromClient) {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId);
-        if (null == staffInfo){
-            throw new EpmetException("未查询到工作人员信息："+userId);
-        }
         LoginMQMsg loginMQMsg = new LoginMQMsg();
         loginMQMsg.setUserId(userId);
         loginMQMsg.setLoginTime(new Date());
         loginMQMsg.setIp(IpUtils.getIpAddr(request));
         loginMQMsg.setFromApp(fromApp);
         loginMQMsg.setFromClient(fromClient);
-        loginMQMsg.setOrgId(staffInfo.getAgencyId());
-        loginMQMsg.setOrgIdPath(StringUtils.isBlank(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyId() : staffInfo.getAgencyPIds().concat(":").concat(staffInfo.getAgencyId()));
         SystemMsgFormDTO form = new SystemMsgFormDTO();
         form.setMessageType(AuthOperationConstants.LOGIN);
         form.setContent(loginMQMsg);

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -210,7 +210,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
 
         //7.发送登录事件
         try {
-            sendLoginEvent(staffLatestAgencyResultDTO.getStaffId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP,userWechatDTO.getCustomerId());
+            sendLoginEvent(staffLatestAgencyResultDTO.getStaffId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP);
         } catch (RenException e) {
             log.error(e.getInternalMsg());
         } catch (Exception e) {
@@ -441,7 +441,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
 
         //6.发送登录事件
         try {
-            sendLoginEvent(customerStaff.getUserId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP, formDTO.getCustomerId());
+            sendLoginEvent(customerStaff.getUserId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP);
         } catch (RenException e) {
             log.error(e.getInternalMsg());
         } catch (Exception e) {
@@ -503,7 +503,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
 
         //6.发送登录事件
         try {
-            sendLoginEvent(customerStaff.getUserId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP, formDTO.getCustomerId());
+            sendLoginEvent(customerStaff.getUserId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP);
         } catch (RenException e) {
             log.error(e.getInternalMsg());
         } catch (Exception e) {
@@ -822,7 +822,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
      * @author wxz
      * @date 2021.06.08 15:27
     */
-    private void sendLoginEvent(String userId, String appId, String fromApp, String fromClient,String customerId) {
+    private void sendLoginEvent(String userId, String appId, String fromApp, String fromClient) {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
 
         LoginMQMsg loginMQMsg = new LoginMQMsg();
@@ -832,12 +832,6 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         loginMQMsg.setIp(IpUtils.getIpAddr(request));
         loginMQMsg.setFromApp(fromApp);
         loginMQMsg.setFromClient(fromClient);
-        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId);
-        if (null == staffInfo){
-            throw new EpmetException("未查询到工作人员信息："+userId);
-        }
-        loginMQMsg.setOrgId(staffInfo.getAgencyId());
-        loginMQMsg.setOrgIdPath(StringUtils.isBlank(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyId() : staffInfo.getAgencyPIds().concat(":").concat(staffInfo.getAgencyId()));
         SystemMsgFormDTO form = new SystemMsgFormDTO();
         form.setMessageType(AuthOperationConstants.LOGIN);
         form.setContent(loginMQMsg);

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/LoginMQMsg.java

@@ -22,7 +22,5 @@ public class LoginMQMsg {
     private String fromApp;
 
     private String fromClient;
-    private String orgId;
-    private String orgIdPath;
 
 }

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PointRuleChangedMQMsg.java

@@ -28,8 +28,6 @@ public class PointRuleChangedMQMsg {
     private String fromApp;
 
     private String fromClient;
-    private String orgId;
-    private String orgIdPath;
 
     private Date operatingTime;
 }

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java

@@ -36,8 +36,5 @@ public class ProjectChangedMQMsg implements Serializable {
     private String fromApp;
     private String fromClient;
 
-    private String orgId;
-    private String orgIdPath;
-
 
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java

@@ -209,12 +209,6 @@ 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);
 		}
 	}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java

@@ -52,7 +52,5 @@ public class TransferFormDTO implements Serializable {
      */
     private String assistanceUnitType;
 
-    private String operateStaffId;
-    private String customerId;
 }