yxt_develop
/
message-center
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

问题修改

master
God 2 years ago
parent
e0ea87f5f9
commit
0ac4eebf46
6 changed files with 100 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/MessageListFeign.java
  2. 5
      message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/MessageListFeignFallback.java
  3. 2
      message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.java
  4. 139
      message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.xml
  5. 9
      message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListRest.java
  6. 7
      message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java

4
message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/MessageListFeign.java
View File

@ -117,4 +117,8 @@ public interface MessageListFeign {
@ApiOperation("PC端待阅已阅列表")
@PostMapping("/todoAllReadList")
public ResultBean<PagerVo<MessageReadListPCVo>> todoAllReadList(@RequestBody PagerQuery<MessageReadListQuery> pq);
@ApiOperation(value = "业务系统查询待阅任务列表数量")
@GetMapping("/getTodoNum/{userSid}")
ResultBean<Integer> getTodoNum(@PathVariable(value = "userSid")String userSid);
}

5
message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/MessageListFeignFallback.java
View File

@ -125,4 +125,9 @@ public class MessageListFeignFallback implements MessageListFeign {
public ResultBean<PagerVo<MessageReadListPCVo>> todoAllReadList(PagerQuery<MessageReadListQuery> pq) {
return null;
}
@Override
public ResultBean<Integer> getTodoNum(String userSid) {
return null;
}
}

2
message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.java
View File

@ -91,4 +91,6 @@ public interface MessageListMapper extends BaseMapper<MessageList> {
List<String> selectByMsgSid(String s);
IPage<MessageReadListPCVo> todoAllReadList(IPage<MessageReadListQuery> iPage,@Param(Constants.WRAPPER) QueryWrapper<MessageList> qw);
Integer getTodoNum(String userSid);
}

139
message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.xml
View File

