用户导入逻辑修改

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

@@ -244,6 +244,7 @@ public class BaseCameraManagementController extends BaseController {
         }
         BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(lw);
         if (!ObjectUtils.isEmpty(cameraManagement)) {
+            idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
             return error("相机台账管理信息相机编码已存在,不能重复添加");
         }
         LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
@@ -252,15 +253,19 @@ public class BaseCameraManagementController extends BaseController {
         }
         BaseDeviceDynamicManagement one = baseDeviceDynamicManagementService.getOne(queryWrapper);
         if (!ObjectUtils.isEmpty(one)){
+            idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
             return error("设备动态管理表该相机编码已存在,不能重复添加");
         }
         if (!baseCameraManagement.getBeginMiles().matches(PATTERN)){
+            idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
            return error("监控范围开始里程位置填写格式不正确");
         }
         if (!baseCameraManagement.getInstallMiles().matches(PATTERN)){
+            idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
             return error("监控相机安装里程位置填写格式不正确");
         }
         if (!baseCameraManagement.getEndMiles().matches(PATTERN)){
+            idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
             return error("监控范围结束里程位置填写格式不正确");
         }
         int miles = AppendUtils.stringSplit(baseCameraManagement.getBeginMiles());

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseRailwayManagementController.java

@@ -141,6 +141,7 @@ public class BaseRailwayManagementController extends BaseController {
             lw.eq(BaseRailwayManagement::getRailwayCode, baseRailwayManagement.getRailwayCode());
             BaseRailwayManagement railwayManagement = baseRailwayManagementService.getOne(lw);
             if (!ObjectUtils.isEmpty(railwayManagement)) {
+                idempotenceUtils.deleteIdempotence(baseRailwayManagement.getRailwayCode());
                 return error("线路编码已存在,不能重复添加");
             }
         }
@@ -148,6 +149,7 @@ public class BaseRailwayManagementController extends BaseController {
             lw.eq(BaseRailwayManagement::getRailwayName, baseRailwayManagement.getRailwayName());
             BaseRailwayManagement railwayManagement = baseRailwayManagementService.getOne(lw);
             if (!ObjectUtils.isEmpty(railwayManagement)) {
+                idempotenceUtils.deleteIdempotence(baseRailwayManagement.getRailwayCode());
                 return error("线路名称已存在,不能重复添加");
             }
         }

hazard-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -225,6 +225,9 @@ public class SysUserController extends BaseController {
         } else if (StringUtils.isNotEmpty(user.getPhoneNum())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+        }else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+            return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setCreateBy(getUsername());
         return toAjax(userService.saveUser(user));