|
@@ -386,6 +386,20 @@ public class DeviceGatewayImpl implements DeviceGateway {
|
|
|
|
|
|
logService.saveLog(devInfo.getDevId(), OprLogType.UPDATE_DEVICE.getCode(), devInfo);
|
|
|
|
|
|
+
|
|
|
+ // 校验 北向夹角
|
|
|
+ List<BigDecimal> validAngles = Arrays.asList(
|
|
|
+ BigDecimal.ZERO,
|
|
|
+ BigDecimal.valueOf(90),
|
|
|
+ BigDecimal.valueOf(180),
|
|
|
+ BigDecimal.valueOf(270)
|
|
|
+ );
|
|
|
+ boolean valid = validAngles.stream()
|
|
|
+ .anyMatch(angle -> angle.compareTo(params.getNorthAngle()) == 0);
|
|
|
+ if (!valid) {
|
|
|
+ throw new BizException(ErrorEnum.DEVICE_NORTH_ERROR.getErrorCode(), ErrorEnum.DEVICE_NORTH_ERROR.getErrorMessage());
|
|
|
+ }
|
|
|
+
|
|
|
//2.更新数据
|
|
|
devInfo.setTenantId(params.getTenantId());
|
|
|
devInfo.setDevName(params.getDevName());
|
|
@@ -440,6 +454,8 @@ public class DeviceGatewayImpl implements DeviceGateway {
|
|
|
throw new BizException(ErrorEnum.DEVICE_PARAM_ERROR.getErrorCode(), ErrorEnum.DEVICE_PARAM_ERROR.getErrorMessage());
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ // 校验 北向夹角
|
|
|
List<BigDecimal> validAngles = Arrays.asList(
|
|
|
BigDecimal.ZERO,
|
|
|
BigDecimal.valueOf(90),
|
|
@@ -449,7 +465,7 @@ public class DeviceGatewayImpl implements DeviceGateway {
|
|
|
boolean valid = validAngles.stream()
|
|
|
.anyMatch(angle -> angle.compareTo(params.getNorthAngle()) == 0);
|
|
|
if (!valid) {
|
|
|
- throw new BizException(ErrorEnum.DEVICE_PARAM_ERROR.getErrorCode(), ErrorEnum.DEVICE_PARAM_ERROR.getErrorMessage());
|
|
|
+ throw new BizException(ErrorEnum.DEVICE_NORTH_ERROR.getErrorCode(), ErrorEnum.DEVICE_NORTH_ERROR.getErrorMessage());
|
|
|
}
|
|
|
|
|
|
//2.校验设备是否存在
|