|
@@ -244,7 +244,7 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
return error("你的网络卡顿,请不要一直添加!!!");
|
|
|
}
|
|
|
idempotenceUtils.createIdempotence(baseCameraManagement.getCameraCode());
|
|
|
- LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
|
|
|
+ LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<>();
|
|
|
if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
|
|
|
lw.eq(BaseCameraManagement::getCameraCode, baseCameraManagement.getCameraCode());
|
|
|
}
|
|
@@ -253,7 +253,7 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
|
|
|
return error("相机台账管理信息相机编码已存在,不能重复添加");
|
|
|
}
|
|
|
- LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
|
|
|
+ LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
|
|
|
queryWrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseCameraManagement.getCameraCode());
|
|
|
}
|
|
@@ -262,22 +262,22 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
|
|
|
return error("设备动态管理表该相机编码已存在,不能重复添加");
|
|
|
}
|
|
|
- if (!baseCameraManagement.getBeginMiles().matches(PATTERN)) {
|
|
|
+ if (!baseCameraManagement.getBeginMile().toString().matches(PATTERN)) {
|
|
|
return error("监控范围开始里程位置填写格式不正确");
|
|
|
} else {
|
|
|
- double begin = Double.parseDouble(baseCameraManagement.getBeginMiles());
|
|
|
+ double begin = Double.parseDouble(baseCameraManagement.getBeginMile().toString());
|
|
|
baseCameraManagement.setBeginMile((int) (begin * 1000));
|
|
|
}
|
|
|
- if (!baseCameraManagement.getInstallMiles().matches(PATTERN)) {
|
|
|
+ if (!baseCameraManagement.getInstallMile().toString().matches(PATTERN)) {
|
|
|
return error("监控相机安装里程位置填写格式不正确");
|
|
|
} else {
|
|
|
- double install = Double.parseDouble(baseCameraManagement.getInstallMiles());
|
|
|
+ double install = Double.parseDouble(baseCameraManagement.getInstallMile().toString());
|
|
|
baseCameraManagement.setInstallMile((int) (install * 1000));
|
|
|
}
|
|
|
- if (!baseCameraManagement.getEndMiles().matches(PATTERN)) {
|
|
|
+ if (!baseCameraManagement.getEndMile().toString().matches(PATTERN)) {
|
|
|
return error("监控范围结束里程位置填写格式不正确");
|
|
|
} else {
|
|
|
- double end = Double.parseDouble(baseCameraManagement.getEndMiles());
|
|
|
+ double end = Double.parseDouble(baseCameraManagement.getEndMile().toString());
|
|
|
baseCameraManagement.setEndMile((int) (end * 1000));
|
|
|
}
|
|
|
if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
|