修改请求参数注解

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:微信公众号")

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")

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<ProjectMessageVo.Query> queryMsg(@Param("sendType")Byte sendType, @Param("userId")Long userId);
+    List<ProjectMessageVo.Query> queryMsg(@Param("param") ProjectMessageDto.Query param, @Param("userId")Long userId);
 
     /**
      * 查询消息的具体内容

tall/src/main/java/com/ccsens/tall/service/ProjectMessageService.java

@@ -240,7 +240,7 @@ public class ProjectMessageService implements IProjectMessageService {
     @Override
     public PageInfo<ProjectMessageVo.Query> queryMsg(ProjectMessageDto.Query param, Long userId) {
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        List<ProjectMessageVo.Query> list = sysOperationDao.queryMsg(param.getSendType(), userId);
+        List<ProjectMessageVo.Query> list = sysOperationDao.queryMsg(param, userId);
         return new PageInfo<>(list);
     }
 

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<SysAuth> authList = authDao.selectByExample(authExample);
             if (CollectionUtil.isNotEmpty(authList)) {
                 theAuth = authList.get(0);

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<ProjectMessageVo.Query> queryMsg(@RequestBody QueryDto<ProjectMessageDto.Query> param) {
         log.info("未读消息请求参数：{}", param);

tall/src/main/resources/mapper_dao/SysOperationDao.xml

@@ -32,15 +32,21 @@
     </select>
     <select id="queryMsg" resultMap="MessageQuery">
         SELECT
-            id, operation_id, send_type, created_at, read_status
+            s.id, s.operation_id, s.send_type, s.created_at, s.read_status
         FROM
-            t_sys_message_send
+            t_sys_message_send s, t_sys_operation o
         WHERE
-            receiver_id = #{userId}
+            s.operation_id = o.id
-            AND send_type = 0
+            AND s.receiver_id = #{userId}
-            AND rec_status = 0
+            <if test="param.projectId != null">
+                AND o.project_id = #{param.projectId}
+            </if>
+
+            AND s.send_type = #{param.sendType}
+            AND s.rec_status = 0
+            AND o.rec_status = 0
         ORDER BY
-            created_at DESC
+            s.created_at DESC
     </select>
     <select id="queryContent" resultType="com.ccsens.tall.bean.vo.MessageVo$Message">
         SELECT