diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/MessageListFeign.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/MessageListFeign.java index 9af6687..8c337d0 100644 --- a/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/MessageListFeign.java +++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/MessageListFeign.java @@ -117,4 +117,8 @@ public interface MessageListFeign { @ApiOperation("PC端待阅已阅列表") @PostMapping("/todoAllReadList") public ResultBean> todoAllReadList(@RequestBody PagerQuery pq); + + @ApiOperation(value = "业务系统查询待阅任务列表数量") + @GetMapping("/getTodoNum/{userSid}") + ResultBean getTodoNum(@PathVariable(value = "userSid")String userSid); } \ No newline at end of file diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/MessageListFeignFallback.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/MessageListFeignFallback.java index 2064cda..cf4fcd6 100644 --- a/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/MessageListFeignFallback.java +++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/MessageListFeignFallback.java @@ -125,4 +125,9 @@ public class MessageListFeignFallback implements MessageListFeign { public ResultBean> todoAllReadList(PagerQuery pq) { return null; } + + @Override + public ResultBean getTodoNum(String userSid) { + return null; + } } \ No newline at end of file diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.java index fb4a870..b9283cc 100644 --- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.java +++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.java @@ -91,4 +91,6 @@ public interface MessageListMapper extends BaseMapper { List selectByMsgSid(String s); IPage todoAllReadList(IPage iPage,@Param(Constants.WRAPPER) QueryWrapper qw); + + Integer getTodoNum(String userSid); } \ No newline at end of file diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.xml b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.xml index 61c1f21..2b0c4da 100644 --- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.xml +++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.xml @@ -18,17 +18,17 @@ SELECT ml.sid, - ml.state, - ml.msgSid, - m.senderName, - m.msgTitle, - m.createTime, - m.msgType, - m.msgSource, - ml.receiverSid + ml.state, + ml.msgSid, + m.senderName, + m.msgTitle, + m.createTime, + m.msgType, + m.msgSource, + ml.receiverSid FROM message_list ml - LEFT JOIN message m - ON m.sid = ml.msgSid + LEFT JOIN message m + ON m.sid = ml.msgSid ${ew.sqlSegment} - and ml.state = 0 - and ml.rDelStatus = 0 + and ml.state = 0 + and ml.rDelStatus = 0 @@ -83,9 +83,9 @@ mt.crossIconUrl iconImage, DATE_FORMAT(m.createTime, '%Y-%m-%d') AS createTime FROM message_list ml - LEFT JOIN message m ON m.sid = ml.msgSid - left join message_type mt ON mt.sid = m.msgTypeSid - ${ew.customSqlSegment} + LEFT JOIN message m ON m.sid = ml.msgSid + left join message_type mt ON mt.sid = m.msgTypeSid + ${ew.customSqlSegment} @@ -118,7 +118,7 @@ @@ -134,8 +134,8 @@ m.msgSource, m.msgContent FROM message_list ml - LEFT JOIN message m - ON m.sid = ml.msgSid + LEFT JOIN message m + ON m.sid = ml.msgSid WHERE m.sid = #{sid} @@ -143,12 +143,12 @@ @@ -156,11 +156,11 @@ @@ -217,14 +216,14 @@ + + \ No newline at end of file diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListRest.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListRest.java index 220745d..dba4d58 100644 --- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListRest.java +++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListRest.java @@ -255,4 +255,13 @@ public class MessageListRest implements MessageListFeign { } return new ResultBean>().success().setData(pagerVo); } + + @Override + public ResultBean getTodoNum(String userSid) { + ResultBean rb=ResultBean.fireFail(); + if(StringUtils.isBlank(userSid)){ + return rb.setMsg("用户sid不能为空"); + } + return messageListService.getTodoNum(userSid); + } } diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java index 7e5ccb0..ba96651 100644 --- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java +++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java @@ -9,6 +9,7 @@ import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.messagecenter.api.messagelist.*; import com.yxt.messagecenter.api.messagelist.app.*; @@ -450,4 +451,10 @@ public class MessageListService extends MybatisBaseService getTodoNum(String userSid) { + ResultBean rb = new ResultBean<>(); + Integer todoNum = baseMapper.getTodoNum(userSid); + return rb.success().setData(todoNum); + } } \ No newline at end of file