1

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

@@ -7,6 +7,7 @@ import com.alibaba.excel.ExcelWriter;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.tk.common.PageInfo;
 import com.fdkankan.tk.common.ResultData;
+import com.fdkankan.tk.request.DataParam;
 import com.fdkankan.tk.response.RoomListDataVo;
 import com.fdkankan.tk.response.UserMsgVo;
 import com.fdkankan.tk.service.DataCountService;
@@ -15,9 +16,7 @@ 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;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -69,36 +68,30 @@ 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){
-        return ResultData.ok(dataCountService.roomVisitData(getToken(),roomTitle,startTime,endTime));
+    @PostMapping("/roomVisitData")
+    public ResultData roomVisitData(@RequestBody DataParam param){
+        return ResultData.ok(dataCountService.roomVisitData(getToken(),param.getRoomTitle(),param.getStartTime(),param.getEndTime()));
     }
 
     /**
      * 整体数据列表
      */
-    @GetMapping("/roomDataList")
-    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){
-        Page<RoomListDataVo> page = dataCountService.roomDataList(getToken(), roomTitle, startTime, endTime, pageNum, pageSize);
+    @PostMapping("/roomDataList")
+    public ResultData roomDataList(@RequestBody DataParam param){
+        Page<RoomListDataVo> page = dataCountService.roomDataList(getToken(),
+                param.getRoomTitle(), param.getStartTime(), param.getEndTime(), param.getPageNum(), param.getPageSize());
         return ResultData.ok(PageInfo.PageInfo(page));
     }
 
     /**
      */
-    @GetMapping("/exportRoomData")
-    public void exportRoomData(@RequestParam(required = false) String roomTitle,
-                       @RequestParam(required = false) String startTime,
-                       @RequestParam(required = false) String endTime,
+    @PostMapping("/exportRoomData")
+    public void exportRoomData(@RequestBody DataParam param,
                        HttpServletRequest request,
                        HttpServletResponse response) throws Exception {
 
-        Page<RoomListDataVo> page = dataCountService.roomDataList(getToken(), roomTitle, startTime, endTime, 1, 9999);
+        Page<RoomListDataVo> page = dataCountService.roomDataList(getToken(),
+                param.getRoomTitle(),  param.getStartTime(),  param.getEndTime(), 1, 9999);
 
         ExcelWriter excelWriter = null;
         try {
@@ -118,27 +111,23 @@ 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,defaultValue = "1") Integer pageNum,
-                                   @RequestParam(required = false,defaultValue = "10") Integer pageSize){
-        Page<UserMsgVo> page = dataCountService.roomMsgList(getToken(), roomTitle, startTime, endTime, pageNum, pageSize);
+    @PostMapping("/roomMsgList")
+    public ResultData roomMsgList(@RequestBody DataParam param){
+        Page<UserMsgVo> page = dataCountService.roomMsgList(getToken(),
+                param.getRoomTitle(), param.getStartTime(), param.getEndTime(), param.getPageNum(), param.getPageSize());
         return ResultData.ok(PageInfo.PageInfo(page));
     }
 
 
     /**
      */
-    @GetMapping("/exportRoomMsg")
-    public void exportRoomMsg(@RequestParam(required = false) String roomTitle,
-                            @RequestParam(required = false) String startTime,
-                            @RequestParam(required = false) String endTime,
+    @PostMapping("/exportRoomMsg")
+    public void exportRoomMsg(@RequestBody DataParam param,
                             HttpServletRequest request,
                             HttpServletResponse response) throws Exception {
 
-        Page<UserMsgVo> pageInfo = dataCountService.roomMsgList(getToken(), roomTitle, startTime, endTime, 1, 9999);
+        Page<UserMsgVo> pageInfo = dataCountService.roomMsgList(getToken(),
+                param.getRoomTitle(),  param.getStartTime(),  param.getEndTime(), 1, 9999);
 
         ExcelWriter excelWriter = null;
         try {

src/main/java/com/fdkankan/tk/request/DataParam.java

@@ -0,0 +1,30 @@
+package com.fdkankan.tk.request;
+
+import com.fdkankan.tk.common.RequestBase;
+import com.fdkankan.tk.util.DateUtil;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class DataParam extends RequestBase {
+    private String roomTitle;
+    private String startTime;
+    private String endTime;
+    private List<Date> timeList;
+
+    public String getStartTime() {
+        if(timeList !=null && timeList.size() >1){
+            return DateUtil.getDate(timeList.get(0));
+        }
+        return startTime;
+    }
+
+    public String getEndTime() {
+        if(timeList !=null && timeList.size() >1){
+            return DateUtil.getDate(timeList.get(1));
+        }
+        return endTime;
+    }
+}