管理端客服聊天已读未读全部合并为1个接口

src/main/java/com/sqx/modules/chats/controller/ChatsController.java

@@ -41,31 +41,32 @@ public class ChatsController {
                           @ApiParam("关键字") @DecryptParam(required = false) String keyWord,
                           @ApiParam("开始时间") @DecryptParam(required = false) String starTime,
                           @ApiParam("结束时间") @DecryptParam(required = false) String endTime,
+                          @ApiParam("是否已读（1已读 2 未读 3全部）") @DecryptParam(required = false) String read,
                           @ApiParam("用户昵称") @DecryptParam(required = false) String userName) {
-        return service.findAll(storeId, keyWord,type,starTime,endTime);
+        return service.findAll(storeId, keyWord,type,starTime,endTime,read);
     }
 
-    @GetMapping("/listRead")
-    @ApiOperation("商家端已读会话列表")
-    public Result findRead(@ApiParam("店铺id(总后台商户传0)") @DecryptParam Long storeId,
-                           @ApiParam("用户类型") @DecryptParam(required = false) Long type,
-                           @ApiParam("关键字") @DecryptParam(required = false) String keyWord,
-                           @ApiParam("开始时间") @DecryptParam(required = false) String starTime,
-                           @ApiParam("结束时间") @DecryptParam(required = false) String endTime,
-                          @ApiParam("用户昵称") @DecryptParam(required = false) String userName) {
-        return service.findRead(storeId, keyWord,type,starTime,endTime);
-    }
-
-    @GetMapping("/listUnRead")
-    @ApiOperation("商家端未读会话列表")
-    public Result findUnRead(@ApiParam("店铺id(总后台商户传0)") @DecryptParam Long storeId,
-                             @ApiParam("用户类型") @DecryptParam(required = false) Long type,
-                             @ApiParam("关键字") @DecryptParam(required = false) String keyWord,
-                             @ApiParam("开始时间") @DecryptParam(required = false) String starTime,
-                             @ApiParam("结束时间") @DecryptParam(required = false) String endTime,
-                          @ApiParam("用户昵称") @DecryptParam(required = false) String userName) {
-        return service.findUnRead(storeId, keyWord,type,starTime,endTime);
-    }
+//    @GetMapping("/listRead")
+//    @ApiOperation("商家端已读会话列表")
+//    public Result findRead(@ApiParam("店铺id(总后台商户传0)") @DecryptParam Long storeId,
+//                           @ApiParam("用户类型") @DecryptParam(required = false) Long type,
+//                           @ApiParam("关键字") @DecryptParam(required = false) String keyWord,
+//                           @ApiParam("开始时间") @DecryptParam(required = false) String starTime,
+//                           @ApiParam("结束时间") @DecryptParam(required = false) String endTime,
+//                          @ApiParam("用户昵称") @DecryptParam(required = false) String userName) {
+//        return service.findRead(storeId, keyWord,type,starTime,endTime);
+//    }
+//
+//    @GetMapping("/listUnRead")
+//    @ApiOperation("商家端未读会话列表")
+//    public Result findUnRead(@ApiParam("店铺id(总后台商户传0)") @DecryptParam Long storeId,
+//                             @ApiParam("用户类型") @DecryptParam(required = false) Long type,
+//                             @ApiParam("关键字") @DecryptParam(required = false) String keyWord,
+//                             @ApiParam("开始时间") @DecryptParam(required = false) String starTime,
+//                             @ApiParam("结束时间") @DecryptParam(required = false) String endTime,
+//                          @ApiParam("用户昵称") @DecryptParam(required = false) String userName) {
+//        return service.findUnRead(storeId, keyWord,type,starTime,endTime);
+//    }
 
     @GetMapping("/userList")
     @ApiOperation("用户端会话列表")

src/main/java/com/sqx/modules/chats/service/ChatsService.java

@@ -19,7 +19,7 @@ public interface ChatsService {
      * @param storeId
      * @return
      */
-    Result findAll(Long storeId, String userName,Long type,String starTime,String endTime);
+    Result findAll(Long storeId, String userName,Long type,String starTime,String endTime,String read);
     Result findRead(Long storeId, String userName,Long type,String starTime,String endTime);
     Result findUnRead(Long storeId, String userName,Long type,String starTime,String endTime);
 

src/main/java/com/sqx/modules/chats/service/ChatsServiceImpl.java

@@ -49,7 +49,7 @@ public class ChatsServiceImpl implements ChatsService {
      * @return
      */
     @Override
-    public Result findAll(Long storeId, String userName,Long type,String starTime,String endTime) {
+    public Result findAll(Long storeId, String userName,Long type,String starTime,String endTime,String read/*受否已读*/) {
         //构造自定义查询条件
 //        Specification<Chats> queryCondition = new Specification<Chats>() {
 //            @Override
@@ -71,7 +71,15 @@ public class ChatsServiceImpl implements ChatsService {
 //                return criteriaBuilder.and(predicateList.toArray(new Predicate[predicateList.size()]));
 //            }
 //        };
-        List<Chats> list = chatsMapper.findAll(storeId,userName,type,starTime,endTime);
+        List<Chats> list=new ArrayList<>();
+        if ("1".equals(read)){
+            list = chatsMapper.findRead(storeId,userName,type,starTime,endTime);
+        }else if("2".equals(read)){
+            list = chatsMapper.findUnRead(storeId,userName,type,starTime,endTime);
+        }else{
+            list = chatsMapper.findAll(storeId,userName,type,starTime,endTime);
+        }
+
         //最新一条消息展示
         List<ChatsContent> allContent = chatContentRepository.findAll();
         for (Chats c : list) {