|
@@ -133,6 +133,9 @@ public class ClientAllEventServiceImpl implements IClientAllEventService {
|
|
// }
|
|
// }
|
|
//
|
|
//
|
|
// 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);
|
|
|
|
+ getAccidentRecord(paramsMap);
|
|
|
|
+
|
|
|
|
+
|
|
return getAccidentRecord(paramsMap).put("isVideo",false);
|
|
return getAccidentRecord(paramsMap).put("isVideo",false);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -308,7 +311,7 @@ public class ClientAllEventServiceImpl implements IClientAllEventService {
|
|
GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
|
|
GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
|
|
JSONObject jsonObject = JSONObject.fromObject(generalResponse.getResult());
|
|
JSONObject jsonObject = JSONObject.fromObject(generalResponse.getResult());
|
|
GetResponse getResponse = new GetResponse();
|
|
GetResponse getResponse = new GetResponse();
|
|
- return R.ok("请求成功").put("data", jsonObject ).put("total", getResponse.SendMassageGetPagePersonAlarm((String) params1.get("startSwingTime"),(String) params1.get("endSwingTime")));
|
|
|
|
|
|
+ return R.ok("请求成功").put("result", jsonObject ).put("total", getResponse.SendMassageGetPagePersonAlarm((String) params1.get("startSwingTime"),(String) params1.get("endSwingTime")));
|
|
}
|
|
}
|
|
|
|
|
|
//查询人员违规记录 by Yangdi
|
|
//查询人员违规记录 by Yangdi
|