From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgDeviceReadStateServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgDeviceReadStateServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgDeviceReadStateServiceImpl.java
index 7438db7..ac81ebf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgDeviceReadStateServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgDeviceReadStateServiceImpl.java
@@ -31,15 +31,17 @@
}
@Override
- public void addUnreadDeviceMsg(String type, String device, int platform, int msgCount) {
+ public void addUnreadDeviceMsg(String type, String device, int platform, int msgCount, String msg,Date msgTime) {
MsgDeviceReadState state = msgDeviceReadStateMapper.selectByDeviceAndPlatformAndType(device, platform, type);
if (state != null) {
MsgDeviceReadState update = new MsgDeviceReadState();
update.setId(state.getId());
update.setUnReadCount(state.getUnReadCount() + msgCount);
update.setUpdateTime(new Date());
+ update.setLatestContent(msg);
+ update.setLatestContentTime(msgTime);
msgDeviceReadStateMapper.updateByPrimaryKeySelective(update);
- } else {//
+ } else {
state = new MsgDeviceReadState();
state.setCreateTime(new Date());
state.setDevice(device);
@@ -47,6 +49,8 @@
state.setType(type);
state.setUnReadCount(msgCount);
state.setUpdateTime(new Date());
+ state.setLatestContent(msg);
+ state.setLatestContentTime(msgTime);
msgDeviceReadStateMapper.insertSelective(state);
}
}
@@ -97,4 +101,12 @@
return totalCount;
}
+ @Override
+ public int getUnReadCount(String device, int platform, String type) {
+ MsgDeviceReadState state = getByDeviceAndPlatformAndType(type, device, platform);
+ if (state == null)
+ return 0;
+ return state.getUnReadCount() == null ? 0 : state.getUnReadCount();
+ }
+
}
--
Gitblit v1.8.0