咳嗽管家

huimv-farm-video/src/main/java/com/huimv/video/dhicc/controller/ClientController/ClientAllEventController.java

@@ -28,7 +28,7 @@ import java.util.Map;
 
 
 @RestController
-@RequestMapping("/client/event/test")
+@RequestMapping("/client/event")
 public class ClientAllEventController {
     @Autowired
     private ISysTelecomEventService sysTelecomEventService;
@@ -129,6 +129,9 @@ public class ClientAllEventController {
     public R getEventBySort(@RequestParam(value = "farmId", required = true) Integer farmId, @RequestParam(value = "sort", required = true) Integer sort,
                             @RequestParam(value = "alarmStartDateString", required = true) String startDateText, @RequestParam(value = "alarmEndDateString", required = true) String endDateText,
                             @RequestParam(value = "pageNum", required = true) Integer pageNum, @RequestParam(value = "pageSize", required = true) Integer pageSize, HttpServletRequest request) throws ClientException {
+        System.out.println(request.toString());
+        System.out.println(request.getQueryString());
+
         //牧场id
         if (farmId != 1) {
             return R.ok("当前牧场无数据。").put("data", null);

huimv-farm-video/src/main/java/com/huimv/video/dhicc/controller/ClientController/ClientAllVideoPlayBack.java

@@ -31,7 +31,7 @@ import java.util.List;
 import java.util.Map;
 
 @RestController
-@RequestMapping("/clientAllVideoPlayBackTest")
+@RequestMapping("/clientAllVideoPlayBack")
 public class ClientAllVideoPlayBack {
 
     @Autowired

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/controller/ClientAllEventControllerTest.java

@@ -29,7 +29,7 @@ import java.util.Map;
 
 
 @RestController
-@RequestMapping("/client/event")
+@RequestMapping("/client/event/test")
 public class ClientAllEventControllerTest {
     @Autowired
     private ISysTelecomEventService sysTelecomEventService;

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/controller/ClientAllVideoPlayBackGTest.java

@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @RestController
-@RequestMapping("/clientAllVideoPlayBack")
+@RequestMapping("/clientAllVideoPlayBackTest")
 public class ClientAllVideoPlayBackGTest {
 
     @Autowired

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/controller/ClientPersonManageControllerTest.java

@@ -1,6 +1,7 @@
 package com.huimv.video.dhicc.test.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.dahuatech.icc.exception.ClientException;
 import com.huimv.common.utils.StringUtilsWork;
 import com.huimv.video.dhicc.result.R;
@@ -29,7 +30,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController
-@RequestMapping("/personTest")
+@RequestMapping("personTest")
 public class ClientPersonManageControllerTest {
     @Autowired
     private OauthConfigBaseInfo oauthConfigBaseInfo;
@@ -354,11 +355,15 @@ public class ClientPersonManageControllerTest {
     public Object getAccidentRecord1(@RequestBody Map<String, Object> params) throws ClientException {
         Integer farmId = (int) params.get("farmId");
         Object action = null;
+        String startSwingTime = (String)params.get("startSwingTime");
         if (farmId == 1) {
             System.out.println("shuguang");
             ClientPersonDoorRecordRequestSg requestSg = new ClientPersonDoorRecordRequestSg(oauthConfigBaseInfo);
             requestSg.setPageNum(1);
             requestSg.setPageSize("20");
+            if (StringUtils.isNotBlank(startSwingTime)){
+                requestSg.setStartSwingTime(startSwingTime);
+            }
             Object action1 = requestSg.doAction();
             action=action1;
         }
@@ -367,6 +372,9 @@ public class ClientPersonManageControllerTest {
             ClientPersonDoorRecordRequestHn requestHn = new ClientPersonDoorRecordRequestHn(oauthConfigBaseInfo02);
             requestHn.setPageNum(1);
             requestHn.setPageSize("20");
+            if (StringUtils.isNotBlank(startSwingTime)){
+                requestHn.setStartSwingTime(startSwingTime);
+            }
             Object action1 = requestHn.doAction();
             action=action1;
         }
@@ -375,6 +383,9 @@ public class ClientPersonManageControllerTest {
             ClientPersonDoorRecordRequestCn requestCn = new ClientPersonDoorRecordRequestCn(oauthConfigBaseInfo03);
             requestCn.setPageNum(1);
             requestCn.setPageSize("20");
+            if (StringUtils.isNotBlank(startSwingTime)){
+                requestCn.setStartSwingTime(startSwingTime);
+            }
             Object action1 = requestCn.doAction();
             action=action1;
         }

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/Person/Hn/ClientPersonDoorRecordRequestHn.java

@@ -29,7 +29,6 @@ public class ClientPersonDoorRecordRequestHn extends BaseRequest02<Object> {
 
 
 
-
     public ClientPersonDoorRecordRequestHn() {
     }
 
@@ -59,7 +58,7 @@ public class ClientPersonDoorRecordRequestHn extends BaseRequest02<Object> {
 
         Map<String, Object> map = new HashMap<>();
         map.put("pageNum", this.pageNum);
-        map.put("startSwingTime", this.pageSize);
+        map.put("pageSize", this.pageSize);
         map.put("startSwingTime", this.startSwingTime);
         this.setBody(JSON.toJSONString(map));