From a6d047e106c00a32603ed9c037a1e27b7f75ee6b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 17 三月 2025 18:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 62f7ce3..1b3a5c0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -91,6 +91,8 @@
private PlatformGroupMapper platformGroupMapper;
@Autowired
private TmsService tmsService;
+ @Autowired
+ private PlatformDeviceMapper platformDeviceMapper;
@Value("${debug_model}")
private Boolean isDebug;
@@ -1908,6 +1910,10 @@
.orderByDesc(PlatformJob::getStatus )
.orderByAsc(PlatformJob::getId )
);
+ List<PlatformDevice> platformDevices = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda().eq(PlatformDevice::getType,Constants.ONE)
+ .eq(PlatformDevice::getIsdeleted,Constants.ZERO).isNotNull(PlatformDevice::getDeviceId));
+
+ String videoUrl = getVideoUrl();
//鏈堝彴鐘舵�侊細0=浣滀笟涓紱1=绌洪棽涓紱2=浣滀笟瓒呮椂;3=鍙彿
for(Platform model : platformList){
PlatformWorkDataVO platformDurationVO = new PlatformWorkDataVO();
@@ -1915,6 +1921,13 @@
platformDurationVO.setPlatformId(model.getId());
platformDurationVO.setPlatformCode(model.getCode());
platformDurationVO.setPlatformSort(model.getSortnum());
+ if(CollectionUtils.isNotEmpty(platformDevices)){
+ List<PlatformDevice> deviceList = platformDevices.stream().filter(i->Constants.equalsInteger(i.getPlatformId(),model.getId())).collect(Collectors.toList());
+ if (CollectionUtils.isNotEmpty(deviceList)) {
+ platformDurationVO.setDeviceId(deviceList.get(Constants.ZERO).getDeviceId());
+ platformDurationVO.setVideoPluginUrl(videoUrl);
+ }
+ }
PlatformJob job = getJobFromListById(model.getId(),jobList);
if(job != null){
if(Constants.equalsInteger(job.getType(),Constants.ONE) || Constants.equalsInteger(job.getType(),Constants.THREE)){
--
Gitblit v1.9.3