1

src/main/java/com/fdkankan/tk/controller/DataCountController.java

@@ -65,25 +65,25 @@ public class DataCountController {
      * 整体数据列表
      */
     @GetMapping("/roomDataList")
-    public ResultData roomDataList(@RequestParam(required = false) String roomId,
+    public ResultData roomDataList(@RequestParam(required = false) String roomTitle,
                                    @RequestParam(required = false) String startTime,
                                    @RequestParam(required = false) String endTime,
                                    @RequestParam(required = false,defaultValue = "1") Integer pageNum,
                                    @RequestParam(required = false,defaultValue = "10") Integer pageSize){
 
-        return ResultData.ok(dataCountService.roomDataList(roomId,startTime,endTime,pageNum,pageSize));
+        return ResultData.ok(dataCountService.roomDataList(roomTitle,startTime,endTime,pageNum,pageSize));
     }
 
     /**
      * 房间留言列表
      */
     @GetMapping("/roomMsgList")
-    public ResultData roomMsgList(@RequestParam(required = false) String roomId,
+    public ResultData roomMsgList(@RequestParam(required = false) String roomTitle,
                                    @RequestParam(required = false) String startTime,
                                    @RequestParam(required = false) String endTime,
                                    @RequestParam(required = false,defaultValue = "1") Integer pageNum,
                                    @RequestParam(required = false,defaultValue = "10") Integer pageSize){
 
-        return ResultData.ok(dataCountService.roomMsgList(roomId,startTime,endTime,pageNum,pageSize));
+        return ResultData.ok(dataCountService.roomMsgList(roomTitle,startTime,endTime,pageNum,pageSize));
     }
 }

src/main/java/com/fdkankan/tk/service/DataCountService.java

@@ -126,13 +126,13 @@ public class DataCountService {
         return dataCounts;
     }
 
-    public Object roomDataList(String roomId, String startTime, String endTime, Integer pageNum, Integer pageSize) {
+    public Object roomDataList(String roomTitle, String startTime, String endTime, Integer pageNum, Integer pageSize) {
         startTime = Dateutils.formatStartTime(startTime);
         endTime = Dateutils.formatEndTime(endTime);
 
         LambdaQueryWrapper<Room> wrapper = new LambdaQueryWrapper<>();
-        if(StringUtils.isNotBlank(roomId)){
-            wrapper.eq(Room::getRoomId,roomId);
+        if(StringUtils.isNotBlank(roomTitle)){
+            wrapper.like(Room::getRoomId,roomTitle);
         }
         if(StringUtils.isNotBlank(startTime)){
             wrapper.ge(Room::getCreateTime,startTime);
@@ -200,11 +200,11 @@ public class DataCountService {
         return PageInfo.PageInfo(pageVo);
     }
 
-    public Object roomMsgList(String roomId, String startTime, String endTime, Integer pageNum, Integer pageSize) {
+    public Object roomMsgList(String roomTitle, String startTime, String endTime, Integer pageNum, Integer pageSize) {
         startTime = Dateutils.formatStartTime(startTime);
         endTime = Dateutils.formatEndTime(endTime);
 
-        Page<UserMsgVo> page = roomDanmakuService.pageList(new Page<>(pageNum,pageSize) ,roomId,startTime,endTime);
+        Page<UserMsgVo> page = roomDanmakuService.pageList(new Page<>(pageNum,pageSize) ,roomTitle,startTime,endTime);
 
         HashMap<String,List<RoomVisitLog>> roomVisitLogsMap = new HashMap<>();
         HashMap<String,List<RoomDanmaku>> danmakusMap = new HashMap<>();