|
@@ -78,6 +78,7 @@ import java.util.stream.Collectors;
|
|
|
@RequestMapping("/service/baseCameraManagement")
|
|
|
@Slf4j
|
|
|
public class BaseCameraManagementController extends BaseController {
|
|
|
+ public static final String PATTERN = "^K([0-9]+)\\+([0-9]+)$";
|
|
|
@Resource
|
|
|
BaseCameraManagementService baseCameraManagementService;
|
|
|
@Resource
|
|
@@ -245,6 +246,15 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
if (!ObjectUtils.isEmpty(cameraManagement)) {
|
|
|
return error("相机编码已存在,不能重复添加");
|
|
|
}
|
|
|
+ if (!baseCameraManagement.getBeginMiles().matches(PATTERN)){
|
|
|
+ return error("监控范围开始里程位置填写格式不正确");
|
|
|
+ }
|
|
|
+ if (!baseCameraManagement.getInstallMiles().matches(PATTERN)){
|
|
|
+ return error("监控相机安装里程位置填写格式不正确");
|
|
|
+ }
|
|
|
+ if (!baseCameraManagement.getEndMiles().matches(PATTERN)){
|
|
|
+ return error("监控范围结束里程位置填写格式不正确");
|
|
|
+ }
|
|
|
int miles = AppendUtils.stringSplit(baseCameraManagement.getBeginMiles());
|
|
|
baseCameraManagement.setBeginMile(miles);
|
|
|
int install = AppendUtils.stringSplit(baseCameraManagement.getInstallMiles());
|
|
@@ -289,6 +299,15 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
if (!ObjectUtils.isEmpty(cameraManagement) && !cameraManagement.getId().equals(baseCameraManagement.getId())) {
|
|
|
return error("相机编码已存在,不能进行修改操作");
|
|
|
}
|
|
|
+ if (!baseCameraManagement.getBeginMiles().matches(PATTERN)){
|
|
|
+ return error("监控范围开始里程位置填写格式不正确");
|
|
|
+ }
|
|
|
+ if (!baseCameraManagement.getInstallMiles().matches(PATTERN)){
|
|
|
+ return error("监控相机安装里程位置填写格式不正确");
|
|
|
+ }
|
|
|
+ if (!baseCameraManagement.getEndMiles().matches(PATTERN)){
|
|
|
+ return error("监控范围结束里程位置填写格式不正确");
|
|
|
+ }
|
|
|
int miles = AppendUtils.stringSplit(baseCameraManagement.getBeginMiles());
|
|
|
baseCameraManagement.setBeginMile(miles);
|
|
|
int install = AppendUtils.stringSplit(baseCameraManagement.getInstallMiles());
|