From f4335988a68e5593e11727d2600da28ff174eb73 Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Thu, 3 Apr 2025 20:22:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9Aai=E8=AF=86?= =?UTF-8?q?=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sample/fegin/RemoteBusinessTaskFeign.java | 13 ----------- .../controller/MegaphoneController.java | 22 ++++++------------- .../service/impl/DeviceQrtzServiceImpl.java | 7 ++---- 3 files changed, 9 insertions(+), 33 deletions(-) delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/fegin/RemoteBusinessTaskFeign.java diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/fegin/RemoteBusinessTaskFeign.java b/dk-modules/sample/src/main/java/org/dromara/sample/fegin/RemoteBusinessTaskFeign.java deleted file mode 100644 index fd239b7..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/fegin/RemoteBusinessTaskFeign.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.dromara.sample.fegin; - - -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; -public interface RemoteBusinessTaskFeign { - - @PostMapping("/update/status") - void updateTaskStatus(@RequestParam String waylineId, - @RequestParam String status, - @RequestParam(required = false) String jobId, - @RequestParam(required = false) String jobName); -} 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 e00b93e..38e89e2 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 @@ -1,33 +1,24 @@ package org.dromara.sample.manage.controller; -import com.fasterxml.jackson.databind.JsonNode; -import io.seata.common.util.CollectionUtils; +import cn.hutool.core.convert.Convert; import io.seata.common.util.StringUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; -import org.dromara.business.api.RemoteBusinessTaskService; import org.dromara.common.redis.utils.RedisOpsUtils; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.sdk.cloudapi.wayline.WaylineMethodEnum; import org.dromara.common.sdk.common.HttpResultResponse; -import org.dromara.common.sdk.common.PaginationData; -import org.dromara.common.sdk.exception.CloudSDKErrorEnum; -import org.dromara.common.sdk.mqtt.*; +import org.dromara.common.sdk.mqtt.CommonTopicRequest; +import org.dromara.common.sdk.mqtt.CommonTopicResponse; +import org.dromara.common.sdk.mqtt.MqttGatewayPublish; +import org.dromara.common.sdk.mqtt.TopicConst; import org.dromara.common.sdk.mqtt.property.PropertySetPublish; -import org.dromara.common.sdk.mqtt.property.PropertySetReplyResultEnum; -import org.dromara.common.sdk.mqtt.property.TopicPropertySetRequest; import org.dromara.common.sdk.mqtt.services.ServicesPublish; import org.dromara.common.sdk.mqtt.services.ServicesReplyReceiver; import org.dromara.common.sdk.mqtt.services.TopicServicesRequest; import org.dromara.sample.manage.model.dto.*; -import org.dromara.sample.manage.service.IDeviceService; import org.dromara.system.api.RemoteConfigService; -import org.dromara.system.api.model.LoginUser; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.*; @@ -207,11 +198,12 @@ public class MegaphoneController { @PostMapping("/{workspace_id}/getStreamIp") @Operation(summary = "获取媒体流ip。", description = "获取媒体流ip。") public HttpResultResponse getStreamIp(@PathVariable("workspace_id") String workspaceId, - @RequestBody DisobeyDTO param + @RequestBody MapobjectMap ) { String top = "task/image/disobey/smoke"; //发送mqtt String s = remoteConfigService.selectStreamIp(); + DisobeyDTO param = Convert.convert(DisobeyDTO.class, objectMap); if (StringUtils.isNotEmpty(param.getModel())){ String[] split = param.getModel().split(","); for (String type : split){ diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java index a7aa038..7df373e 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java @@ -6,14 +6,12 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.constant.BusinessConstants; import org.dromara.common.core.constant.DeviceQrtzConstants; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.redis.utils.RedisOpsUtils; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.sdk.cloudapi.wayline.*; import org.dromara.common.sdk.common.HttpResultResponse; -import org.dromara.sample.fegin.RemoteBusinessTaskFeign; import org.dromara.sample.manage.mapper.IDeviceQrtzDateMapper; import org.dromara.sample.manage.mapper.IDeviceQrtzFileMapper; import org.dromara.sample.manage.mapper.IDeviceQrtzMapper; @@ -67,8 +65,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService { private ExecutorService executor = Executors.newFixedThreadPool(5); - @Autowired - RemoteBusinessTaskFeign remoteBusinessTaskFeign; + @Override public TableDataInfo listManageDeviceQrtz(Page page, DeviceQrtzDTO deviceQrtzDTO) { @@ -303,7 +300,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService { continue; } //获取是否是工单航线，是修改状态 - remoteBusinessTaskFeign.updateTaskStatus(deviceQrtzFileEntity.getWaylineId(), BusinessConstants.TASK_STATUS_2, null, null); +// remoteBusinessTaskFeign.updateTaskStatus(deviceQrtzFileEntity.getWaylineId(), BusinessConstants.TASK_STATUS_2, null, null); CreateJobParam createJobParam = new CreateJobParam(); try { createJobParam.setName(deviceQrtzFileEntity.getWaylineName() + "" + currentDate.format(formatterS)); From c81decd95364d090d71391f4d9c168cce6275582 Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Thu, 3 Apr 2025 20:46:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/sample/manage/controller/MegaphoneController.java | 1 + 1 file changed, 1 insertion(+) 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 38e89e2..a62929b 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 @@ -213,6 +213,7 @@ public class MegaphoneController { disobeyDTO.setUrl(s); disobeyDTO.setOpen(param.getOpen()); disobeyDTO.setType(list); + disobeyDTO.setRtmpUrl(param.getRtmpUrl()); gatewayPublish.publish(top,new CommonTopicRequest<>() .setData(Objects.requireNonNull(disobeyDTO)),1); }