From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserSystemMsgServiceImpl.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserSystemMsgServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserSystemMsgServiceImpl.java
index 7330a67..74348fa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserSystemMsgServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserSystemMsgServiceImpl.java
@@ -6,7 +6,9 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dao.mybatis.msg.UserSystemMsgMapper;
import com.yeshi.fanli.entity.bus.msg.UserSystemMsg;
import com.yeshi.fanli.entity.bus.msg.UserSystemMsgTypeEnum;
@@ -15,6 +17,7 @@
import com.yeshi.fanli.exception.msg.UserSystemMsgException;
import com.yeshi.fanli.service.inter.msg.UserMsgReadStateService;
import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;
+import com.yeshi.fanli.service.inter.user.SystemZnxService;
import com.yeshi.fanli.util.StringUtil;
@Service
@@ -26,6 +29,13 @@
@Resource
private UserMsgReadStateService userMsgReadStateService;
+ @Resource
+ private UserInfoMapper userInfoMapper;
+
+ @Resource
+ private SystemZnxService systemZnxService;
+
+ @Transactional(rollbackFor=Exception.class)
@Override
public void addUserSystemMsg(Long uid, UserSystemMsgTypeEnum type, String title, String content, int timeTag,
SystemZnx sz) throws UserSystemMsgException {
@@ -33,7 +43,7 @@
throw new UserSystemMsgException(1, "淇℃伅涓嶅畬鏁�");
UserSystemMsg msg = new UserSystemMsg();
if (sz != null) {
- if (userSystemMsgMapper.selectBySystemZNXId(sz.getId()) == null) {
+ if (userSystemMsgMapper.selectBySystemZNXId(sz.getId(), uid) == null) {
msg.setCreateTime(new Date(sz.getCreateTime()));
msg.setRead(false);
msg.setSolved(false);
@@ -41,6 +51,8 @@
msg.setUser(new UserInfo(uid));
msg.setType(type);
msg.setTimeTag(timeTag);
+ msg.setTitle(sz.getTitle());
+ msg.setContent(sz.getContent());
} else
throw new UserSystemMsgException(1, "娑堟伅宸插瓨鍦�");
} else {
@@ -104,4 +116,26 @@
userSystemMsgMapper.setMsgReadByUid(uid);
}
+ @Override
+ public void syncSystemZNX(Long uid) {
+ UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);
+ if (user == null)
+ return;
+ long createTime = user.getCreatetime();
+ List<SystemZnx> list = systemZnxService.listbyCreateTime(createTime);
+ if (list != null && list.size() > 0) {
+ for (SystemZnx znx : list) {
+ UserSystemMsg msg = userSystemMsgMapper.selectBySystemZNXId(znx.getId(), uid);
+ if (msg == null)
+ try {
+ addUserSystemMsg(uid, UserSystemMsgTypeEnum.common, null, null, UserSystemMsg.TIME_TAG_COMMON,
+ znx);
+ } catch (UserSystemMsgException e) {
+ e.printStackTrace();
+ }
+ }
+
+ }
+ }
+
}
--
Gitblit v1.8.0