From bfc38cacac67f1bf2a5e857865d64cd49dc8175e Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 21 六月 2023 15:53:44 +0800
Subject: [PATCH] 增加通用光电报警接收 增加报警类型配置
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
index f99f6df..71b98b5 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
@@ -1,6 +1,8 @@
package com.ruoyi.alarm.globalAlarm.service.impl;
import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.alarm.cameraAlarm.domain.ArdAlarmCamera;
+import com.ruoyi.alarm.cameraAlarm.mapper.ArdAlarmCameraMapper;
import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmCondition;
import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmData;
import com.ruoyi.alarm.globalAlarm.service.IGlobalAlarmService;
@@ -53,6 +55,8 @@
@Resource
ArdAlarmTubeMapper ardAlarmTubeMapper;
@Resource
+ ArdAlarmCameraMapper ardAlarmCameraMapper;
+ @Resource
ArdTubesMapper ardTubesMapper;
@Resource
ArdAlarmpointsWellMapper ardAlarmpointsWellMapper;
@@ -91,6 +95,21 @@
.setAltitude(ardAlarmStealelec.getAltitude())
.setCount(ardAlarmStealelec.getCount())
.setTotal(ardAlarmStealelec.getTotal());
+ return globalAlarmData;
+ })
+ .collect(Collectors.toList());
+ case 1002:
+ List<ArdAlarmCamera> ardAlarmCameras = ardAlarmCameraMapper.selectListAllByCommand(refreshTime);
+ return ardAlarmCameras.stream()
+ .map(ardAlarmCamera -> {
+ GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+ .setId(ardAlarmCamera.getId())
+ .setName(ardAlarmCamera.getCameraName())
+ .setAlarmTime(ardAlarmCamera.getAlarmTime())
+ .setLongitude(ardAlarmCamera.getLongitude())
+ .setLatitude(ardAlarmCamera.getLatitude())
+ .setCount(ardAlarmCamera.getCount())
+ .setTotal(ardAlarmCamera.getTotal());
return globalAlarmData;
})
.collect(Collectors.toList());
@@ -232,6 +251,29 @@
}
//endregion
break;
+ case "camera":
+ //region 澶勭悊閫氱敤鍏夌數鎶ヨ
+ ArdAlarmCamera ardAlarmCamera = JSONObject.parseObject(message, ArdAlarmCamera.class);
+ ardAlarmCamera.setId(simpleUUID);
+ int aac = ardAlarmCameraMapper.insertArdAlarmCamera(ardAlarmCamera);
+ if (aac > 0) {
+ log.debug("camera鍏ュ簱鎴愬姛锛�" + ardAlarmCamera);
+ //寮曞褰曞儚
+ CameraCmd cmd = new CameraCmd();
+ cmd.setRecordBucketName("record");
+ cmd.setRecordObjectName("camera");
+ cmd.setOperator("sys_camera");
+ cmd.setExpired(30);
+ cmd.setTargetPosition(new double[]{ardAlarmCamera.getLongitude(), ardAlarmCamera.getLatitude()});
+ String url = guideCamera(cmd);
+ //鏇存柊褰曞儚
+ if (StringUtils.isNotEmpty(url)) {
+ ardAlarmCamera.setRecordUrl(url);
+ ardAlarmCameraMapper.updateArdAlarmCamera(ardAlarmCamera);
+ }
+ }
+ //endregion
+ break;
}
} catch (Exception ex) {
log.error("鎺ユ敹鎶ヨ寮傚父:" + ex.getMessage());
--
Gitblit v1.9.3