Browse Source

回放修改

wwh 2 years ago
parent
commit
acea81fa9d

+ 4 - 4
huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/controller/VideoRecorControllerSg.java

@@ -40,7 +40,7 @@ public class VideoRecorControllerSg {
     public R getVideoRecord(@RequestBody Map<String, Object> params1) throws ClientException, ParseException {
         String happendTime = (String) params1.get("happendTime");
         String channelId = (String) params1.get("channelId");
-        String farmId = (String) params1.get("farmId");
+        Integer farmId = (Integer) params1.get("farmId");
 
         Map<String, Object> value = new HashMap<>();
         value.put("nvrId", "");
@@ -62,7 +62,7 @@ public class VideoRecorControllerSg {
         value.put("startTime", befor);
 
 
-        if ("1".equals(farmId)) {
+        if (farmId==1) {
             System.out.println("曙光");
             VideoRecordRequestSg requestSg = new VideoRecordRequestSg(oauthConfigBaseInfo);
             requestSg.setClientMac("30:9c:23:79:40:08");
@@ -73,7 +73,7 @@ public class VideoRecorControllerSg {
             Object jsonObject1 = requestSg.doAction();
             System.out.println(jsonObject1);
             return R.ok().put("data",jsonObject1);
-        } else if ("22".equals(farmId)) {
+        } else if (farmId==22) {
             System.out.println("海宁");
             VideoRecordRequestHn requestHn = new VideoRecordRequestHn(oauthConfigBaseInfo02);
             requestHn.setClientMac("30:9c:23:79:40:08");
@@ -84,7 +84,7 @@ public class VideoRecorControllerSg {
             Object jsonObject1 = requestHn.doAction();
             System.out.println(jsonObject1);
             return R.ok().put("data",jsonObject1);
-        } else if ("21".equals(farmId)){
+        } else if (farmId==21){
             System.out.println("苍南");
             VideoRecordRequestCn requestCn = new VideoRecordRequestCn(oauthConfigBaseInfo03);
             requestCn.setClientMac("30:9c:23:79:40:08");