获取消息接口增加type筛选

src/main/java/com/uas/ps/message/api/MessageController.java

@@ -39,14 +39,15 @@ public class MessageController {
      * @param consumerApp 接收app
      * @param pageParams 分页参数
      * @param isRead 读取状态
+     * @param type 类型
      * @param keyword 关键词
      * @param pageParams
      * @return
      */
     @HttpLog
     @RequestMapping(method = RequestMethod.GET, produces = "application/json")
-    public Page<Message> getMessages(String receiverUu, String receiverEnuu, String consumerApp, String isRead, String keyword, PageParams pageParams) {
-        return messageService.getMessages(receiverUu, receiverEnuu, consumerApp, isRead, keyword, pageParams);
+    public Page<Message> getMessages(String receiverUu, String receiverEnuu, String consumerApp, String isRead, String type, String keyword, PageParams pageParams) {
+        return messageService.getMessages(receiverUu, receiverEnuu, consumerApp, isRead, type, keyword, pageParams);
     }
 
     /**

src/main/java/com/uas/ps/message/service/MessageService.java

@@ -21,11 +21,12 @@ public interface MessageService {
      * @param consumerApp 接收app
      * @param pageParams 分页参数
      * @param isRead 读取状态
+     * @param type 消息类型
      * @param keyword 关键词
      * @param pageParams
      * @return
      */
-    Page<Message> getMessages(String receiverUu, String receiverEnuu, String consumerApp, String isRead, String keyword, PageParams pageParams);
+    Page<Message> getMessages(String receiverUu, String receiverEnuu, String consumerApp, String isRead, String type, String keyword, PageParams pageParams);
 
     /**
      * 获取未读消息数量

src/main/java/com/uas/ps/message/service/impl/MessageServiceImpl.java

@@ -96,7 +96,7 @@ public class MessageServiceImpl implements MessageService {
     }
 
     @Override
-    public Page<Message> getMessages(String receiverUu, String receiverEnuu, String consumerApp, String isRead,
+    public Page<Message> getMessages(String receiverUu, String receiverEnuu, String consumerApp, String isRead, String type,
         String keyword, PageParams pageParams) {
         if (StringUtils.isEmpty(receiverUu) || StringUtils.isEmpty(receiverEnuu)) {
             throw new ParameterMissingException("接收人信息为空");
@@ -125,6 +125,10 @@ public class MessageServiceImpl implements MessageService {
             sql += String.format(" and ms_isread = %s", Short.valueOf(isRead));
         }
 
+        if (!StringUtils.isEmpty(type)) {
+            sql += String.format(" and ms_type = %s", type);
+        }
+
         // 关键词搜索
         if (!StringUtils.isEmpty(keyword)) {
 //            SimpleExpression contentExp = PredicateUtils.like("content", keyword, true);