添加删除、批量删除用户及权限接口

jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockUser/controller/InterlockUserController.java

@@ -193,7 +193,7 @@ public class InterlockUserController extends JeecgController<InterlockUser, IInt
 	 /**
 	  *  编辑用户
 	  *
-	  * @param interlockUser
+	  * @param interlockUserAdd
 	  * @return
 	  */
 	 @AutoLog(value = "联锁管理系统用户表-编辑用户")
@@ -204,4 +204,33 @@ public class InterlockUserController extends JeecgController<InterlockUser, IInt
 		 return interlockUserService.editUser(request, interlockUserAdd);
 	 }
 
+	 /**
+	  *   通过id删除用户及权限
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "联锁管理系统用户表-通过id删除用户及权限")
+	 @ApiOperation(value="联锁管理系统用户表-通过id删除用户及权限", notes="联锁管理系统用户表-通过id删除用户及权限")
+	 //@RequiresPermissions("org.jeecg.modules:interlock_user:delete")
+	 @DeleteMapping(value = "/deleteUser")
+	 public Result<String> deleteUser(@RequestParam(name="id",required=true) String id) {
+		 return interlockUserService.deleteUser(id);
+	 }
+
+	 /**
+	  *  批量删除用户及权限
+	  *
+	  * @param ids
+	  * @return
+	  */
+	 @AutoLog(value = "联锁管理系统用户表-批量删除用户及权限")
+	 @ApiOperation(value="联锁管理系统用户表-批量删除用户及权限", notes="联锁管理系统用户表-批量删除用户及权限")
+	 //@RequiresPermissions("org.jeecg.modules:interlock_user:deleteBatch")
+	 @DeleteMapping(value = "/deleteBatchUser")
+	 public Result<String> deleteBatchUser(@RequestParam(name="ids",required=true) String ids) {
+		 interlockUserService.deleteBatchUser(Arrays.asList(ids.split(",")));
+		 return Result.OK("批量删除成功!");
+	 }
+
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockUser/service/IInterlockUserService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.interlockUser.entity.InterlockUserAdd;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * @Description: 联锁管理系统用户表
@@ -29,6 +30,22 @@ public interface IInterlockUserService extends IService<InterlockUser> {
      *   des: 编辑用户
      *   date: 2024/7/29
      */
-    public Result<String> editUser(HttpServletRequest request, InterlockUserAdd interlockUserAdd);
+    Result<String> editUser(HttpServletRequest request, InterlockUserAdd interlockUserAdd);
+
+    /**
+     *   author: sl
+     *   version: 1.0
+     *   des: 通过id删除用户及权限
+     *   date: 2024/7/30
+     */
+    Result<String> deleteUser(String id);
+
+    /**
+     *   author: sl
+     *   version: 1.0
+     *   des: 批量删除用户及权限
+     *   date: 2024/7/30
+     */
+    Result<String> deleteBatchUser(List<String> idList);
 
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockUser/service/impl/InterlockUserServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.interlockUser.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.interlockSystemLimit.entity.InterlockSystemLimit;
 import org.jeecg.modules.interlockSystemLimit.service.IInterlockSystemLimitService;
@@ -17,6 +18,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -63,7 +65,7 @@ public class InterlockUserServiceImpl extends ServiceImpl<InterlockUserMapper, I
         interlockUser.setRemark(interlockUserAdd.getRemark());//描述
         interlockUser.setRole(interlockUserAdd.getRole());//角色（0管理员1其他角色）
         //由于权限表中需要用户id，所以先添加用户表信息后在添加系统权限信息
-        save(interlockUser);
+        this.save(interlockUser);
         //创建一个用户权限列表，用来存放系统权限信息 填充权限信息列表
         List<InterlockSystemLimit> interlockSystemLimitList = new ArrayList<>(interlockUserAdd.getSystemLimitList());
         for(InterlockSystemLimit interlockSystemLimit:interlockSystemLimitList){
@@ -106,9 +108,44 @@ public class InterlockUserServiceImpl extends ServiceImpl<InterlockUserMapper, I
             interlockSystemLimit.setUpdateBy(wiseUser);
             interlockSystemLimit.setInterlockUserId(interlockUserAdd.getId());
         }
-        updateById(interlockUser);
+        this.updateById(interlockUser);
         interlockSystemLimitService.updateBatchById(interlockSystemLimitList);
         return Result.OK("用户编辑成功!");
     }
 
+    /**
+     *   author: sl
+     *   version: 1.0
+     *   des: 通过id删除用户及权限
+     *   date: 2024/7/30
+     */
+    public Result<String> deleteUser(String id){
+        this.removeById(id);
+        //删除方法1
+        QueryWrapper<InterlockSystemLimit> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("interlock_user_id",id);
+        interlockSystemLimitService.remove(queryWrapper);
+
+//        //删除方法2
+//        Map<String,Object> map = new HashMap<>();
+//        map.put("interlock_user_id",id);
+//        interlockSystemLimitService.removeByMap(map);
+        return Result.OK("用户删除成功!");
+    }
+
+    /**
+     *   author: sl
+     *   version: 1.0
+     *   des: 批量删除用户及权限
+     *   date: 2024/7/30
+     */
+    public Result<String> deleteBatchUser(List<String> idList){
+        this.removeByIds(idList);
+        //删除方法1
+        QueryWrapper<InterlockSystemLimit> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("interlock_user_id",idList);
+        interlockSystemLimitService.remove(queryWrapper);
+        return Result.OK("用户删除成功!");
+    }
+
 }