feat：新增空间人感雷达属性

saas-module/src/main/java/com/makeit/controller/device/SaasDeviceController.java

@@ -93,7 +93,8 @@ public class SaasDeviceController {
     @PostMapping("devicePushLog")
     @PostMapping("devicePushLog")
     @TenantIdIgnore
     @TenantIdIgnore
     @AuthIgnore
     @AuthIgnore
-    public ApiResponseEntity devicePushLog(@RequestParam(value = "file", required = false) MultipartFile multipartFile) {
+    public ApiResponseEntity devicePushLog(@RequestParam(value = "file", required = false) MultipartFile multipartFile,
+                                           @RequestParam(value = "deviceId") String deviceId) {
         platDeviceService.devicePushLog(multipartFile);
         platDeviceService.devicePushLog(multipartFile);
         return ApiResponseUtils.success();
         return ApiResponseUtils.success();
     }
     }

server-service/src/main/java/com/makeit/dto/platform/device/PlatDeviceBaseAttrDTO.java

@@ -21,4 +21,32 @@ public class PlatDeviceBaseAttrDTO {
     @ApiModelProperty(value = "\"最小值\":200,\"最大值\":380,\"步\n" +
     @ApiModelProperty(value = "\"最小值\":200,\"最大值\":380,\"步\n" +
             "进\":1,\"单位\":\"cm\"")
             "进\":1,\"单位\":\"cm\"")
     private Integer radarHight;
     private Integer radarHight;
+    @ApiModelProperty(value = "雷达检测距离范围 示例:{\n" +
+            "\"max\": 1000,\n" +
+            "\"min\": 0,\n" +
+            "}",notes = "最大距离：\n" +
+            "在侧装模式下，表示检测的最远的距\n" +
+            "离，\n" +
+            "在顶装区域的模式下，表示检测的最右\n" +
+            "的距离\n" +
+            "最小距离：\n" +
+            "在侧装模式下，表示检测的最近的距\n" +
+            "离，\n" +
+            "在顶装区域的模式下，表示检测的最左\n" +
+            "的距离")
+    private DeviceAttrRange radarDistance;
+    @ApiModelProperty(value = "雷达检测角度范围 范围：±60 ，单位°，仅侧装有效 示例：{\n" +
+            "\"max\": 60,\n" +
+            "\"min\": -60,\n" +
+            "}")
+    private DeviceAttrRange radarAngle;
+    @ApiModelProperty(value = "雷达检测延迟时间 单位S ，范围：0-32768")
+    private Integer radarDelay;
+
+
+    @Data
+    static class DeviceAttrRange {
+        private Integer max;
+        private Integer min;
+    }
 }
 }

server-service/src/main/java/com/makeit/entity/platform/device/PlatDeviceOther.java

@@ -3,6 +3,7 @@ package com.makeit.entity.platform.device;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.makeit.common.entity.BaseBusEntity;
 import com.makeit.common.entity.BaseBusEntity;
+import com.makeit.dto.platform.device.PlatDeviceBaseAttrDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;

server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java

@@ -524,6 +524,15 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
         if (dto.getRadarHight() != null) {
         if (dto.getRadarHight() != null) {
             map.put("radarHight", dto.getRadarHight() );
             map.put("radarHight", dto.getRadarHight() );
         }
         }
+        if (dto.getRadarDelay() != null) {
+            map.put("radarDelay", dto.getRadarDelay() );
+        }
+        if (dto.getRadarDistance() != null) {
+            map.put("radarDistance", JSON.toJSONString(dto.getRadarDistance()));
+        }
+        if (dto.getRadarAngle() != null) {
+            map.put("radarAngle", JSON.toJSONString(dto.getRadarAngle()));
+        }
         return map;
         return map;
     }
     }