@ -18,17 +18,17 @@
<select id="selectListAllVo" resultType="com.yxt.messagecenter.api.messagelist.MessageListJoinMsgVo">
SELECT ml.sid,
ml.msgSid,
m.msgContent,
m.senderName,
m.msgTitle,
m.createTime,
m.msgType,
m.msgSource,
ml.state
ml.msgSid,
m.msgContent,
m.senderName,
m.msgTitle,
m.createTime,
m.msgType,
m.msgSource,
ml.state
FROM message_list ml
LEFT JOIN message m
ON m.sid = ml.msgSid
LEFT JOIN message m
ON m.sid = ml.msgSid
<where>
${ew.sqlSegment}
</where>
@ -36,41 +36,41 @@
<select id="noreadListPage" resultType="com.yxt.messagecenter.api.messagelist.MessageListJoinMsgVo">
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
<where>
${ew.sqlSegment}
and ml.state = 0
and ml.rDelStatus = 0
and ml.state = 0
and ml.rDelStatus = 0
</where>
</select>
<select id="readListPage" resultType="com.yxt.messagecenter.api.messagelist.MessageListJoinMsgVo">
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
<where>
${ew.sqlSegment}
and ml.state = 0
and ml.rDelStatus = 0
and ml.state = 0
and ml.rDelStatus = 0
</where>
</select>
@ -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}
</select>
<update id="updateByReceiverSid">
@ -118,7 +118,7 @@
<select id="selectListCount" resultType="int">
SELECT count(*)
FROM message_list ml
left join message m ON m.sid = ml.msgSid
left join message m ON m.sid = ml.msgSid
WHERE M.msgTypeSid = #{msgTypeSid}
AND ML.state = 0
</select>
@ -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}
</select>
@ -143,12 +143,12 @@
<select id="fetchByReceiverSid" resultType="integer">
SELECT COUNT(*)
FROM message_list ml
LEFT JOIN message m
ON m.sid = ml.msgSid
LEFT JOIN message m
ON m.sid = ml.msgSid
<where>
ml.state = 0
and ml.rDelStatus = 0
and ml.receiverSid = #{receiverSid}
and ml.rDelStatus = 0
and ml.receiverSid = #{receiverSid}
</where>
</select>
@ -156,11 +156,11 @@
<select id="selectUnReadCount" resultType="int">
SELECT COUNT(1)
FROM message_list ml
LEFT JOIN message m ON ml.msgSid = m.sid
LEFT JOIN message_type mt ON m.msgTypeSid = mt.sid
LEFT JOIN message m ON ml.msgSid = m.sid
LEFT JOIN message_type mt ON m.msgTypeSid = mt.sid
WHERE mt.identifier = '0002'
AND ml.state = '0'
AND ml.receiverSid = #{userSid}
AND ml.state = '0'
AND ml.receiverSid = #{userSid}
<if test="msgTypeSid != null and msgTypeSid != ''">
AND mt.sid = #{msgTypeSid}
</if>
@ -174,29 +174,28 @@
m.msgContent,
m.sid as msgSid
FROM message_list ml
LEFT JOIN message m ON ml.msgSid = m.sid
LEFT JOIN message_type mt ON m.msgTypeSid = mt.sid
LEFT JOIN message m ON ml.msgSid = m.sid
LEFT JOIN message_type mt ON m.msgTypeSid = mt.sid
WHERE ml.receiverSid = #{userSid}
AND mt.sid = #{msgTypeSid}
ORDER BY ml.id desc
LIMIT 1
ORDER BY ml.id desc LIMIT 1
</select>
<select id="getAppMsgListByUserSid" resultType="com.yxt.messagecenter.api.messagelist.app.AppMessageListVo">
SELECT ml.sid,
ml.msgSid,
m.app_type as type,
m.moduleSid,
m.args_json as json,
m.msgTitle,
m.msgContent,
ml.state,
DATE_FORMAT(ml.createTime, '%Y-%m-%d %H:%i') as sendTime,
m.msgTargetUri as moduleAction
ml.msgSid,
m.app_type as type,
m.moduleSid,
m.args_json as json,
m.msgTitle,
m.msgContent,
ml.state,
DATE_FORMAT(ml.createTime, '%Y-%m-%d %H:%i') as sendTime,
m.msgTargetUri as moduleAction
FROM message_list ml
LEFT JOIN message m ON ml.msgSid = m.sid
LEFT JOIN message m ON ml.msgSid = m.sid
<where>
${ew.sqlSegment}
and ml.rDelStatus = 0
and ml.rDelStatus = 0
</where>
ORDER BY ml.id DESC
</select>
@ -217,14 +216,14 @@
<select id="getAppReadListByUserSid" resultType="com.yxt.messagecenter.api.messagelist.app.MessageReadListVo">
SELECT ml.sid,
ml.msgSid,
m.app_type as type,
m.app_type as type,
m.moduleSid,
m.args_json as json,
m.args_json as json,
m.msgTitle,
m.msgContent,
ml.state,
DATE_FORMAT(ml.createTime, '%Y-%m-%d %H:%i') as sendTime,
m.msgTargetUri as moduleAction,
m.msgTargetUri as moduleAction,
m.senderName,
m.msgSource,
DATE_FORMAT(ml.modifyTime, '%Y-%m-%d %H:%i') as redTime
@ -257,4 +256,12 @@
</where>
ORDER BY ml.id DESC
</select>
<select id="getTodoNum" resultType="java.lang.Integer">
select COUNT(ml.sid)
FROM message_list ml
LEFT JOIN message m ON ml.msgSid = m.sid
where receiverSid = #{userSid}
and m.msgType = "抄送"
</select>
</mapper>

9
message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListRest.java
View File

@ -255,4 +255,13 @@ public class MessageListRest implements MessageListFeign {
}
return new ResultBean<PagerVo<MessageReadListPCVo>>().success().setData(pagerVo);
}
@Override
public ResultBean<Integer> getTodoNum(String userSid) {
ResultBean<Integer> rb=ResultBean.fireFail();
if(StringUtils.isBlank(userSid)){
return rb.setMsg("用户sid不能为空");
}
return messageListService.getTodoNum(userSid);
}
}

7
message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java
View File

@ -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<MessageListMapper, Me
pagerVo.setMsg("共查询出" + pagerVo.getTotal() + "条消息");
return pagerVo;
}
public ResultBean<Integer> getTodoNum(String userSid) {
ResultBean rb = new ResultBean<>();
Integer todoNum = baseMapper.getTodoNum(userSid);
return rb.success().setData(todoNum);
}
}
Write Preview
Loading…
Cancel
Save