|
@@ -79,9 +79,9 @@ public class ClientAllEventServiceImpl implements IClientAllEventService {
|
|
return getSellPigsChannel(paramsMap);
|
|
return getSellPigsChannel(paramsMap);
|
|
case 6:
|
|
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());
|
|
log.info("人员门禁事件输入参数>>"+paramsMap.toString());
|
|
return getEntranceGuard(paramsMap);
|
|
return getEntranceGuard(paramsMap);
|
|
default:
|
|
default:
|
|
@@ -127,12 +127,13 @@ public class ClientAllEventServiceImpl implements IClientAllEventService {
|
|
|
|
|
|
//人员门禁事件
|
|
//人员门禁事件
|
|
private R getEntranceGuard(Map<String, Object> paramsMap) throws ClientException {
|
|
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
|
|
//刷脸失败记录 by Yangdi
|
|
public R getAccidentRecord(Map<String, Object> params1 ) throws ClientException {
|
|
public R getAccidentRecord(Map<String, Object> params1 ) throws ClientException {
|
|
|
|
+ System.out.println("## params1>>"+params1);
|
|
Integer farmId= (int) params1.get("farmId");
|
|
Integer farmId= (int) params1.get("farmId");
|
|
if(farmId!=1){
|
|
if(farmId!=1){
|
|
//返回为空数据
|
|
//返回为空数据
|