|
|
@@ -99,6 +99,7 @@ public class AlarmEventController extends BaseController {
|
|
|
|
|
|
/**
|
|
|
* 大华火事件
|
|
|
+ *
|
|
|
* @param jsonStr
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -108,6 +109,10 @@ public class AlarmEventController extends BaseController {
|
|
|
DaHuaFireEventVO daHuaFireEventVO = new DaHuaFireEventVO();
|
|
|
try {
|
|
|
daHuaFireEventVO = JSONObject.parseObject(jsonStr, DaHuaFireEventVO.class);
|
|
|
+ Long type = MapUtils.getLong(daHuaFireEventVO.getInfo(), "alarmType");
|
|
|
+ if (type == 205668 || type == 205669) {
|
|
|
+ logger.info("205668205669=" + jsonStr);
|
|
|
+ }
|
|
|
eventCode = alarmEventService.insertDaHuaEvent(daHuaFireEventVO);
|
|
|
} catch (Exception e) {
|
|
|
logger.error(e.getMessage());
|
|
|
@@ -304,11 +309,12 @@ public class AlarmEventController extends BaseController {
|
|
|
|
|
|
/**
|
|
|
* 海康-烟雾报警数据
|
|
|
+ *
|
|
|
* @param jsonArray
|
|
|
* @return
|
|
|
*/
|
|
|
@PostMapping("/smokeReport")
|
|
|
- public AjaxResult testReportJsonObj(@RequestBody JSONArray jsonArray){
|
|
|
+ public AjaxResult testReportJsonObj(@RequestBody JSONArray jsonArray) {
|
|
|
logger.info("海康-烟雾报警数据--->: {}", jsonArray);
|
|
|
String eventCode = null;
|
|
|
JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(jsonArray.get(0)));
|