diff --git a/src/main/java/com/qyft/gd/device/model/bo/DeviceStatus.java b/src/main/java/com/qyft/gd/device/model/bo/DeviceStatus.java index 372ba27..6e585e6 100644 --- a/src/main/java/com/qyft/gd/device/model/bo/DeviceStatus.java +++ b/src/main/java/com/qyft/gd/device/model/bo/DeviceStatus.java @@ -7,4 +7,5 @@ import lombok.Data; */ @Data public class DeviceStatus { + } diff --git a/src/main/java/com/qyft/gd/system/controller/UserController.java b/src/main/java/com/qyft/gd/system/controller/UserController.java index 563f74b..a8e5977 100644 --- a/src/main/java/com/qyft/gd/system/controller/UserController.java +++ b/src/main/java/com/qyft/gd/system/controller/UserController.java @@ -11,6 +11,7 @@ import com.qyft.gd.system.model.entity.User; import com.qyft.gd.system.service.UserService; import io.jsonwebtoken.Claims; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; @@ -79,9 +80,9 @@ public class UserController { } @Operation(summary = "删除用户") - @DeleteMapping("/{id}") - public Result deleteUser(@PathVariable Long id) { - boolean isSuccess = userService.deleteUser(id); + @DeleteMapping("/{ids}") + public Result deleteUser( @Parameter(description = "用户ID,多个以英文逗号(,)分割") @PathVariable String ids) { + boolean isSuccess = userService.deleteUser(ids); if (isSuccess) { return Result.success(); } diff --git a/src/main/java/com/qyft/gd/system/model/entity/User.java b/src/main/java/com/qyft/gd/system/model/entity/User.java index 068ab6d..79939bc 100644 --- a/src/main/java/com/qyft/gd/system/model/entity/User.java +++ b/src/main/java/com/qyft/gd/system/model/entity/User.java @@ -1,5 +1,6 @@ package com.qyft.gd.system.model.entity; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.qyft.gd.system.common.base.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; @@ -35,6 +36,7 @@ public class User extends BaseEntity { private Long role; @Schema(description = "是否删除(0-否 1-是)") + @TableLogic(value = "0", delval = "1") private Integer isDeleted; } \ No newline at end of file diff --git a/src/main/java/com/qyft/gd/system/service/UserService.java b/src/main/java/com/qyft/gd/system/service/UserService.java index cfe0ef6..d3a18b1 100644 --- a/src/main/java/com/qyft/gd/system/service/UserService.java +++ b/src/main/java/com/qyft/gd/system/service/UserService.java @@ -14,7 +14,7 @@ public interface UserService extends IService { boolean updateUser(User user); - boolean deleteUser(Long userId); + boolean deleteUser(String idsStr); } diff --git a/src/main/java/com/qyft/gd/system/service/impl/UserServiceImpl.java b/src/main/java/com/qyft/gd/system/service/impl/UserServiceImpl.java index 80d970c..5305403 100644 --- a/src/main/java/com/qyft/gd/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/qyft/gd/system/service/impl/UserServiceImpl.java @@ -8,6 +8,10 @@ import com.qyft.gd.system.service.UserService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + /** * 用户业务实现类 */ @@ -31,11 +35,11 @@ public class UserServiceImpl extends ServiceImpl implements Us } @Override - public boolean deleteUser(Long userId) { - User user = new User(); - user.setId(userId); - user.setIsDeleted(DeletedEnum.ENABLE.getValue()); - return this.baseMapper.updateById(user) > 0; + public boolean deleteUser(String idsStr) { + List ids = Arrays.stream(idsStr.split(",")) + .map(Long::parseLong) + .collect(Collectors.toList()); + return this.removeByIds(ids); } }