时间格式

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

@@ -1,5 +1,7 @@
 package com.fdkankan.tk.controller;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,6 +12,7 @@ import com.fdkankan.tk.response.UserMsgVo;
 import com.fdkankan.tk.service.DataCountService;
 import com.fdkankan.tk.service.IExcelService;
 import com.fdkankan.tk.service.IRoomService;
+import com.fdkankan.tk.util.Dateutils;
 import org.omg.CORBA.INTERNAL;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -67,8 +70,8 @@ public class DataCountController extends BaseController {
      */
     @GetMapping("/roomVisitData")
     public ResultData roomVisitData(@RequestParam(required = false) String roomTitle,
-                                    @RequestParam(required = false) Date startTime,
-                                    @RequestParam(required = false) Date endTime){
+                                    @RequestParam(required = false) String startTime,
+                                    @RequestParam(required = false) String endTime){
 
         return ResultData.ok(dataCountService.roomVisitData(getToken(),roomTitle,startTime,endTime));
     }
@@ -78,8 +81,8 @@ public class DataCountController extends BaseController {
      */
     @GetMapping("/roomDataList")
     public ResultData roomDataList(@RequestParam(required = false) String roomTitle,
-                                   @RequestParam(required = false) Date startTime,
-                                   @RequestParam(required = false) Date endTime,
+                                   @RequestParam(required = false) String startTime,
+                                   @RequestParam(required = false) String endTime,
                                    @RequestParam(required = false,defaultValue = "1") Integer pageNum,
                                    @RequestParam(required = false,defaultValue = "10") Integer pageSize){
 
@@ -90,8 +93,8 @@ public class DataCountController extends BaseController {
      */
     @GetMapping("/exportRoomData")
     public void exportRoomData(@RequestParam(required = false) String roomTitle,
-                       @RequestParam(required = false) Date startTime,
-                       @RequestParam(required = false) Date endTime,
+                       @RequestParam(required = false) String startTime,
+                       @RequestParam(required = false) String endTime,
                        HttpServletRequest request,
                        HttpServletResponse response) throws Exception {
 
@@ -117,8 +120,8 @@ public class DataCountController extends BaseController {
      */
     @GetMapping("/roomMsgList")
     public ResultData roomMsgList(@RequestParam(required = false) String roomTitle,
-                                   @RequestParam(required = false) Date startTime,
-                                   @RequestParam(required = false) Date endTime,
+                                   @RequestParam(required = false) String startTime,
+                                   @RequestParam(required = false) String endTime,
                                    @RequestParam(required = false,defaultValue = "1") Integer pageNum,
                                    @RequestParam(required = false,defaultValue = "10") Integer pageSize){
 
@@ -130,8 +133,8 @@ public class DataCountController extends BaseController {
      */
     @GetMapping("/exportRoomMsg")
     public void exportRoomMsg(@RequestParam(required = false) String roomTitle,
-                            @RequestParam(required = false) Date startTime,
-                            @RequestParam(required = false) Date endTime,
+                            @RequestParam(required = false) String startTime,
+                            @RequestParam(required = false) String 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, Date startTime, Date endTime) {
+    public Object roomVisitData(String token,String roomTitle, String startTime, String 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;
         }
-        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);
+        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);
 
-        List<DataCount> dbSharList = roomVisitLogService.getByGroupRoomId("t_room_share_log",roomIds,startTimeStr,endTimeStr);
-        List<DataCount>  dbSharListFmt =  getDataCountListByList(dbSharList, startTimeStr, endTimeStr);
+        List<DataCount> dbSharList = roomVisitLogService.getByGroupRoomId("t_room_share_log",roomIds,startTime,endTime);
+        List<DataCount>  dbSharListFmt =  getDataCountListByList(dbSharList, startTime, endTime);
 
-        List<DataCount> dbDanmakuList = roomVisitLogService.getByGroupRoomId("t_room_danmaku",roomIds,startTimeStr,endTimeStr);
-        List<DataCount>  dbDanmakuListFmt =  getDataCountListByList(dbDanmakuList, startTimeStr, endTimeStr);
+        List<DataCount> dbDanmakuList = roomVisitLogService.getByGroupRoomId("t_room_danmaku",roomIds,startTime,endTime);
+        List<DataCount>  dbDanmakuListFmt =  getDataCountListByList(dbDanmakuList, startTime, endTime);
 
-        List<DataCount> dbDanmakuListD = roomVisitLogService.getByDGroupRoomId("t_room_danmaku",roomIds,startTimeStr,endTimeStr);
-        List<DataCount>  dbDanmakuListFmtD =  getDataCountListByList(dbDanmakuListD, startTimeStr, endTimeStr);
+        List<DataCount> dbDanmakuListD = roomVisitLogService.getByDGroupRoomId("t_room_danmaku",roomIds,startTime,endTime);
+        List<DataCount>  dbDanmakuListFmtD =  getDataCountListByList(dbDanmakuListD, startTime, endTime);
 
         roomVisitData.setUserVisitList(dbVisitListFmt);
         roomVisitData.setUserShareList(dbSharListFmt);
@@ -176,9 +176,9 @@ public class DataCountService {
         return dataCounts;
     }
 
-    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);
+    public PageInfo<RoomListDataVo> roomDataList(String token,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(token)){
@@ -188,11 +188,11 @@ public class DataCountService {
         if(StringUtils.isNotBlank(roomTitle)){
             wrapper.like(Room::getRoomId,roomTitle);
         }
-        if(StringUtils.isNotBlank(startTimeStr)){
-            wrapper.ge(Room::getCreateTime,startTimeStr);
+        if(StringUtils.isNotBlank(startTime)){
+            wrapper.ge(Room::getCreateTime,startTime);
         }
-        if(StringUtils.isNotBlank(endTimeStr)){
-            wrapper.le(Room::getCreateTime,endTimeStr);
+        if(StringUtils.isNotBlank(endTime)){
+            wrapper.le(Room::getCreateTime,endTime);
         }
         wrapper.orderByDesc(Room::getCreateTime);
 
@@ -261,7 +261,7 @@ public class DataCountService {
         return PageInfo.PageInfo(pageVo);
     }
 
-    public PageInfo<UserMsgVo> roomMsgList(String token ,String roomTitle, Date startTime, Date endTime, Integer pageNum, Integer pageSize) {
+    public PageInfo<UserMsgVo> roomMsgList(String token ,String roomTitle, String startTime, String 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));
         }
 
-        String startTimeStr = Dateutils.formatStartTime(startTime);
-        String endTimeStr = Dateutils.formatEndTime(endTime);
+        startTime = Dateutils.formatStartTime(startTime);
+        endTime = Dateutils.formatEndTime(endTime);
 
-        Page<UserMsgVo> page = roomDanmakuService.pageList(new Page<>(pageNum,pageSize) ,roomIds,startTimeStr,endTimeStr);
+        Page<UserMsgVo> page = roomDanmakuService.pageList(new Page<>(pageNum,pageSize) ,roomIds,startTime,endTime);
 
         HashMap<String,List<RoomVisitLog>> roomVisitLogsMap = new HashMap<>();
         HashMap<String,List<RoomDanmaku>> danmakusMap = new HashMap<>();

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

@@ -1,5 +1,6 @@
 package com.fdkankan.tk.util;
 
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -124,53 +125,17 @@ public class Dateutils {
         if(StringUtils.isBlank(startTime)){
             startTime = Dateutils.getHalfYearStr();
         }
-        if(startTime.length() <12){  //月，开始时间到1号 0点
-            startTime +=  " 00:00:00";
-        }
-        return startTime;
-    }
-    public static String formatStartTime(Date startTime) {
-        if(startTime == null){
-            return Dateutils.getHalfYearStr();
-        }
-        return Dateutils.getDate(startTime);
+        DateTime parse = DateUtil.parse(startTime);
+        return DateUtil.format(parse,"yyyy-MM-dd HH:mm:ss");
     }
     public static String formatEndTime(String endTime) {
         if(StringUtils.isBlank(endTime)){
             endTime = Dateutils.getDate(new Date());
         }
-        if(endTime.length() <12 ){  //月，开始时间到1号 0点
-            endTime +=  " 23:59:59";
-        }
-        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) {
-        if(StringUtils.isBlank(startTime)){
-            return null;
-        }
-        if(startTime.length() > 12){
-            return startTime;
-        }
-        return startTime +" 00:00:00";
+        DateTime parse = DateUtil.parse(endTime);
+        return DateUtil.format(parse,"yyyy-MM-dd HH:mm:ss");
     }
 
-    public static String getEndTime(String endTime) {
-        if(StringUtils.isBlank(endTime)){
-            return null;
-        }
-        if(endTime.length() > 12){
-            return endTime;
-        }
-        return endTime +" 23:59:59";
-    }
 
     public static Long getLongTime(Date useStartTime, Date useEndTime,DateUnit dateUnit) {
         if(useStartTime == null || useEndTime ==  null){