소스 검색

修改sn号重复注册问题

李进 2 년 전
부모
커밋
0910c30468

+ 2 - 2
device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -127,8 +127,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             return R.fail("设备故障");
         }
         check(deviceStatus.getNetState(), 2, "设备已离线");
-        check(obj.getIsTwoDoor() != null && obj.getIsTwoDoor() ? deviceStatus.getDeviceStateR() : deviceStatus.getDeviceStateL(), 2, "设备已锁机");
-        check(obj.getIsTwoDoor() != null && obj.getIsTwoDoor() ? deviceStatus.getLockStateR() : deviceStatus.getLockStateL(), 2, "设备正在使用中,请稍后");
+        check(obj.getDoor() != null && obj.getDoor() == 1 ? deviceStatus.getDeviceStateR() : deviceStatus.getDeviceStateL(), 2, "设备已锁机");
+        check(obj.getDoor() != null && obj.getDoor() == 1 ? deviceStatus.getLockStateR() : deviceStatus.getLockStateL(), 2, "设备正在使用中,请稍后");
         return R.ok();
     }
 

+ 2 - 2
device-api/src/main/java/com/xy/dto/DeviceInfoDto.java

@@ -35,8 +35,8 @@ public class DeviceInfoDto {
         @ApiModelProperty("设备id")
         private Long deviceId;
 
-        @ApiModelProperty("是否是2号门")
-        private Boolean isTwoDoor;
+        @ApiModelProperty("门id 0=1号门 1=2号门")
+        private Integer door;
     }
 
     @Data