解决选入用户，移除用户系统繁忙问题

src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java

@@ -612,7 +612,7 @@ public class InvWarehouseController extends BaseController {
 
     @AuthRuleAnnotation("")
     @PostMapping("/warehouse/inout/delWarehouseUser")
-    public BaseResponse deleteWarehouseUser(Integer id) {
+    public BaseResponse deleteWarehouseUser(Long id) {
         if (null == id)
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         WarehouseUserEntity warehouseUserEntity = warehouseUserService.selectById(id);

src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java

@@ -10,8 +10,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
-public interface WarehouseUserDao extends BaseMapperPlus<WarehouseUserDao,WarehouseUserEntity,WarehouseUserEntity> {
-    int deleteByPrimaryKey(Integer id);
+public interface WarehouseUserDao extends BaseMapperPlus<WarehouseUserDao, WarehouseUserEntity, WarehouseUserEntity> {
 
     int deleteByCodeAndId(@Param("id") Long id, @Param("code") String code);
 
@@ -35,13 +34,13 @@ public interface WarehouseUserDao extends BaseMapperPlus<WarehouseUserDao,Wareho
 
     int updateBatchSelective(List<WarehouseUserEntity> list);
 
-    int batchInsert(@Param("list") List<WarehouseUserEntity> list);
 
     List<WarehouseUserEntity> selectListByCode(@Param("code") String code);
 
     List<WarehouseUserEntity> selectListkey(FilterInvLinkDataRequest filterInvLinkDataRequest);
 
-    List<WarehouseUserEntity> selectNotSelectUserid(@Param("userIds")List<Long> userIds );
+    List<WarehouseUserEntity> selectNotSelectUserid(@Param("userIds") List<Long> userIds);
+
     List<String> selectCodeByUser(@Param("userId") String userId);
 
     void deleteByCode(@Param("code") String code);

src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java

@@ -6,7 +6,7 @@ import lombok.Data;
 @Data
 public class FilterInvUserRequest extends ListPageRequest {
 
-    private Integer id;
+    private Long id;
     private String code;
     private Long userid;
     private String username;

src/main/java/com/glxp/api/service/auth/WarehouseUserService.java

@@ -18,7 +18,7 @@ public interface WarehouseUserService extends IService<WarehouseUserEntity> {
      * @return
      */
 
-    WarehouseUserEntity selectById(Integer id);
+    WarehouseUserEntity selectById(Long id);
 
     List<WarehouseUserEntity> getListByCode(String code);
 
@@ -48,7 +48,7 @@ public interface WarehouseUserService extends IService<WarehouseUserEntity> {
      *
      * @param id
      */
-    void deleteWarehouseUser(Integer id);
+    void deleteWarehouseUser(Long id);
 
     void deleteByCodeAndId(Long id, String code);
 
@@ -61,7 +61,8 @@ public interface WarehouseUserService extends IService<WarehouseUserEntity> {
      * @return
      */
     List<WarehouseUserEntity> getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest);
-    List<WarehouseUserEntity> selectNotSelectUserid(@Param("userIds")List<Long> userIds );
+
+    List<WarehouseUserEntity> selectNotSelectUserid(@Param("userIds") List<Long> userIds);
 
     /**
      * 根据分仓编码，统计用户数量
@@ -70,5 +71,6 @@ public interface WarehouseUserService extends IService<WarehouseUserEntity> {
      * @return
      */
     Integer countUserBySubInvCode(String subInvCode);
+
     boolean insert(WarehouseUserEntity warehouseUserEntity);
 }

src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.auth.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.auth.WarehouseUserDao;
@@ -28,7 +29,7 @@ public class WarehouseUserServiceImpl extends ServiceImpl<WarehouseUserDao, Ware
     private WarehouseUserDao warehouseUserDao;
 
     @Override
-    public WarehouseUserEntity selectById(Integer id) {
+    public WarehouseUserEntity selectById(Long id) {
         FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest();
         filterInvUserRequest.setId(id);
         List<WarehouseUserEntity> warehouseUserEntities = warehouseUserDao.filterList(filterInvUserRequest);
@@ -75,9 +76,10 @@ public class WarehouseUserServiceImpl extends ServiceImpl<WarehouseUserDao, Ware
                 warehouseUserEntity.setCode(code);
                 warehouseUserEntity.setUsername(user.getUserName());
                 warehouseUserEntity.setUserid(user.getId());
+                warehouseUserEntity.setId(IdUtil.getSnowflakeNextId());
                 warehouseUserEntities.add(warehouseUserEntity);
             });
-            warehouseUserDao.batchInsert(warehouseUserEntities);
+            warehouseUserDao.insertBatch(warehouseUserEntities);
         }
     }
 
@@ -100,9 +102,9 @@ public class WarehouseUserServiceImpl extends ServiceImpl<WarehouseUserDao, Ware
     }
 
     @Override
-    public void deleteWarehouseUser(Integer id) {
+    public void deleteWarehouseUser(Long id) {
         if (null != id) {
-            warehouseUserDao.deleteByPrimaryKey(id);
+            warehouseUserDao.deleteById(id);
         }
     }
 

src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml

@@ -38,12 +38,6 @@
             </if>
         </where>
     </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        <!--@mbg.generated-->
-        delete
-        from auth_warehouse_user
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
     <delete id="deleteByCodeAndId">
         <!--@mbg.generated-->
         delete
@@ -101,7 +95,7 @@
             </if>
         </set>
         isDirector = #{isDirector}
-        where id = #{id,jdbcType=INTEGER}
+                where id = #{id,jdbcType=INTEGER}
     </update>
     <update id="updateByPrimaryKey" parameterType="com.glxp.api.entity.auth.WarehouseUserEntity">
         <!--@mbg.generated-->
@@ -167,16 +161,6 @@
             #{item.id,jdbcType=INTEGER}
         </foreach>
     </update>
-    <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
-        <!--@mbg.generated-->
-        insert into auth_warehouse_user
-            (code, userId, userName, isDirector)
-        values
-        <foreach collection="list" item="item" separator=",">
-            (#{item.code,jdbcType=VARCHAR}, #{item.userid,jdbcType=BIGINT}, #{item.username,jdbcType=VARCHAR},
-             #{item.isDirector})
-        </foreach>
-    </insert>
     <insert id="insertOrUpdateEntity" keyColumn="id" keyProperty="id"
             parameterType="com.glxp.api.entity.auth.WarehouseUserEntity" useGeneratedKeys="true">
         <!--@mbg.generated-->
@@ -205,9 +189,9 @@
             <if test="id != null">
                 id = #{id,jdbcType=INTEGER},
             </if>
-            code = #{code,jdbcType=VARCHAR},
-                userId = #{userid,jdbcType=BIGINT},
-                userName = #{username,jdbcType=VARCHAR},
+            code     = #{code,jdbcType=VARCHAR},
+            userId   = #{userid,jdbcType=BIGINT},
+            userName = #{username,jdbcType=VARCHAR},
         </trim>
     </insert>
     <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id"
@@ -263,7 +247,7 @@
     <select id="selectListByCode" resultMap="BaseResultMap">
         select auth_warehouse_user.*, auth_user.employeeName
         from auth_warehouse_user
-                 inner join auth_user on auth_user.id = auth_warehouse_user.userId
+                     inner join auth_user on auth_user.id = auth_warehouse_user.userId
         where code = #{code}
     </select>
 
@@ -271,7 +255,7 @@
             parameterType="com.glxp.api.req.auth.FilterInvLinkDataRequest">
         select auth_warehouse_user.*, auth_user.employeeName
         from auth_warehouse_user
-        inner join auth_user on auth_user.id = auth_warehouse_user.userId
+                     inner join auth_user on auth_user.id = auth_warehouse_user.userId
         <where>
             <if test="code != '' and code != null">
                 AND code = #{code}

src/main/resources/schemas/schema_v2.1.sql

@@ -382,3 +382,8 @@ CALL Pro_Temp_ColumnWork('thr_dept', 'id', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'id', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('thr_products', 'id', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('thr_corp', 'id', 'bigint', 2);
+
+
+
+CALL Pro_Temp_ColumnWork('auth_dept_user', 'userId', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('auth_dept_user', 'deptId', 'bigint', 2);