diff --git a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/DeptController.java b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/DeptController.java index ad140ea..6b11c2d 100644 --- a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/DeptController.java +++ b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/DeptController.java @@ -1,5 +1,6 @@ package com.xiang.xservice.auth.server.controller; +import com.alibaba.fastjson.JSON; import com.xiang.xservice.auth.api.dto.req.dept.DeptAddRequest; import com.xiang.xservice.auth.api.dto.req.dept.DeptQueryRequest; import com.xiang.xservice.auth.api.dto.req.dept.DeptUpdateRequest; @@ -7,7 +8,9 @@ import com.xiang.xservice.auth.api.dto.req.dept.DeptUserUpdateRequest; import com.xiang.xservice.auth.api.dto.resp.DeptDTO; import com.xiang.xservice.auth.service.service.XDeptService; import com.xiang.xservice.basic.common.resp.Result; +import com.xiang.xservice.basic.exception.BusinessException; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -23,38 +26,80 @@ import java.util.List; /** * 部门控制器 */ +@Slf4j @RestController @RequiredArgsConstructor public class DeptController { private final XDeptService deptService; + @PostMapping("/private/dept/list") public Result getDeptList(@RequestBody @Valid @NotNull(message = "请求参数不能为空") DeptQueryRequest request) { - return Result.success(new DeptDTO()); + return Result.success(deptService.getDeptList(request)); } @GetMapping("/private/dept/info/{id}") public Result getDeptInfo(@PathVariable Long id) { - return Result.success(new DeptDTO()); + return Result.success(deptService.getDeptInfo(id)); } @PostMapping("/private/dept/add") public Result addDept(@RequestBody @Valid @NotNull(message = "请求参数不能为空") DeptAddRequest request) { - return Result.success(); + try { + if (deptService.addDept(request)) { + return Result.success(); + } + } catch (BusinessException e) { + log.error("添加部门异常, 请求:{}", JSON.toJSONString(request), e); + return Result.error(e.getMessage()); + } catch (Exception e) { + log.error("添加部门异常, 请求:{}", JSON.toJSONString(request), e); + } + return Result.error(); } @PostMapping("/private/dept/update") public Result updateDept(@RequestBody @Valid @NotNull(message = "请求参数不能为空") DeptUpdateRequest request) { - return Result.success(); + try { + if (deptService.updateDept(request)) { + return Result.success(); + } + } catch (BusinessException e) { + log.error("更新部门异常, 请求:{}", JSON.toJSONString(request), e); + return Result.error(e.getMessage()); + } catch (Exception e) { + log.error("更新部门异常, 请求:{}", JSON.toJSONString(request), e); + } + return Result.error(); } @PostMapping("/private/dept/del") public Result delDept(@RequestParam @Valid @NotEmpty(message = "请求参数不能为空") List ids) { - return Result.success(); + try { + if (deptService.delDept(ids)) { + return Result.success(); + } + } catch (BusinessException e) { + log.error("删除部门异常, 请求:{}", JSON.toJSONString(ids), e); + return Result.error(e.getMessage()); + } catch (Exception e) { + log.error("删除部门异常, 请求:{}", JSON.toJSONString(ids), e); + } + return Result.error(); } @PostMapping("/private/dept/setUser") - public Result setUserDept(@RequestBody @Valid @NotNull(message = "请求参数不能为空") DeptUserUpdateRequest request) { - return Result.success(true); + public Result setUserDept(@RequestBody @Valid @NotNull(message = "请求参数不能为空") DeptUserUpdateRequest request) { + try { + if (deptService.setUserDept(request)) { + return Result.success(); + } + } catch (BusinessException e) { + log.error("部门添加用户失败, 请求:{}", JSON.toJSONString(request), e); + return Result.error(e.getMessage()); + } catch (Exception e) { + log.error("部门添加用户失败, 请求:{}", JSON.toJSONString(request), e); + } + return Result.error(); } }