修復

src/main/java/org/springblade/bank/keypwd/service/impl/KeyPwdServiceImpl.java

@@ -19,15 +19,14 @@ package org.springblade.bank.keypwd.service.impl;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 import org.springblade.bank.keypwd.entity.KeyPwd;
-import org.springblade.bank.keypwd.vo.KeyPwdVO;
 import org.springblade.bank.keypwd.mapper.KeyPwdMapper;
 import org.springblade.bank.keypwd.service.IKeyPwdService;
+import org.springblade.bank.keypwd.vo.KeyPwdVO;
 import org.springblade.bank.userlog.entity.UserLog;
 import org.springblade.bank.userlog.service.IUserLogService;
-import org.springblade.core.datascope.annotation.DataAuth;
-import org.springblade.core.datascope.enums.DataScopeEnum;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.DateUtil;
@@ -37,7 +36,6 @@ import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.service.IDeptService;
 import org.springblade.modules.system.service.IUserService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.util.Assert;
 
 import java.util.ArrayList;
@@ -115,7 +113,7 @@ public class KeyPwdServiceImpl extends BaseServiceImpl<KeyPwdMapper, KeyPwd> imp
 			keep.setHandoverPersonName(keyPwd.getHandoverPersonName());
 			keep.setFillingPerson(keyPwd.getHandoverPersonNo());
 			keep.setFillingDate(DateUtil.now());
-			keep.setCreateUser(keyPwd.getCreateUser());
+			keep.setCreateUser(AuthUtil.getUserId());
 			keep.setCreateTime(keyPwd.getCreateTime());
 			keep.setCreateDept(keyPwd.getCreateDept());
 

src/main/java/org/springblade/common/utils/hangxin/HangxinUtil.java

@@ -1,11 +1,9 @@
 package org.springblade.common.utils.hangxin;
 
 import cn.hutool.json.JSONUtil;
-import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.utils.hangxin.bean.HangxinResultBean;
 import org.springblade.common.utils.hangxin.conf.HangxinConfig;
 import org.springblade.common.utils.hangxin.contants.HangxinConstants;
-import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
@@ -17,17 +15,15 @@ import org.springframework.web.client.RestTemplate;
 
 import java.net.URI;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
-@Slf4j
+//@Slf4j
 @Component
 public class HangxinUtil {
 
 	@Autowired
 	private HangxinConfig hangxinConfig;
 
-
 	public HangxinResultBean sendMsg (String userEhrs, String title, String content){
 		RestTemplate restTemplate = new RestTemplate();
 		String url = hangxinConfig.getUrl() + HangxinConstants.SEND_MSG;

src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java

@@ -25,7 +25,6 @@ import org.springblade.bank.message.entity.Message;
 import org.springblade.bank.postchange.entity.PostChange;
 import org.springblade.bank.returns.entity.Returns;
 import org.springblade.bank.sealhandover.entity.SealHandover;
-import org.springblade.common.utils.hangxin.HangxinUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.DateUtil;
@@ -61,11 +60,8 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 	private final IDeptService deptService;
 	private final IRoleService roleService;
 	private final IParamService paramService;
-
 	private final ApplicationEventPublisher eventPublisher;
 
-	private HangxinUtil hangxinUtil;
-
 	@Override
 	public IPage<NoticeVO> selectNoticePage(IPage<NoticeVO> page, NoticeVO notice) {
 		// 若不使用mybatis-plus自带的分页方法，则不会自动带入tenantId，所以我们需要自行注入

src/main/java/org/springblade/modules/publishevent/listener/NoticeListener.java

@@ -4,6 +4,7 @@ import cn.hutool.json.JSONUtil;
 import lombok.AllArgsConstructor;
 import org.springblade.common.utils.hangxin.HangxinUtil;
 import org.springblade.common.utils.hangxin.bean.HangxinResultBean;
+import org.springblade.core.log.logger.BladeLogger;
 import org.springblade.modules.desk.entity.Notice;
 import org.springblade.modules.publishevent.event.HangxinNoticeEvent;
 import org.springframework.context.ApplicationListener;
@@ -17,17 +18,23 @@ public class NoticeListener implements ApplicationListener<HangxinNoticeEvent> {
 
 	private HangxinUtil hangxinUtil;
 
-	/*@EventListener
+	private BladeLogger logger;
+
+	@EventListener
 	@Async
-	public void testNotice(HangxinNoticeEvent noticeEvent){
+	public void onNoticeEvent(HangxinNoticeEvent noticeEvent){
+		logger.info("onNoticeEvent", JSONUtil.toJsonStr(noticeEvent));
 		Notice notice = noticeEvent.getNotice();
-	}*/
+		HangxinResultBean hangxinResultBean = hangxinUtil.sendMsg(notice.getTargetEhrs(), "提示進度", notice.getTitle());
+	}
 
 	@Override
 	@EventListener
 	@Async
 	public void onApplicationEvent(HangxinNoticeEvent noticeEvent) {
+		/*
+		logger.info("onApplicationEvent", JSONUtil.toJsonStr(noticeEvent));
 		Notice notice = noticeEvent.getNotice();
-		HangxinResultBean hangxinResultBean = hangxinUtil.sendMsg(notice.getTargetEhrs(), "提示進度", notice.getTitle());
+		HangxinResultBean hangxinResultBean = hangxinUtil.sendMsg(notice.getTargetEhrs(), "提示進度", notice.getTitle());*/
 	}
 }