1

doc/update-1.5.0.sql

@@ -27,3 +27,18 @@ UPDATE sys_role set role_name = '管理员' where id= 45;
 
 
 INSERT INTO sys_role_menu (role_id,menu_id ) SELECT 48,menu_id FROM sys_role_menu WHERE role_id = 47;
+
+
+DELETE FROM jy_user WHERE rec_status != 'A'
+
+ALTER TABLE `4dkankan_v4`.`jy_user`
+    ADD UNIQUE INDEX `ry_id_index`(`ry_id`, `rec_status`) USING HASH;
+
+ALTER TABLE `4dkankan_v4`.`jy_user`
+    ADD UNIQUE INDEX `ry_no_index`(`ry_no`, `rec_status`) USING HASH;
+
+ALTER TABLE `4dkankan_v4`.`jy_user`
+    ADD UNIQUE INDEX `phone_index`(`phone`, `rec_status`) USING HASH;
+
+ALTER TABLE `4dkankan_v4`.`jy_user`
+    ADD UNIQUE INDEX `id_card_index`(`id_card`, `rec_status`) USING HASH;

src/main/java/com/fdkankan/manage/service/IJyUserService.java

@@ -41,4 +41,6 @@ public interface IJyUserService extends IService<JyUser> {
     void updatePlatformId(Integer id, Integer id1);
 
     List<Long> getByUserIdPlatform(Integer loginPlatformId);
+
+    void del(Integer id);
 }

src/main/java/com/fdkankan/manage/service/ISysUserService.java

@@ -32,4 +32,6 @@ public interface ISysUserService extends IService<SysUser> {
     HashMap<Long, SysUser> getByIds(Set<Long> sysUserIds);
 
     void updateRoleId(Long sysUserId, Integer roleId);
+
+    void del(Long sysUserId);
 }

src/main/java/com/fdkankan/manage/service/impl/JyUserServiceImpl.java

@@ -11,10 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -141,4 +138,12 @@ public class JyUserServiceImpl extends ServiceImpl<IJyUserMapper, JyUser> implem
         }
         return list.stream().map(JyUser::getUserId).collect(Collectors.toList());
     }
+
+    @Override
+    public void del(Integer id) {
+        LambdaUpdateWrapper<JyUser> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(JyUser::getId,id);
+        wrapper.set(JyUser::getRecStatus,id);
+        this.update(wrapper);
+    }
 }

src/main/java/com/fdkankan/manage/service/impl/SysUserServiceImpl.java

@@ -147,4 +147,12 @@ public class SysUserServiceImpl extends ServiceImpl<ISysUserMapper, SysUser> imp
         wrapper.set(SysUser::getRoleId,roleId);
         this.update(wrapper);
     }
+
+    @Override
+    public void del(Long sysUserId) {
+        LambdaUpdateWrapper<SysUser> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(SysUser::getId,sysUserId);
+        wrapper.set(SysUser::getRecStatus,sysUserId);
+        this.update(wrapper);
+    }
 }

src/main/java/com/fdkankan/manage/service/impl/UserServiceImpl.java

@@ -286,10 +286,17 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         //将相机和场景归属超管
         cameraDetailService.giveSuperAdmin(jyuser);
 
-        this.removeById(jyuser.getUserId());
-        sysUserService.removeById(jyuser.getSysUserId());
+        this.del(jyuser.getUserId());
+        sysUserService.del(jyuser.getSysUserId());
         jySceneUserAuthService.delByJyUserId(jyuser.getId());
-        jyUserService.removeById(jyuser.getId());
+        jyUserService.del(jyuser.getId());
+    }
+
+    private void del(Long userId) {
+        LambdaUpdateWrapper<User> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(User::getId,userId);
+        wrapper.set(User::getRecStatus,userId);
+        this.update(wrapper);
     }
 
     @Override