Browse Source

去除正则表达式

gao.qiang 1 year ago
parent
commit
3d65b0eda3

+ 1 - 30
hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -79,7 +79,6 @@ import java.util.stream.Stream;
 @RequestMapping("/service/baseCameraManagement")
 @Slf4j
 public class BaseCameraManagementController extends BaseController {
-    public static final String PATTERN = "^[0-9]*$";
     @Resource
     BaseCameraManagementService baseCameraManagementService;
     @Resource
@@ -181,18 +180,10 @@ public class BaseCameraManagementController extends BaseController {
     public AjaxResult selectBaseAccountManagement(@RequestBody BaseCameraManagementVo baseCameraManagementVo) {
         baseCameraManagementVo = (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(), baseCameraManagementVo);
         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getBeginMile())) {
-            if (!baseCameraManagementVo.getBeginMile().toString().matches(PATTERN)) {
-                return error("监控范围开始里程位置填写格式不正确");
-            } else {
                 baseCameraManagementVo.setBeginMile(baseCameraManagementVo.getBeginMile() * 1000);
-            }
         }
         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getEndMile())) {
-            if (!baseCameraManagementVo.getEndMile().toString().matches(PATTERN)) {
-                return error("监控范围结束里程位置填写格式不正确");
-            } else {
                 baseCameraManagementVo.setEndMile(baseCameraManagementVo.getEndMile() * 1000);
-            }
         }
         IPage<BaseCameraManagement> page = baseCameraManagementService.queryPage(baseCameraManagementVo);
         page.setTotal(page.getTotal());
@@ -268,6 +259,7 @@ public class BaseCameraManagementController extends BaseController {
     @Transactional
     @Log(title = "相机台账管理", businessType = BusinessType.INSERT)
     public AjaxResult saveAccountManagement(@RequestBody BaseCameraManagement baseCameraManagement) {
+        idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
         String idempotence = idempotenceUtils.getIdempotence(baseCameraManagement.getCameraCode());
         if (StringUtils.isNotEmpty(idempotence)) {
             return error("你的网络卡顿,请不要一直添加!!!");
@@ -291,18 +283,6 @@ public class BaseCameraManagementController extends BaseController {
             idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
             return error("设备动态管理表该相机编码已存在,不能重复添加");
         }
-        if (!baseCameraManagement.getBeginMile().toString().matches(PATTERN)) {
-            idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
-            return error("监控范围开始里程位置填写格式不正确");
-        }
-        if (!baseCameraManagement.getInstallMile().toString().matches(PATTERN)) {
-            idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
-            return error("监控相机安装里程位置填写格式不正确");
-        }
-        if (!baseCameraManagement.getEndMile().toString().matches(PATTERN)) {
-            idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
-            return error("监控范围结束里程位置填写格式不正确");
-        }
         baseCameraManagement.setBeginMile(baseCameraManagement.getBeginMile() * 1000);
         baseCameraManagement.setInstallMile(baseCameraManagement.getInstallMile() * 1000);
         baseCameraManagement.setEndMile(baseCameraManagement.getEndMile() * 1000);
@@ -348,15 +328,6 @@ public class BaseCameraManagementController extends BaseController {
         if (!ObjectUtils.isEmpty(cameraManagement) && !cameraManagement.getId().equals(baseCameraManagement.getId())) {
             return error("相机编码已存在,不能进行修改操作");
         }
-        if (!baseCameraManagement.getBeginMile().toString().matches(PATTERN)) {
-            return error("监控范围开始里程位置填写格式不正确");
-        }
-        if (!baseCameraManagement.getInstallMile().toString().matches(PATTERN)) {
-            return error("监控相机安装里程位置填写格式不正确");
-        }
-        if (!baseCameraManagement.getEndMile().toString().matches(PATTERN)) {
-            return error("监控范围结束里程位置填写格式不正确");
-        }
         baseCameraManagement.setBeginMile(baseCameraManagement.getBeginMile() * 1000);
         baseCameraManagement.setInstallMile(baseCameraManagement.getInstallMile() * 1000);
         baseCameraManagement.setEndMile(baseCameraManagement.getEndMile() * 1000);