|
@@ -33,6 +33,7 @@ import com.ozs.entity.vo.CameraVo;
|
|
|
import com.ozs.entity.vo.Files;
|
|
|
import com.ozs.entity.vo.HeartbeatVo;
|
|
|
import com.ozs.entity.vo.ParameterVo;
|
|
|
+import com.ozs.entity.vo.PlaybackVo;
|
|
|
import com.ozs.entity.vo.QueryAlarmVo;
|
|
|
import com.ozs.entity.vo.ReleaseAlarmVo;
|
|
|
import com.ozs.entity.vo.ReqMsgAlarmVo;
|
|
@@ -85,6 +86,7 @@ import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.concurrent.CompletableFuture;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -235,13 +237,11 @@ public class GeoHazardMonitorTokenController {
|
|
|
String key = split[split.length - 1];
|
|
|
String s = SM4Utils.decryptData_ECB(parameterVo.getParameter(), key);
|
|
|
ReqMsgAlarmVo reqMsgAlarmVo = JSON.parseObject(s, ReqMsgAlarmVo.class);
|
|
|
- if (!ObjectUtils.isEmpty(reqMsgAlarmVo.getAlarmAttr())) {
|
|
|
- if (!reqMsgAlarmVo.getAlarmAttr().matches(PATTERN)) {
|
|
|
+ if (ObjectUtils.isEmpty(reqMsgAlarmVo.getAlarmAttr())) {
|
|
|
jsonObject.put("resultCode", 0);
|
|
|
jsonObject.put("message", "失败");
|
|
|
jsonObject.put("data", "你填写的报警病害属性不符合规则!!!");
|
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
|
|
|
- }
|
|
|
}
|
|
|
if (!reqMsgAlarmVo.getAlarmMile().toString().matches(PATTERNS)) {
|
|
|
jsonObject.put("resultCode", 0);
|
|
@@ -301,6 +301,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
wrapper.ge(BaseCameraManagement::getEndMile, reqMsgAlarmVo.getAlarmMile());
|
|
|
wrapper.eq(BaseCameraManagement::getRailwayCode, reqMsgAlarmVo.getAlarmRailway());
|
|
|
wrapper.eq(BaseCameraManagement::getLineDir, reqMsgAlarmVo.getLineDir());
|
|
|
+ wrapper.eq(BaseCameraManagement::getEnableOrNot, 1);
|
|
|
}
|
|
|
List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(wrapper);
|
|
|
log.info("baseCameraManagement:{}", baseCameraManagementList);
|
|
@@ -359,33 +360,34 @@ public class GeoHazardMonitorTokenController {
|
|
|
msgAlarmVice.setAlarmTime(new Date(reqMsgAlarmVo.getAlarmTime()));
|
|
|
msgAlarmFrequencyService.save(msgAlarmVice);
|
|
|
webSocketCommon.publish(msgAlarm);
|
|
|
- for (BaseCameraManagement baseCameraManagement : baseCameraManagementList) {
|
|
|
- String invite = CameraUtil.invite(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
|
|
|
- if ("304".equals(invite) || "200".equals(invite)) {
|
|
|
- String start = HttpUtils.sendGet(CameraUtil.startRecording(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel()));
|
|
|
- log.info("startRecording------------" + start);
|
|
|
- if (start.startsWith(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel())) {
|
|
|
- baseCameraManagement.setTaskId(start);
|
|
|
- baseCameraManagement.setUpdateBy(admin.getUserId());
|
|
|
- } else {
|
|
|
- jsonObject.put("resultCode", 0);
|
|
|
- jsonObject.put("message", "失败");
|
|
|
- jsonObject.put("data", "视频录制失败:请确认流是否存在!!!");
|
|
|
- return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
|
|
|
- }
|
|
|
- if (!baseCameraManagementService.updateById(baseCameraManagement)) {
|
|
|
- jsonObject.put("resultCode", 0);
|
|
|
- jsonObject.put("message", "失败");
|
|
|
- jsonObject.put("data", "开启录制视频失败!!!");
|
|
|
- return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
|
|
|
- }
|
|
|
- } else {
|
|
|
- jsonObject.put("resultCode", 0);
|
|
|
- jsonObject.put("message", "失败");
|
|
|
- jsonObject.put("data", "视频邀约失败,视频中心没有该相机编码或通道编码的摄像头!!!");
|
|
|
- return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
|
|
|
- }
|
|
|
- }
|
|
|
+ List<String> collect = baseCameraManagementList.stream().map(BaseCameraManagement::getCameraCode).collect(Collectors.toList());
|
|
|
+// CompletableFuture.runAsync(() ->cameraUtil.playbackURLs(collect));
|
|
|
+// String invite = CameraUtil.invite(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
|
|
|
+// if ("304".equals(invite) || "200".equals(invite)) {
|
|
|
+// String start = HttpUtils.sendGet(CameraUtil.startRecording(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel()));
|
|
|
+// log.info("startRecording------------" + start);
|
|
|
+// if (start.startsWith(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel())) {
|
|
|
+// baseCameraManagement.setTaskId(start);
|
|
|
+// baseCameraManagement.setUpdateBy(admin.getUserId());
|
|
|
+// } else {
|
|
|
+// jsonObject.put("resultCode", 0);
|
|
|
+// jsonObject.put("message", "失败");
|
|
|
+// jsonObject.put("data", "视频录制失败:请确认流是否存在!!!");
|
|
|
+// return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
|
|
|
+// }
|
|
|
+// if (!baseCameraManagementService.updateById(baseCameraManagement)) {
|
|
|
+// jsonObject.put("resultCode", 0);
|
|
|
+// jsonObject.put("message", "失败");
|
|
|
+// jsonObject.put("data", "开启录制视频失败!!!");
|
|
|
+// return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
|
|
|
+// }
|
|
|
+// } else {
|
|
|
+// jsonObject.put("resultCode", 0);
|
|
|
+// jsonObject.put("message", "失败");
|
|
|
+// jsonObject.put("data", "视频邀约失败,视频中心没有该相机编码或通道编码的摄像头!!!");
|
|
|
+// return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
|
|
|
+// }
|
|
|
+
|
|
|
|
|
|
} else {
|
|
|
BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarmVice);
|