大屏修改

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/ScreenTestController/ScreenIndexDataTestController.java

@@ -110,25 +110,25 @@ public class ScreenIndexDataTestController {
         //苍南
         if ("21".equals(farmId)){
             //人员刷脸成功
-            map.put("personPassSuccess", getResponse.SendMassageGetPagePersonAlarm(formatB, formatA,null,61,oauthConfigBaseInfo));
+            map.put("personPassSuccess", getResponse.SendMassageGetPagePersonAlarm03(formatB, formatA,null,61,oauthConfigBaseInfo03));
             //人员刷脸失败
-            map.put("personPassFail", getResponse.SendMassageGetPagePersonAlarm(formatB, formatA,0,null,oauthConfigBaseInfo));
+            map.put("personPassFail", getResponse.SendMassageGetPagePersonAlarm03(formatB, formatA,0,null,oauthConfigBaseInfo03));
             //车辆出数量统计
-            map.put("carPassOut", getResponse.carCount(formatB, formatA,"9",oauthConfigBaseInfo));
+            map.put("carPassOut", getResponse.carCount03(formatB, formatA,"9",oauthConfigBaseInfo03));
             //车辆进
-            map.put("carPassIn", getResponse.carCount(formatB, formatA,"8",oauthConfigBaseInfo));
+            map.put("carPassIn", getResponse.carCount03(formatB, formatA,"8",oauthConfigBaseInfo03));
             //死猪
-            map.put("tadaySiZhu", getResponse.SendMassageXixiaoPerson(formatB, formatA,oauthConfigBaseInfo,CommonConstant.SIZhuChannle));
+            map.put("tadaySiZhu", getResponse.SendMassageXixiaoPerson03(formatB, formatA,oauthConfigBaseInfo03,CommonConstant.SIZhuChannle));
             //七日死猪事件
-            map.put("SevenDaySiZhu", getResponse.SendMassageXixiaoPerson(formatC, formatA,oauthConfigBaseInfo,CommonConstant.SIZhuChannle));
+            map.put("SevenDaySiZhu", getResponse.SendMassageXixiaoPerson03(formatC, formatA,oauthConfigBaseInfo03,CommonConstant.SIZhuChannle));
             //今日洗消
-            map.put("tadayXiXiao", getResponse.SendMassageXixiaoPerson(formatB, formatA,oauthConfigBaseInfo, CommonConstant.XixiaoChannle));
+            map.put("tadayXiXiao", getResponse.SendMassageXixiaoPerson03(formatB, formatA,oauthConfigBaseInfo03, CommonConstant.XixiaoChannle));
             //七日洗消事件
-            map.put("SevenDayXIxiao", getResponse.SendMassageXixiaoPerson(formatC, formatA,oauthConfigBaseInfo, CommonConstant.XixiaoChannle));
+            map.put("SevenDayXIxiao", getResponse.SendMassageXixiaoPerson03(formatC, formatA,oauthConfigBaseInfo03, CommonConstant.XixiaoChannle));
             //大门七日记录数
-            map.put("SevenDayGate", getResponse.SendMassageXixiaoPerson(formatC, formatA,oauthConfigBaseInfo,CommonConstant.DoorChannle));
+            map.put("SevenDayGate", getResponse.SendMassageXixiaoPerson03(formatC, formatA,oauthConfigBaseInfo03,CommonConstant.DoorChannle));
             //大门今日记录数
-            map.put("tadayGate", getResponse.SendMassageXixiaoPerson(formatB, formatA,oauthConfigBaseInfo,CommonConstant.DoorChannle));
+            map.put("tadayGate", getResponse.SendMassageXixiaoPerson03(formatB, formatA,oauthConfigBaseInfo03,CommonConstant.DoorChannle));
 
             return R.ok("请求成功").put("data", map);
         }

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/ScreenTestController/ScreenPersonTestController.java

@@ -200,13 +200,9 @@ public class ScreenPersonTestController {
             Collections.reverse(result);
             return R.ok("请求成功").put("data", result);
         }
-
-
-
         return R.ok("当前牧场无设备").put("data", null);
     }
 
-
     //人员正常通行与异常通行的数据
     @RequestMapping("/count_person_record_fail_success")
     public R count_person_record_fail_success(HttpServletRequest request, @RequestParam(name = "farmId") String farmId) throws ClientException, ParseException {
@@ -232,14 +228,23 @@ public class ScreenPersonTestController {
         c.add(Calendar.DATE, -1);
         Date B = c.getTime();
         String formatB = format.format(B);
-
         Map map1 = new HashMap();
-        map1.put("value1", getResponse.SendMassageGetPagePerson(formatB, formatA));
-//        map1.put("value2", getResponse.SendMassageGetPagePersonAlarm(formatB, formatA,oauthConfigBaseInfo));
-
-        System.out.println();
-        return R.ok("请求成功").put("data", map1);
-
+        if ("1".equals(farmId)){
+            map1.put("value1", getResponse.SendMassageGetPagePersonAlarm(formatB, formatA,null,61,oauthConfigBaseInfo));
+            map1.put("value2", getResponse.SendMassageGetPagePersonAlarm(formatB, formatA,0,null,oauthConfigBaseInfo));
+            return R.ok("请求成功").put("data", map1);
+        }
+        if ("22".equals(farmId)){
+            map1.put("value1", getResponse.SendMassageGetPagePersonAlarm02(formatB, formatA,null,61,oauthConfigBaseInfo02));
+            map1.put("value2", getResponse.SendMassageGetPagePersonAlarm02(formatB, formatA,0,null,oauthConfigBaseInfo02));
+            return R.ok("请求成功").put("data", map1);
+        }
+        if ("21".equals(farmId)){
+            map1.put("value1", getResponse.SendMassageGetPagePersonAlarm03(formatB, formatA,null,61,oauthConfigBaseInfo03));
+            map1.put("value2", getResponse.SendMassageGetPagePersonAlarm03(formatB, formatA,0,null,oauthConfigBaseInfo03));
+            return R.ok("请求成功").put("data", map1);
+        }
+        return R.ok("当前牧场无设备").put("data", null);
     }
 
     public String splitTimeByHoure(Date date) throws ParseException {