Browse Source

修复APP分类显示事件:修复刷脸失败

zhuoning 3 years ago
parent
commit
9e4b8ce21f

+ 10 - 8
huimv-farm-video/src/main/java/com/huimv/video/dhicc/service/impl/ClientAllEventServiceImpl.java

@@ -79,9 +79,9 @@ public class ClientAllEventServiceImpl implements IClientAllEventService {
                 return getSellPigsChannel(paramsMap);
             case 6:
                 //人员门禁事件
-                paramsMap.put("alarmStartDateString",startDateText);
-                paramsMap.put("alarmEndDateString",endDateText);
-                paramsMap.put("openType",61);
+//                paramsMap.put("startSwingTime",startDateText);
+//                paramsMap.put("endSwingTime",endDateText);
+//                paramsMap.put("openType",61);
                 log.info("人员门禁事件输入参数>>"+paramsMap.toString());
                 return getEntranceGuard(paramsMap);
             default:
@@ -127,12 +127,13 @@ public class ClientAllEventServiceImpl implements IClientAllEventService {
 
     //人员门禁事件
     private R getEntranceGuard(Map<String, Object> paramsMap) throws ClientException {
-        String total = SendMassageGetPagePersonAlarm(paramsMap.get("alarmStartDateString").toString(),paramsMap.get("alarmEndDateString").toString());
-        if(total == null){
-            total = "0";
-        }
+//        String total = SendMassageGetPagePersonAlarm(paramsMap.get("alarmStartDateString").toString(),paramsMap.get("alarmEndDateString").toString());
+//        if(total == null){
+//            total = "0";
+//        }
         //
-        return R.ok("请求成功").put("data", getAccidentRecord(paramsMap)).put("total", Integer.parseInt(total)).put("isVideo",false);
+//        return R.ok("请求成功").put("data", getAccidentRecord(paramsMap)).put("total", Integer.parseInt(total)).put("isVideo",false);
+        return getAccidentRecord(paramsMap).put("isVideo",false);
     }
 
     //解析总页码
@@ -275,6 +276,7 @@ public class ClientAllEventServiceImpl implements IClientAllEventService {
 
     //刷脸失败记录 by Yangdi
     public R getAccidentRecord(Map<String, Object> params1 ) throws ClientException {
+        System.out.println("## params1>>"+params1);
         Integer farmId= (int) params1.get("farmId");
         if(farmId!=1){
             //返回为空数据