时间管理

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

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.List;
 
 @RestController
@@ -66,8 +67,8 @@ public class DataCountController extends BaseController {
      */
     @GetMapping("/roomVisitData")
     public ResultData roomVisitData(@RequestParam(required = false) String roomTitle,
-                                    @RequestParam(required = false) String startTime,
-                                    @RequestParam(required = false) String endTime){
+                                    @RequestParam(required = false) Date startTime,
+                                    @RequestParam(required = false) Date endTime){
 
         return ResultData.ok(dataCountService.roomVisitData(getToken(),roomTitle,startTime,endTime));
     }
@@ -77,8 +78,8 @@ public class DataCountController extends BaseController {
      */
     @GetMapping("/roomDataList")
     public ResultData roomDataList(@RequestParam(required = false) String roomTitle,
-                                   @RequestParam(required = false) String startTime,
-                                   @RequestParam(required = false) String endTime,
+                                   @RequestParam(required = false) Date startTime,
+                                   @RequestParam(required = false) Date endTime,
                                    @RequestParam(required = false,defaultValue = "1") Integer pageNum,
                                    @RequestParam(required = false,defaultValue = "10") Integer pageSize){
 
@@ -89,8 +90,8 @@ public class DataCountController extends BaseController {
      */
     @GetMapping("/exportRoomData")
     public void exportRoomData(@RequestParam(required = false) String roomTitle,
-                       @RequestParam(required = false) String startTime,
-                       @RequestParam(required = false) String endTime,
+                       @RequestParam(required = false) Date startTime,
+                       @RequestParam(required = false) Date endTime,
                        HttpServletRequest request,
                        HttpServletResponse response) throws Exception {
 
@@ -116,8 +117,8 @@ public class DataCountController extends BaseController {
      */
     @GetMapping("/roomMsgList")
     public ResultData roomMsgList(@RequestParam(required = false) String roomTitle,
-                                   @RequestParam(required = false) String startTime,
-                                   @RequestParam(required = false) String endTime,
+                                   @RequestParam(required = false) Date startTime,
+                                   @RequestParam(required = false) Date endTime,
                                    @RequestParam(required = false,defaultValue = "1") Integer pageNum,
                                    @RequestParam(required = false,defaultValue = "10") Integer pageSize){
 
@@ -129,8 +130,8 @@ public class DataCountController extends BaseController {
      */
     @GetMapping("/exportRoomMsg")
     public void exportRoomMsg(@RequestParam(required = false) String roomTitle,
-                            @RequestParam(required = false) String startTime,
-                            @RequestParam(required = false) String endTime,
+                            @RequestParam(required = false) Date startTime,
+                            @RequestParam(required = false) Date endTime,
                             HttpServletRequest request,
                             HttpServletResponse response) throws Exception {
 

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

@@ -120,7 +120,7 @@ public class DataCountService {
         return dataCounts;
     }
 
-    public Object roomVisitData(String token,String roomTitle, String startTime, String endTime) {
+    public Object roomVisitData(String token,String roomTitle, Date startTime, Date endTime) {
         List<Room> roomList = roomService.getRoomByToken(token);
         List<String> roomIdsDb = roomList.stream().map(Room::getRoomId).collect(Collectors.toList());
         List<String> roomIds = roomIdsDb;
@@ -136,19 +136,19 @@ public class DataCountService {
         if(roomIds.isEmpty()){
             return roomVisitData;
         }
-        startTime = Dateutils.formatStartTime(startTime);
-        endTime = Dateutils.formatEndTime(endTime);
-        List<DataCount> dbVisitList = roomVisitLogService.getByGroupRoomId("t_room_visit_log",roomIds,startTime,endTime);
-        List<DataCount>  dbVisitListFmt =  getDataCountListByList(dbVisitList, startTime, endTime);
+        String startTimeStr = Dateutils.formatStartTime(startTime);
+        String endTimeStr = Dateutils.formatEndTime(endTime);
+        List<DataCount> dbVisitList = roomVisitLogService.getByGroupRoomId("t_room_visit_log",roomIds,startTimeStr,endTimeStr);
+        List<DataCount>  dbVisitListFmt =  getDataCountListByList(dbVisitList, startTimeStr, endTimeStr);
 
-        List<DataCount> dbSharList = roomVisitLogService.getByGroupRoomId("t_room_share_log",roomIds,startTime,endTime);
-        List<DataCount>  dbSharListFmt =  getDataCountListByList(dbSharList, startTime, endTime);
+        List<DataCount> dbSharList = roomVisitLogService.getByGroupRoomId("t_room_share_log",roomIds,startTimeStr,endTimeStr);
+        List<DataCount>  dbSharListFmt =  getDataCountListByList(dbSharList, startTimeStr, endTimeStr);
 
-        List<DataCount> dbDanmakuList = roomVisitLogService.getByGroupRoomId("t_room_danmaku",roomIds,startTime,endTime);
-        List<DataCount>  dbDanmakuListFmt =  getDataCountListByList(dbDanmakuList, startTime, endTime);
+        List<DataCount> dbDanmakuList = roomVisitLogService.getByGroupRoomId("t_room_danmaku",roomIds,startTimeStr,endTimeStr);
+        List<DataCount>  dbDanmakuListFmt =  getDataCountListByList(dbDanmakuList, startTimeStr, endTimeStr);
 
-        List<DataCount> dbDanmakuListD = roomVisitLogService.getByDGroupRoomId("t_room_danmaku",roomIds,startTime,endTime);
-        List<DataCount>  dbDanmakuListFmtD =  getDataCountListByList(dbDanmakuListD, startTime, endTime);
+        List<DataCount> dbDanmakuListD = roomVisitLogService.getByDGroupRoomId("t_room_danmaku",roomIds,startTimeStr,endTimeStr);
+        List<DataCount>  dbDanmakuListFmtD =  getDataCountListByList(dbDanmakuListD, startTimeStr, endTimeStr);
 
         roomVisitData.setUserVisitList(dbVisitListFmt);
         roomVisitData.setUserShareList(dbSharListFmt);
@@ -176,9 +176,9 @@ public class DataCountService {
         return dataCounts;
     }
 
-    public PageInfo<RoomListDataVo> roomDataList(String token,String roomTitle, String startTime, String endTime, Integer pageNum, Integer pageSize) {
-        startTime = Dateutils.formatStartTime(startTime);
-        endTime = Dateutils.formatEndTime(endTime);
+    public PageInfo<RoomListDataVo> roomDataList(String token,String roomTitle, Date startTime, Date endTime, Integer pageNum, Integer pageSize) {
+        String startTimeStr = Dateutils.formatStartTime(startTime);
+        String endTimeStr = Dateutils.formatEndTime(endTime);
 
         LambdaQueryWrapper<Room> wrapper = new LambdaQueryWrapper<>();
         if(StringUtils.isNotBlank(token)){
@@ -188,11 +188,11 @@ public class DataCountService {
         if(StringUtils.isNotBlank(roomTitle)){
             wrapper.like(Room::getRoomId,roomTitle);
         }
-        if(StringUtils.isNotBlank(startTime)){
-            wrapper.ge(Room::getCreateTime,startTime);
+        if(StringUtils.isNotBlank(startTimeStr)){
+            wrapper.ge(Room::getCreateTime,startTimeStr);
         }
-        if(StringUtils.isNotBlank(endTime)){
-            wrapper.le(Room::getCreateTime,endTime);
+        if(StringUtils.isNotBlank(endTimeStr)){
+            wrapper.le(Room::getCreateTime,endTimeStr);
         }
         wrapper.orderByDesc(Room::getCreateTime);
 
@@ -261,7 +261,7 @@ public class DataCountService {
         return PageInfo.PageInfo(pageVo);
     }
 
-    public PageInfo<UserMsgVo> roomMsgList(String token ,String roomTitle, String startTime, String endTime, Integer pageNum, Integer pageSize) {
+    public PageInfo<UserMsgVo> roomMsgList(String token ,String roomTitle, Date startTime, Date endTime, Integer pageNum, Integer pageSize) {
         List<Room> roomList = roomService.getRoomByToken(token);
         List<String> roomIdsDb = roomList.stream().map(Room::getRoomId).collect(Collectors.toList());
         List<String> roomIds = roomIdsDb;
@@ -277,10 +277,10 @@ public class DataCountService {
             return  PageInfo.PageInfo(new Page<>(pageNum,pageSize));
         }
 
-        startTime = Dateutils.formatStartTime(startTime);
-        endTime = Dateutils.formatEndTime(endTime);
+        String startTimeStr = Dateutils.formatStartTime(startTime);
+        String endTimeStr = Dateutils.formatEndTime(endTime);
 
-        Page<UserMsgVo> page = roomDanmakuService.pageList(new Page<>(pageNum,pageSize) ,roomIds,startTime,endTime);
+        Page<UserMsgVo> page = roomDanmakuService.pageList(new Page<>(pageNum,pageSize) ,roomIds,startTimeStr,endTimeStr);
 
         HashMap<String,List<RoomVisitLog>> roomVisitLogsMap = new HashMap<>();
         HashMap<String,List<RoomDanmaku>> danmakusMap = new HashMap<>();

src/main/java/com/fdkankan/tk/util/Dateutils.java

@@ -129,6 +129,12 @@ public class Dateutils {
         }
         return startTime;
     }
+    public static String formatStartTime(Date startTime) {
+        if(startTime == null){
+            return Dateutils.getHalfYearStr();
+        }
+        return Dateutils.getDate(startTime);
+    }
     public static String formatEndTime(String endTime) {
         if(StringUtils.isBlank(endTime)){
             endTime = Dateutils.getDate(new Date());
@@ -138,6 +144,12 @@ public class Dateutils {
         }
         return endTime;
     }
+    public static String formatEndTime(Date endTime) {
+        if(endTime == null){
+            return Dateutils.getDate(new Date());
+        }
+        return Dateutils.getDate(endTime);
+    }
 
 
     public static String getStartTime(String startTime) {