Skip to content

谢明辉 / fanxing3

Go to a project
Commit bbef25e5 by xmh
Options

<fix> 如果设备使用中,则不允许修改设备编号 

<fix> 修正上传视频录像格式不正确时的删除逻辑
<fix> 分析结果数据概览列出每个任务的分析数据情况
<fix> 添加任务时检测运行配置
<refactor> 优化任务下发和停止逻辑优化
<fix> 资源使用概览不再统计离线服务的资源使用情况
<feat> 在任务下发或任务停止的定时任务执行时不进行服务资源检测
1 parent bc41bdbc
Inline Side-by-side
Showing 9 changed files with 58 additions and 35 deletions
fanxing-ops/src/main/java/com/viontech/fanxing/ops/service/impl/ChannelServiceImpl.java
...@@ -106,6 +106,13 @@ public class ChannelServiceImpl extends BaseServiceImpl<Channel> implements Chan ...@@ -106,6 +106,13 @@ public class ChannelServiceImpl extends BaseServiceImpl<Channel> implements Chan
if (channel == null) { if (channel == null) {
throw new RuntimeException("资源不存在"); throw new RuntimeException("资源不存在");
} }
// 如果有任务存在并且改了 channelUnid 则报异常
JsonMessageUtil.JsonMessage<List<Task>> res = taskFeignClient.getTaskByChannelUnid(channel.getChannelUnid());
List<Task> data = res.getData();
if (data != null && data.size() > 0 && !channel.getChannelUnid().equals(vo.getChannelUnid())) {
throw new RuntimeException("设备使用中,不能更改设备编号");
}
vo.setId(id); vo.setId(id);
vo.setUnid(channel.getUnid()); vo.setUnid(channel.getUnid());
vo.setType(channel.getType()); vo.setType(channel.getType());
...@@ -117,8 +124,6 @@ public class ChannelServiceImpl extends BaseServiceImpl<Channel> implements Chan ...@@ -117,8 +124,6 @@ public class ChannelServiceImpl extends BaseServiceImpl<Channel> implements Chan
// 如果对 streamPath 进行更新,需要同时更新任务信息 // 如果对 streamPath 进行更新,需要同时更新任务信息
if (vo.getStreamPath() != null && !channel.getStreamPath().equals(vo.getChannelUnid())) { if (vo.getStreamPath() != null && !channel.getStreamPath().equals(vo.getChannelUnid())) {
log.info("streamPath 变更,需要更新任务信息"); log.info("streamPath 变更,需要更新任务信息");
JsonMessageUtil.JsonMessage<List<Task>> res = taskFeignClient.getTaskByChannelUnid(channel.getChannelUnid());
List<Task> data = res.getData();
if (data != null && data.size() > 0) { if (data != null && data.size() > 0) {
log.info("需要更新的任务数量:{}", data.size()); log.info("需要更新的任务数量:{}", data.size());
for (Task item : data) { for (Task item : data) {
......
fanxing-ops/src/main/java/com/viontech/fanxing/ops/service/impl/ContentServiceImpl.java
...@@ -60,7 +60,7 @@ public class ContentServiceImpl extends BaseServiceImpl<Content> implements Cont ...@@ -60,7 +60,7 @@ public class ContentServiceImpl extends BaseServiceImpl<Content> implements Cont
ContentExample contentExample = new ContentExample(); ContentExample contentExample = new ContentExample();
contentExample.createCriteria().andTypeEqualTo(TYPE_PLATFORM_CONFIG).andNameEqualTo(NAME_TIMING_CONFIG); contentExample.createCriteria().andTypeEqualTo(TYPE_PLATFORM_CONFIG).andNameEqualTo(NAME_TIMING_CONFIG);
addOrUpdate(TYPE_PLATFORM_CONFIG, NAME_TIMING_CONFIG, jsonObject.toJSONString()); addOrUpdate(TYPE_PLATFORM_CONFIG, NAME_TIMING_CONFIG, jsonObject.toJSONString());
// todo 发给运维服务 // 发给运维服务
List<OpsServer> opsServers = opsServerService.listAll(); List<OpsServer> opsServers = opsServerService.listAll();
for (OpsServer opsServer : opsServers) { for (OpsServer opsServer : opsServers) {
opsServerService.distributeTimingConfig(opsServer, jsonObject); opsServerService.distributeTimingConfig(opsServer, jsonObject);
......
fanxing-ops/src/main/java/com/viontech/fanxing/ops/service/main/OpsServerService.java
package com.viontech.fanxing.ops.service.main; package com.viontech.fanxing.ops.service.main;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.RandomUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.viontech.fanxing.commons.config.VionConfig; import com.viontech.fanxing.commons.config.VionConfig;
...@@ -7,6 +8,7 @@ import com.viontech.fanxing.commons.feign.TaskFeignClient; ...@@ -7,6 +8,7 @@ import com.viontech.fanxing.commons.feign.TaskFeignClient;
import com.viontech.fanxing.commons.model.main.VaServerInfo; import com.viontech.fanxing.commons.model.main.VaServerInfo;
import com.viontech.fanxing.ops.model.OpsServer; import com.viontech.fanxing.ops.model.OpsServer;
import com.viontech.keliu.util.JsonMessageUtil; import com.viontech.keliu.util.JsonMessageUtil;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RBucket; import org.redisson.api.RBucket;
import org.redisson.api.RKeys; import org.redisson.api.RKeys;
...@@ -95,12 +97,14 @@ public class OpsServerService { ...@@ -95,12 +97,14 @@ public class OpsServerService {
} }
} }
@SneakyThrows
public void updateVaServer(String[] devIdArr, MultipartFile file) { public void updateVaServer(String[] devIdArr, MultipartFile file) {
// todo 保存文件到本地,根据 devIdArr 获取对应分析服务,再根据分析服务的 ip 获取对应的运维服务,下发文件地址和升级信息 // 保存文件到本地,根据 devIdArr 获取对应分析服务,再根据分析服务的 ip 获取对应的运维服务,下发文件地址和升级信息
log.info("收到升级请求,目标服务:{},文件:{}", Arrays.toString(devIdArr), file.getName()); log.info("收到升级请求,目标服务:{},文件:{}", Arrays.toString(devIdArr), file.getName());
File local = new File(vionConfig.getImage().getPath() + "/temp/" + RandomUtil.randomString(6) + "_" + file.getOriginalFilename()); File local = new File(vionConfig.getImage().getPath() + "/temp/" + RandomUtil.randomString(6) + "_" + file.getOriginalFilename());
local.getParentFile().mkdirs(); local.getParentFile().mkdirs();
String imageUrl = vionConfig.getImage().getUrlPrefix() + "/temp/" + local.getName(); String imageUrl = "http://RegAddress/api/images/temp/" + local.getName();
FileUtil.writeFromStream(file.getInputStream(), local);
Map<String, List<String>> ipContainerNameMap = getIpContainerNameMap(devIdArr); Map<String, List<String>> ipContainerNameMap = getIpContainerNameMap(devIdArr);
List<CompletableFuture<String>> futures = new ArrayList<>(); List<CompletableFuture<String>> futures = new ArrayList<>();
for (Map.Entry<String, List<String>> entry : ipContainerNameMap.entrySet()) { for (Map.Entry<String, List<String>> entry : ipContainerNameMap.entrySet()) {
...@@ -138,10 +142,8 @@ public class OpsServerService { ...@@ -138,10 +142,8 @@ public class OpsServerService {
return null; return null;
} }
}).collect(Collectors.toList()); }).collect(Collectors.toList());
// todo 收到任务id后的逻辑还没有
log.info("升级任务id:{}", taskIds);
} }
private void addOrUpdateOpsServer(OpsServer opsServer) { private void addOrUpdateOpsServer(OpsServer opsServer) {
......
fanxing-ops/src/main/java/com/viontech/fanxing/ops/service/main/VideoService.java
...@@ -85,10 +85,9 @@ public class VideoService { ...@@ -85,10 +85,9 @@ public class VideoService {
FileUtils.copyToFile(file.getInputStream(), video); FileUtils.copyToFile(file.getInputStream(), video);
checkVideoType(video); checkVideoType(video);
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e);
} finally {
video.delete(); video.delete();
video.deleteOnExit(); video.deleteOnExit();
throw new RuntimeException(e);
} }
double videoLength = (double) video.length(); double videoLength = (double) video.length();
double mbSize = videoLength / 1024 / 1024; double mbSize = videoLength / 1024 / 1024;
......
fanxing-query/src/main/java/com/viontech/fanxing/query/service/impl/TrafficServiceImpl.java
...@@ -70,12 +70,24 @@ public class TrafficServiceImpl extends BaseServiceImpl<Traffic> implements Traf ...@@ -70,12 +70,24 @@ public class TrafficServiceImpl extends BaseServiceImpl<Traffic> implements Traf
@Override @Override
public JSONObject dataOverview(Date date, Long taskId, Integer page, Integer pageSize) { public JSONObject dataOverview(Date date, Long taskId, Integer page, Integer pageSize) {
// todo 还需要加有效分析时长(effectiveAnalysisTime) 和 异常次数(exceptionNum)
Map<Long, Task> taskMap = taskClientService.taskMap(); Map<Long, Task> taskMap = taskClientService.taskMap();
Date min = DateUtil.setDayMinTime(date); Date min = DateUtil.setDayMinTime(date);
Date max = DateUtil.setDayMaxTime(date); Date max = DateUtil.setDayMaxTime(date);
HashMap<Long, DataOverViewModel> resultMap = new HashMap<>(); HashMap<Long, DataOverViewModel> resultMap = new HashMap<>();
// 每个任务都给要列出来
for (Map.Entry<Long, Task> entry : taskMap.entrySet()) {
if (taskId != null && !entry.getKey().equals(taskId)) {
continue;
}
resultMap.computeIfAbsent(entry.getKey(), x -> {
DataOverViewModel temp = new DataOverViewModel();
temp.setTaskId(x);
temp.setTaskName(entry.getValue().getName());
return temp;
});
}
TrafficExample trafficExample = new TrafficExample(); TrafficExample trafficExample = new TrafficExample();
TrafficExample.Criteria criteria = trafficExample.createCriteria().andEventTimeGreaterThanOrEqualTo(min).andEventTimeLessThanOrEqualTo(max); TrafficExample.Criteria criteria = trafficExample.createCriteria().andEventTimeGreaterThanOrEqualTo(min).andEventTimeLessThanOrEqualTo(max);
if (taskId != null) { if (taskId != null) {
...@@ -142,6 +154,7 @@ public class TrafficServiceImpl extends BaseServiceImpl<Traffic> implements Traf ...@@ -142,6 +154,7 @@ public class TrafficServiceImpl extends BaseServiceImpl<Traffic> implements Traf
Map<Long, String> task_id_unid_map = taskMap.values().stream().collect(Collectors.toMap(Task::getId, Task::getUnid, (x, y) -> x)); Map<Long, String> task_id_unid_map = taskMap.values().stream().collect(Collectors.toMap(Task::getId, Task::getUnid, (x, y) -> x));
Map<String, JSONObject> taskStateMap = taskClientService.taskStateMap(); Map<String, JSONObject> taskStateMap = taskClientService.taskStateMap();
// 加上有效分析时长和异常次数
Collection<DataOverViewModel> values = resultMap.values(); Collection<DataOverViewModel> values = resultMap.values();
List<DataOverViewModel> collect = values.stream() List<DataOverViewModel> collect = values.stream()
.filter(x -> x.getTaskId() != null) .filter(x -> x.getTaskId() != null)
...@@ -162,7 +175,9 @@ public class TrafficServiceImpl extends BaseServiceImpl<Traffic> implements Traf ...@@ -162,7 +175,9 @@ public class TrafficServiceImpl extends BaseServiceImpl<Traffic> implements Traf
jsonObject.put("total", collect.size()); jsonObject.put("total", collect.size());
jsonObject.put("page", page); jsonObject.put("page", page);
jsonObject.put("pageSize", pageSize); jsonObject.put("pageSize", pageSize);
jsonObject.put("data", partition.get(page - 1)); if (partition != null && partition.size() > 0) {
jsonObject.put("data", partition.get(page - 1));
}
return jsonObject; return jsonObject;
} }
......
fanxing-task/src/main/java/com/viontech/fanxing/task/controller/web/TaskController.java
...@@ -79,6 +79,7 @@ public class TaskController extends TaskBaseController { ...@@ -79,6 +79,7 @@ public class TaskController extends TaskBaseController {
@PostMapping @PostMapping
@Override @Override
public Object add(@RequestBody TaskVo taskVo) { public Object add(@RequestBody TaskVo taskVo) {
Assert.notNull(taskVo.getRuntimeType(), "运行配置不能为空");
try { try {
taskVo = taskService.addTask(taskVo.getModel()); taskVo = taskService.addTask(taskVo.getModel());
opsClientService.addLog("添加任务:" + taskVo.getName()); opsClientService.addLog("添加任务:" + taskVo.getName());
......
fanxing-task/src/main/java/com/viontech/fanxing/task/runner/TaskRunner.java
...@@ -2,9 +2,9 @@ package com.viontech.fanxing.task.runner; ...@@ -2,9 +2,9 @@ package com.viontech.fanxing.task.runner;
import com.viontech.fanxing.commons.constant.TaskStatus; import com.viontech.fanxing.commons.constant.TaskStatus;
import com.viontech.fanxing.commons.model.Task; import com.viontech.fanxing.commons.model.Task;
import com.viontech.fanxing.commons.model.main.VaServerInfo;
import com.viontech.fanxing.commons.service.RedisService; import com.viontech.fanxing.commons.service.RedisService;
import com.viontech.fanxing.task.model.TaskData; import com.viontech.fanxing.task.model.TaskData;
import com.viontech.fanxing.commons.model.main.VaServerInfo;
import com.viontech.fanxing.task.service.TaskDataService; import com.viontech.fanxing.task.service.TaskDataService;
import com.viontech.fanxing.task.service.VAServerService; import com.viontech.fanxing.task.service.VAServerService;
import com.viontech.fanxing.task.service.adapter.TaskService; import com.viontech.fanxing.task.service.adapter.TaskService;
...@@ -44,7 +44,6 @@ public class TaskRunner { ...@@ -44,7 +44,6 @@ public class TaskRunner {
@Scheduled(fixedDelay = 5000) @Scheduled(fixedDelay = 5000)
public void executedTaskListener() { public void executedTaskListener() {
RLock jobLock = redisService.getLockMust("lock:taskRunner"); RLock jobLock = redisService.getLockMust("lock:taskRunner");
RLock devLock = null;
try { try {
RScoredSortedSet<String> set = redisService.getToBeExecutedTaskUnidSet(); RScoredSortedSet<String> set = redisService.getToBeExecutedTaskUnidSet();
RMap<String, VaServerInfo> vaServerMap = vaServerService.getVaServerRedisRepository().getVaServerInfoMap(); RMap<String, VaServerInfo> vaServerMap = vaServerService.getVaServerRedisRepository().getVaServerInfoMap();
...@@ -80,25 +79,16 @@ public class TaskRunner { ...@@ -80,25 +79,16 @@ public class TaskRunner {
} }
} }
if (temp.getAvailableResources() >= resourceNeed) { if (temp.getAvailableResources() >= resourceNeed) {
devLock = vaServerService.getVaServerRedisRepository().getDevLock(devId); server = temp;
temp = vaServerMap.get(devId);
if (temp.getAvailableResources() >= resourceNeed) {
server = temp;
break;
} else {
devLock.forceUnlock();
devLock = null;
}
} }
} }
// 找不到可以用来执行的设备,需要修改状态 // 找不到可以用来执行的设备,需要修改状态
if (server == null) { if (server == null) {
log.debug("找不到可用的 VAServer,跳过:{}", taskUnid); log.debug("找不到可用的 VAServer,跳过:{}", taskUnid);
taskService.updateStatus(task.getId(), TaskStatus.CAN_NOT_RUN.val); taskService.updateStatus(task.getId(), TaskStatus.CAN_NOT_RUN.val);
continue; continue;
} }
RLock devLock = vaServerService.getVaServerRedisRepository().getDevLock(server.getDevID());
try { try {
log.info("开始下发任务:[{}]", taskData.getTask().getName()); log.info("开始下发任务:[{}]", taskData.getTask().getName());
vaServerService.executeTask(taskData, server); vaServerService.executeTask(taskData, server);
...@@ -106,6 +96,8 @@ public class TaskRunner { ...@@ -106,6 +96,8 @@ public class TaskRunner {
log.error("下发任务失败", e); log.error("下发任务失败", e);
taskService.updateStatus(task.getId(), TaskStatus.CAN_NOT_RUN.val); taskService.updateStatus(task.getId(), TaskStatus.CAN_NOT_RUN.val);
continue; continue;
} finally {
devLock.forceUnlock();
} }
// 修改任务状态 // 修改任务状态
...@@ -119,9 +111,6 @@ public class TaskRunner { ...@@ -119,9 +111,6 @@ public class TaskRunner {
} catch (Exception e) { } catch (Exception e) {
log.error("", e); log.error("", e);
} finally { } finally {
if (devLock != null) {
devLock.forceUnlock();
}
jobLock.forceUnlock(); jobLock.forceUnlock();
} }
...@@ -150,10 +139,12 @@ public class TaskRunner { ...@@ -150,10 +139,12 @@ public class TaskRunner {
set.remove(taskUnid); set.remove(taskUnid);
// 防止任务持续无法运行导致超过运行时段 // 防止任务持续无法运行导致超过运行时段
toBeExecutedTaskUnidSet.remove(taskUnid); toBeExecutedTaskUnidSet.remove(taskUnid);
taskService.updateStatus(taskData.getTask().getId(), TaskStatus.PAUSE.val); // 随机任务不进行部署,并且状态需要改成未部署
// 随机任务不进行部署
if (taskData.getTask().getRuntimeType() != 3) { if (taskData.getTask().getRuntimeType() != 3) {
taskService.updateStatus(taskData.getTask().getId(), TaskStatus.PAUSE.val);
boolean b = taskDataService.distributeTask(taskData); boolean b = taskDataService.distributeTask(taskData);
} else {
taskService.updateStatus(taskData.getTask().getId(), TaskStatus.AWAIT.val);
} }
} }
......
fanxing-task/src/main/java/com/viontech/fanxing/task/runner/VaServerCheckRunner.java
...@@ -8,6 +8,7 @@ import com.viontech.fanxing.task.service.VAServerService; ...@@ -8,6 +8,7 @@ import com.viontech.fanxing.task.service.VAServerService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RLock; import org.redisson.api.RLock;
import org.redisson.api.RMap; import org.redisson.api.RMap;
import org.redisson.api.RedissonClient;
import org.springframework.context.annotation.Profile; import org.springframework.context.annotation.Profile;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -31,11 +32,18 @@ public class VaServerCheckRunner { ...@@ -31,11 +32,18 @@ public class VaServerCheckRunner {
public static final ConcurrentHashMap<String, StreamInfo> STREAM_INFO_MAP = new ConcurrentHashMap<>(); public static final ConcurrentHashMap<String, StreamInfo> STREAM_INFO_MAP = new ConcurrentHashMap<>();
@Resource @Resource
private RedissonClient redissonClient;
@Resource
private VAServerService vaServerService; private VAServerService vaServerService;
@Scheduled(cron = "3 * * * * ? ") @Scheduled(cron = "3 * * * * ? ")
public void check() { public void check() {
RLock lock = redissonClient.getLock("lock:taskRunner");
if (lock.isLocked()) {
return;
}
try { try {
STREAM_INFO_MAP.clear();
RMap<String, VaServerInfo> vaServerInfoMap = vaServerService.getVaServerRedisRepository().getVaServerInfoMap(); RMap<String, VaServerInfo> vaServerInfoMap = vaServerService.getVaServerRedisRepository().getVaServerInfoMap();
Set<Map.Entry<String, VaServerInfo>> entries = vaServerInfoMap.readAllEntrySet(); Set<Map.Entry<String, VaServerInfo>> entries = vaServerInfoMap.readAllEntrySet();
for (Map.Entry<String, VaServerInfo> entry : entries) { for (Map.Entry<String, VaServerInfo> entry : entries) {
......
fanxing-task/src/main/java/com/viontech/fanxing/task/service/impl/TaskServiceImpl.java
...@@ -264,16 +264,18 @@ public class TaskServiceImpl extends BaseServiceImpl<Task> implements TaskServic ...@@ -264,16 +264,18 @@ public class TaskServiceImpl extends BaseServiceImpl<Task> implements TaskServic
@LocalCache(value = "task_overview", duration = 10, timeunit = TimeUnit.SECONDS) @LocalCache(value = "task_overview", duration = 10, timeunit = TimeUnit.SECONDS)
public JSONObject overview() { public JSONObject overview() {
List<Task> tasks = selectByExample(new TaskExample()); List<Task> tasks = selectByExample(new TaskExample());
int resourceCount = 0; float resourceCount = 0;
int usedResourceCount = 0; float usedResourceCount = 0;
long taskCount = tasks.size(); long taskCount = tasks.size();
long runningTaskCount = tasks.stream().filter(x -> TaskStatus.RUNNING.valEqual(x.getStatus())).count(); long runningTaskCount = tasks.stream().filter(x -> TaskStatus.RUNNING.valEqual(x.getStatus())).count();
RMap<String, VaServerInfo> map = vaServerService.getVaServerRedisRepository().getVaServerInfoMap(); RMap<String, VaServerInfo> map = vaServerService.getVaServerRedisRepository().getVaServerInfoMap();
Collection<VaServerInfo> vaServerInfos = map.readAllValues(); Collection<VaServerInfo> vaServerInfos = map.readAllValues();
for (VaServerInfo info : vaServerInfos) { for (VaServerInfo info : vaServerInfos) {
resourceCount += info.getVideoResource(); if (info.getStatus() == 1) {
usedResourceCount += (info.getVideoResource() - info.getAvailableResources()); resourceCount += info.getVideoResource();
usedResourceCount += (info.getVideoResource() - info.getAvailableResources());
}
} }
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!