接口调整

portal-service-common/src/main/java/com/hfln/portal/common/dto/DevInfoImportDto.java

@@ -7,7 +7,7 @@ import lombok.Data;
 public class DevInfoImportDto {
 
     @ExcelProperty("固件版本")
-    private String software;
+    private String hardware;
 
     @ExcelProperty("设备ID")
     private String clientId;

portal-service-common/src/main/java/com/hfln/portal/common/request/web/DeviceAddParam.java

@@ -62,13 +62,13 @@ public class DeviceAddParam extends BaseVO {
      * 软件版本号
      */
     @Schema(description = "软件版本号" )
-    @NotBlank ( message = "软件版本号不能为空!")
     private String software;
 
     /**
      * 硬件版本号
      */
     @Schema(description = "硬件版本号")
+    @NotBlank ( message = "硬件版本号不能为空!")
     private String hardware;
 
     /**

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/WebGatewayImpl.java

@@ -134,7 +134,7 @@ public class WebGatewayImpl implements WebGateway {
             DevInfo devInfo = new DevInfo();
             devInfo.setClientId(item.getClientId());
             devInfo.setDevType(item.getDevType());
-            devInfo.setSoftware(item.getSoftware());
+            devInfo.setHardware(item.getHardware());
             devInfo.setStatusLight(1);
             devInfo.setOnline(0);
             devInfo.setIsDeleted(BasePO.DeleteFlag.NOT_DELETED);
@@ -239,7 +239,7 @@ public class WebGatewayImpl implements WebGateway {
         DevInfo saveInfo = new DevInfo();
         saveInfo.setClientId(deviceAddParam.getClientId());
         saveInfo.setDevType(deviceAddParam.getDevType());
-        saveInfo.setSoftware(deviceAddParam.getSoftware());
+        saveInfo.setHardware(deviceAddParam.getHardware());
         saveInfo.setTenantId(deviceAddParam.getTenantId());
         saveInfo.setStatusLight(1);
         saveInfo.setOnline(0);

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/mqtt/MqttSubHandle.java

@@ -434,8 +434,8 @@ public class MqttSubHandle {
         BigDecimal stopX = trackingRegion.getBigDecimal("stop_x");
         BigDecimal stopY = trackingRegion.getBigDecimal("stop_y");
         BigDecimal stopZ = trackingRegion.getBigDecimal("stop_z");
-        BigDecimal width = startX.subtract(stopX).abs();
-        BigDecimal length = startY.subtract(stopY).abs();
+        BigDecimal length = startX.subtract(stopX).abs();
+        BigDecimal width = startY.subtract(stopY).abs();
 
         DevInfo vo = new DevInfo();
         vo.setClientId(clientId);