Merge remote-tracking branch 'origin/master'

dk-modules/sample/src/main/java/org/dromara/sample/fegin/RemoteBusinessTaskFeign.java

@@ -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);
-}

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 cn.hutool.core.convert.Convert;
-import io.seata.common.util.CollectionUtils;
 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.mqtt.CommonTopicRequest;
-import org.dromara.common.sdk.exception.CloudSDKErrorEnum;
+import org.dromara.common.sdk.mqtt.CommonTopicResponse;
-import org.dromara.common.sdk.mqtt.*;
+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 Map<String,Object>objectMap
     ) {
         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){
@@ -221,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);
             }

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<DeviceQrtzEntity> 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));