From 07f94f75d84592468786035a341085dbb4cc687e Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Tue, 2 Jun 2020 15:30:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tall/bean/dto/ProjectMessageDto.java | 10 ++++++---- .../ccsens/tall/bean/vo/ProjectMessageVo.java | 4 ++-- .../tall/persist/dao/SysOperationDao.java | 5 +++-- .../tall/service/ProjectMessageService.java | 2 +- .../com/ccsens/tall/service/UserService.java | 2 +- .../tall/web/ProjectMessageController.java | 2 +- .../resources/mapper_dao/SysOperationDao.xml | 18 ++++++++++++------ 7 files changed, 26 insertions(+), 17 deletions(-) diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/ProjectMessageDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/ProjectMessageDto.java index 0ce25af9..ef9fb0cc 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/dto/ProjectMessageDto.java +++ b/tall/src/main/java/com/ccsens/tall/bean/dto/ProjectMessageDto.java @@ -17,7 +17,7 @@ import javax.validation.constraints.NotNull; public class ProjectMessageDto { @Data - @ApiModel("查询未读消息数") + @ApiModel("查询未读消息数-请求") public static class UnreadNum{ @NotNull @ApiModelProperty("发送类型 0:ws,1:微信公众号") @@ -25,11 +25,13 @@ public class ProjectMessageDto { } @Data - @ApiModel("查询未读消息") + @ApiModel("查询消息-请求") public static class Query{ @NotNull @ApiModelProperty("发送类型 0:ws,1:微信公众号") private Byte sendType; + @ApiModelProperty("项目ID") + private Long projectId; @ApiModelProperty("第几页") @Min(value = 1) private int pageNum = 1; @@ -40,7 +42,7 @@ public class ProjectMessageDto { } @Data - @ApiModel("查询未读消息") + @ApiModel("标记某条消息已读-请求") public static class MarkRead{ @NotNull(message="发送消息ID不能为空") @ApiModelProperty("发送消息ID") @@ -48,7 +50,7 @@ public class ProjectMessageDto { } @Data - @ApiModel("查询未读消息") + @ApiModel("标记所有消息已读-请求") public static class MarkAllRead{ @NotNull @ApiModelProperty("消息发送类型 0:ws,1:微信公众号") diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectMessageVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectMessageVo.java index deaa8f99..5e4fee11 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectMessageVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectMessageVo.java @@ -18,14 +18,14 @@ import java.util.List; @ApiModel("未读消息相关返回结果") public class ProjectMessageVo { @Data - @ApiModel("未读消息数") + @ApiModel("未读消息数-返回") public static class UnreadNum{ @ApiModelProperty("发送类型 0:ws,1:微信公众号") private Integer unreadNum; } @Data - @ApiModel("未读消息") + @ApiModel("未读消息-返回") @JsonIgnoreProperties(value = { "handler" }) public static class Query{ @ApiModelProperty("发送消息ID") diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/SysOperationDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/SysOperationDao.java index 7a6b446f..64c9a923 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/SysOperationDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/SysOperationDao.java @@ -1,5 +1,6 @@ package com.ccsens.tall.persist.dao; +import com.ccsens.tall.bean.dto.ProjectMessageDto; import com.ccsens.tall.bean.vo.MessageVo; import com.ccsens.tall.bean.vo.ProjectMessageVo; import com.ccsens.tall.persist.mapper.SysOperationMapper; @@ -19,11 +20,11 @@ public interface SysOperationDao extends SysOperationMapper { /** * 查询消息 - * @param sendType + * @param param * @param userId * @return */ - List queryMsg(@Param("sendType")Byte sendType, @Param("userId")Long userId); + List queryMsg(@Param("param") ProjectMessageDto.Query param, @Param("userId")Long userId); /** * 查询消息的具体内容 diff --git a/tall/src/main/java/com/ccsens/tall/service/ProjectMessageService.java b/tall/src/main/java/com/ccsens/tall/service/ProjectMessageService.java index d0f0e9ab..a4820137 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProjectMessageService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProjectMessageService.java @@ -240,7 +240,7 @@ public class ProjectMessageService implements IProjectMessageService { @Override public PageInfo queryMsg(ProjectMessageDto.Query param, Long userId) { PageHelper.startPage(param.getPageNum(), param.getPageSize()); - List list = sysOperationDao.queryMsg(param.getSendType(), userId); + List list = sysOperationDao.queryMsg(param, userId); return new PageInfo<>(list); } diff --git a/tall/src/main/java/com/ccsens/tall/service/UserService.java b/tall/src/main/java/com/ccsens/tall/service/UserService.java index daca9f61..f5a9296c 100644 --- a/tall/src/main/java/com/ccsens/tall/service/UserService.java +++ b/tall/src/main/java/com/ccsens/tall/service/UserService.java @@ -246,7 +246,7 @@ public class UserService implements IUserService { if (ObjectUtil.isNotNull(wxOauth2UserInfo)) { SysAuthExample authExample = new SysAuthExample(); authExample.createCriteria().andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.OAUTH2_Wx.value) - .andIdentifierEqualTo(wxOauth2UserInfo.getOpenId()); + .andIdentifierEqualTo(wxOauth2UserInfo.getOpenId()).andCredentialEqualTo(wxOauth2UserInfo.getUnionId()); List authList = authDao.selectByExample(authExample); if (CollectionUtil.isNotEmpty(authList)) { theAuth = authList.get(0); diff --git a/tall/src/main/java/com/ccsens/tall/web/ProjectMessageController.java b/tall/src/main/java/com/ccsens/tall/web/ProjectMessageController.java index 4f4fdde1..aa4ba858 100644 --- a/tall/src/main/java/com/ccsens/tall/web/ProjectMessageController.java +++ b/tall/src/main/java/com/ccsens/tall/web/ProjectMessageController.java @@ -42,7 +42,7 @@ public class ProjectMessageController { @MustLogin - @ApiOperation(value = "分页查询未读消息",notes = "分页查询未读消息") + @ApiOperation(value = "分页查询消息",notes = "分页查询消息") @RequestMapping(value = "queryMsg", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse queryMsg(@RequestBody QueryDto param) { log.info("未读消息请求参数：{}", param); diff --git a/tall/src/main/resources/mapper_dao/SysOperationDao.xml b/tall/src/main/resources/mapper_dao/SysOperationDao.xml index 7babf37c..e154dcdd 100644 --- a/tall/src/main/resources/mapper_dao/SysOperationDao.xml +++ b/tall/src/main/resources/mapper_dao/SysOperationDao.xml @@ -32,15 +32,21 @@