|
@@ -3,6 +3,7 @@ package com.ozs.controller.upload;
|
|
|
import com.alibaba.fastjson2.JSON;
|
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+import com.ozs.common.core.domain.entity.SysDictData;
|
|
|
import com.ozs.common.core.redis.RedisCache;
|
|
|
import com.ozs.common.utils.ApiTokenUtils;
|
|
|
import com.ozs.common.utils.ChineseToPingyin;
|
|
@@ -57,6 +58,8 @@ import com.ozs.service.MsgAlarmService;
|
|
|
import com.ozs.service.SvcAddressService;
|
|
|
import com.ozs.service.TerminalIgnoreAlarmService;
|
|
|
import com.ozs.service.VehiclePositionService;
|
|
|
+import com.ozs.system.service.ISysDictDataService;
|
|
|
+import com.ozs.system.service.ISysDictTypeService;
|
|
|
import com.ozs.utils.CameraUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
@@ -81,6 +84,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;
|
|
|
|
|
|
/**
|
|
@@ -122,8 +126,6 @@ public class GeoHazardMonitorTokenController {
|
|
|
@Autowired
|
|
|
private BaseRailwayManagementService baseRailwayManagementService;
|
|
|
@Autowired
|
|
|
- private RedisCache redisCache;
|
|
|
- @Autowired
|
|
|
private BaseTerminalService baseTerminalService;
|
|
|
@Autowired
|
|
|
private CameraUtil cameraUtil;
|
|
@@ -137,6 +139,8 @@ public class GeoHazardMonitorTokenController {
|
|
|
private String env;
|
|
|
@Value("${sdk.publish}")
|
|
|
private String sdkUrl;
|
|
|
+ @Autowired
|
|
|
+ private ISysDictTypeService dictTypeService;
|
|
|
|
|
|
/**
|
|
|
* 获取web访问令牌
|
|
@@ -351,7 +355,8 @@ public class GeoHazardMonitorTokenController {
|
|
|
log.info("result:{}", result);
|
|
|
|
|
|
List<String> collect = baseCameraManagementList.stream().map(BaseCameraManagement::getCameraCode).collect(Collectors.toList());
|
|
|
-// CompletableFuture.runAsync(() ->cameraUtil.playbackURLs(collect));
|
|
|
+ List<SysDictData> data = dictTypeService.selectDictDataByType("alarm_play_time_value");
|
|
|
+ CompletableFuture.runAsync(() ->cameraUtil.playbackURLs(collect,data.get(0).getDictValue()));
|
|
|
} else {
|
|
|
BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarmVice);
|
|
|
msgAlarmVice.setCreateBy(admin.getUserId());
|