websocket

dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/config/version/Dock2ThingVersionEnum.java

@@ -12,11 +12,22 @@ import java.util.Arrays;
  */
 public enum Dock2ThingVersionEnum implements IThingVersion {
 
-    V1_1_2("1.1.2", CloudSDKVersionEnum.V1_0_1),
+    V1_0_0("1.0.0", CloudSDKVersionEnum.V0_0_1),
+
+    V1_1_0("1.1.0", CloudSDKVersionEnum.V1_0_0),
+
+    V1_1_2("1.1.2", CloudSDKVersionEnum.V1_0_0),
+
+    V1_1_3("1.1.3", CloudSDKVersionEnum.V1_0_2),
 
     V1_2_0("1.2.0", CloudSDKVersionEnum.V1_0_3),
+
+    V1_2_3("1.2.3", CloudSDKVersionEnum.V1_0_3),
+
     V1_3_0("1.3.0", CloudSDKVersionEnum.V1_0_3),
-    V1_3_1("1.3.1", CloudSDKVersionEnum.V1_3_1),
+
+
+    V1_3_1("1.3.1", CloudSDKVersionEnum.V1_0_3),
     ;
 
     private final String thingVersion;

dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/config/version/Dock3ThingVersionEnum.java

@@ -12,14 +12,21 @@ import java.util.Arrays;
  */
 public enum Dock3ThingVersionEnum implements IThingVersion {
 
-    V1_1_2("1.1.2", CloudSDKVersionEnum.V1_0_1),
+    V1_0_0("1.0.0", CloudSDKVersionEnum.V0_0_1),
+
+    V1_1_0("1.1.0", CloudSDKVersionEnum.V1_0_0),
+
+    V1_1_2("1.1.2", CloudSDKVersionEnum.V1_0_0),
+
+    V1_1_3("1.1.3", CloudSDKVersionEnum.V1_0_2),
 
     V1_2_0("1.2.0", CloudSDKVersionEnum.V1_0_3),
 
     V1_2_3("1.2.3", CloudSDKVersionEnum.V1_0_3),
 
     V1_3_0("1.3.0", CloudSDKVersionEnum.V1_0_3),
-    V1_3_1("1.3.1", CloudSDKVersionEnum.V1_3_1),
+
+    V1_3_1("1.3.1", CloudSDKVersionEnum.V1_0_3),
     ;
 
     private final String thingVersion;

dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/config/version/DockThingVersionEnum.java

@@ -14,14 +14,20 @@ public enum DockThingVersionEnum implements IThingVersion {
 
     V1_0_0("1.0.0", CloudSDKVersionEnum.V0_0_1),
 
-    V1_1_0("1.1.0", CloudSDKVersionEnum.V0_0_1),
+    V1_1_0("1.1.0", CloudSDKVersionEnum.V1_0_0),
 
     V1_1_2("1.1.2", CloudSDKVersionEnum.V1_0_0),
 
     V1_1_3("1.1.3", CloudSDKVersionEnum.V1_0_2),
 
+    V1_2_0("1.2.0", CloudSDKVersionEnum.V1_0_3),
+
     V1_2_3("1.2.3", CloudSDKVersionEnum.V1_0_3),
 
+    V1_3_0("1.3.0", CloudSDKVersionEnum.V1_0_3),
+
+    V1_3_1("1.3.1", CloudSDKVersionEnum.V1_0_3),
+
     ;
 
     private final String thingVersion;

dk-modules/sample/src/main/java/org/dromara/sample/control/controller/DrcController.java

@@ -31,26 +31,26 @@ public class DrcController {
     @Autowired
     private IDrcService drcService;
 
-    @PostMapping("/workspaces/drc/connect")
-    public HttpResultResponse drcConnect(HttpServletRequest request, @Valid @RequestBody DrcConnectParam param) {
+    @PostMapping("/workspaces/{workspace_id}/drc/connect")
+    public HttpResultResponse drcConnect(@PathVariable("workspace_id") String workspaceId,HttpServletRequest request, @Valid @RequestBody DrcConnectParam param) {
         LoginUser loginUser = LoginHelper.getLoginUser();
 
-        DrcModeMqttBroker brokerDTO = drcService.userDrcAuth(loginUser.getTenantId(), loginUser.getLoginId(), loginUser.getUsername(), param);
+        DrcModeMqttBroker brokerDTO = drcService.userDrcAuth(workspaceId, loginUser.getLoginId(), loginUser.getUsername(), param);
         return HttpResultResponse.success(brokerDTO);
     }
 
-    @PostMapping("/workspaces/drc/enter")
-    public HttpResultResponse drcEnter(@Valid @RequestBody DrcModeParam param) {
+    @PostMapping("/workspaces/{workspace_id}/drc/enter")
+    public HttpResultResponse drcEnter(@PathVariable("workspace_id") String workspaceId,@Valid @RequestBody DrcModeParam param) {
         LoginUser loginUser = LoginHelper.getLoginUser();
-        JwtAclDTO acl = drcService.deviceDrcEnter(loginUser.getTenantId(), param);
+        JwtAclDTO acl = drcService.deviceDrcEnter(workspaceId, param);
 
         return HttpResultResponse.success(acl);
     }
 
-    @PostMapping("/workspaces/drc/exit")
-    public HttpResultResponse drcExit( @Valid @RequestBody DrcModeParam param) {
+    @PostMapping("/workspaces/{workspace_id}/drc/exit")
+    public HttpResultResponse drcExit(@PathVariable("workspace_id") String workspaceId, @Valid @RequestBody DrcModeParam param) {
         LoginUser loginUser = LoginHelper.getLoginUser();
-        drcService.deviceDrcExit(loginUser.getTenantId(), param);
+        drcService.deviceDrcExit(workspaceId, param);
 
         return HttpResultResponse.success();
     }

dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DevicePayloadEntity.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @author sean.zhou
@@ -45,10 +46,10 @@ public class DevicePayloadEntity implements Serializable {
     private String deviceSn;
 
     @TableField(value = "create_time", fill = FieldFill.INSERT)
-    private Long createTime;
+    private Date createTime;
 
     @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
-    private Long updateTime;
+    private Date updateTime;
 
     @TableField(value = "payload_desc")
     private String payloadDesc;

dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DevicePayloadServiceImpl.java

@@ -61,6 +61,7 @@ public class DevicePayloadServiceImpl implements IDevicePayloadService {
             entity.setId(id);
             // For the payload of the drone itself, there is no firmware version.
             entity.setFirmwareVersion(null);
+            entity.setCreateTime(new Date());
             return mapper.updateById(entity) > 0 ? entity.getId() : 0;
         }
         return mapper.insert(entity) > 0 ? entity.getId() : 0;

dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java

@@ -401,6 +401,9 @@ public class SDKDeviceService extends AbstractDeviceService {
                 .loginTime(LocalDateTime.now())
                 .deviceSn(gatewaySn)
                 .childDeviceSn(deviceSn).build();
+        if(!StringUtils.hasText(workspaceId)){
+            return;
+        }
         deviceService.updateDevice(gateway);
         deviceService.updateDevice(device);
         gateway = deviceRedisService.getDeviceOnline(gatewaySn).map(g -> {

dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaFileServiceImpl.java

@@ -116,11 +116,11 @@ public class FlightAreaFileServiceImpl implements IFlightAreaFileService {
                     length++;
                 }
                 is.reset();
-                OssClient storage = OssFactory.instance("flight_area_file");
+                OssClient storage = OssFactory.instance("flightareafile");
                 storage.uploadSuffix(is,name,length,"json");
                 return FlightAreaFileDTO.builder()
                         .name(name)
-                        .objectKey("flight_area_file/"+name)
+                        .objectKey("flightareafile/"+name)
                         .fileId(UUID.randomUUID().toString())
                         .size(os.size())
                         .workspaceId(workspaceId)

dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaServiceImpl.java

@@ -297,7 +297,7 @@ public class FlightAreaServiceImpl extends AbstractFlightAreaService implements
         if (flightAreaOpt.isEmpty() || fileOpt.isEmpty()) {
             file = packageFlightArea(device.getWorkspaceId());
         }
-        OssClient storage = OssFactory.instance("flight_area_file");
+        OssClient storage = OssFactory.instance("flightareafile");
         return new TopicRequestsResponse<MqttReply<FlightAreasGetResponse>>().setData(
                 MqttReply.success(new FlightAreasGetResponse().setFiles(
                         List.of(new FlightAreaGetFile()