From 7e3fbe05ba5a96ccc022b9f40bc5276475b49f6d Mon Sep 17 00:00:00 2001 From: like <1025687351@qq.com> Date: Wed, 21 May 2025 14:39:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E6=B5=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MegaphoneController.java | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/MegaphoneController.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/MegaphoneController.java index d23548f..826eec8 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/MegaphoneController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/MegaphoneController.java @@ -40,8 +40,11 @@ import org.dromara.sample.manage.model.dto.*; import org.dromara.sample.manage.model.entity.DeviceStreamEntity; import org.dromara.sample.manage.service.IDeviceStreamService; import org.dromara.sample.media.mapper.IFileMapper; +import org.dromara.sample.wayline.model.dto.WaylineJobDTO; +import org.dromara.sample.wayline.service.IWaylineJobService; import org.dromara.system.api.RemoteConfigService; import org.json.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -73,6 +76,8 @@ public class MegaphoneController { @Resource private ServicesPublish servicesPublish; + @Autowired + private IWaylineJobService waylineJobService; @Resource PropertySetPublish propertySetPublish; @@ -303,8 +308,19 @@ public class MegaphoneController { Map map = new HashMap<>(); map.put("labelEn",type); map.put("deviceSn",objectMap.get("deviceSn")); - map.put("jobId",objectMap.get("jobId")); - map.put("jobName",objectMap.get("jobName")); + if (Objects.isNull(objectMap.get("jobId"))){ + map.put("jobId",objectMap.get("jobId")); + map.put("jobName",objectMap.get("jobName")); + }else { + Optional waylineJobDTO = waylineJobService.getJobByJobInternalId(objectMap.get("jobId").toString()); + map.put("jobId",objectMap.get("jobId")); + if (!waylineJobDTO.isEmpty()){ + map.put("jobName",waylineJobDTO.get().getJobName()); + }else { + map.put("jobName",null); + } + + } StreamTypeDTO param1 = Convert.convert(StreamTypeDTO.class, map); gatewayPublish.publish(topTow,new CommonTopicRequest<>() .setData(Objects.requireNonNull(param1)),1); @@ -349,8 +365,14 @@ public class MegaphoneController { Map map = new HashMap<>(); map.put("labelEn",type); map.put("deviceSn",objectMap.get("deviceSn")); - map.put("jobId",objectMap.get("jobId")); - map.put("jobName",objectMap.get("jobName")); + if (Objects.isNull(objectMap.get("jobId"))){ + map.put("jobId",objectMap.get("jobId")); + map.put("jobName",objectMap.get("jobName")); + }else { + Optional waylineJobDTO = waylineJobService.getJobByJobInternalId(objectMap.get("jobId").toString()); + map.put("jobId",waylineJobDTO.get().getJobId()); + map.put("jobName",waylineJobDTO.get().getJobName()); + } StreamTypeDTO param1 = Convert.convert(StreamTypeDTO.class, map); gatewayPublish.publish(topTow,new CommonTopicRequest<>() .setData(Objects.requireNonNull(param1)),1);