From 1b1f8fb628c08fc757139a34e2293db8d2529092 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 24 一月 2019 10:13:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserSystemMsgServiceImpl.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 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..0745cb3 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
@@ -7,6 +7,8 @@
import org.springframework.stereotype.Service;
+import com.yeshi.fanli.dao.config.SystemZnxDao;
+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;
@@ -25,6 +27,12 @@
@Resource
private UserMsgReadStateService userMsgReadStateService;
+
+ @Resource
+ private UserInfoMapper userInfoMapper;
+
+ @Resource
+ private SystemZnxDao systemZnxDao;
@Override
public void addUserSystemMsg(Long uid, UserSystemMsgTypeEnum type, String title, String content, int timeTag,
@@ -104,4 +112,25 @@
userSystemMsgMapper.setMsgReadByUid(uid);
}
+ @Override
+ public void syncSystemZNX(Long uid) {
+ UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
+ if (user == null)
+ return;
+ long createtTime = user.getCreatetime();
+ List<SystemZnx> list = systemZnxDao.list("from SystemZnx s where s.createTime>=" + createtTime);
+ if (list != null && list.size() > 0) {
+ for (SystemZnx znx : list) {
+ UserSystemMsg msg = userSystemMsgMapper.selectBySystemZNXId(znx.getId());
+ if (msg == null)
+ try {
+ addUserSystemMsg(uid, UserSystemMsgTypeEnum.common, null, null, UserSystemMsg.TIME_TAG_COMMON, znx);
+ } catch (UserSystemMsgException e) {
+ e.printStackTrace();
+ }
+ }
+
+ }
+ }
+
}
--
Gitblit v1.8.0