From fa79d7a83bbc2a12cd5444e234ca5a5647321571 Mon Sep 17 00:00:00 2001 From: ffr <492210217@qq.com> Date: Mon, 1 Apr 2024 21:19:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/remote/RemoteDeptService.java | 1 - .../system/remote/RemoteEmployeeService.java | 95 ++++++++++++++++ .../factory/RemoteDeptFallbackFactory.java | 4 +- .../RemoteEmployeeFallbackFactory.java | 59 ++++++++++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../server/controller/EmployeeController.java | 96 ++++++++++++++++ .../server/controller/ManageController.java | 36 ++++-- .../server/service/EmployeeService.java | 22 ++++ .../service/impl/EmployeeServiceImpl.java | 106 ++++++++++++++++++ .../service/impl/ManageServiceImpl.java | 50 +++++++-- .../system/controller/SysDeptController.java | 23 +++- .../system/controller/SysUserController.java | 19 +++- .../couplet/system/mapper/SysDeptMapper.java | 2 +- .../couplet/system/mapper/SysUserMapper.java | 2 + .../system/service/SysDeptService.java | 9 +- .../system/service/SysUserService.java | 2 + .../service/impl/SysDeptServiceImpl.java | 13 ++- .../service/impl/SysUserServiceImpl.java | 6 + .../resources/mapper/system/SysDeptMapper.xml | 7 +- .../resources/mapper/system/SysUserMapper.xml | 4 + 20 files changed, 520 insertions(+), 37 deletions(-) create mode 100644 couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteEmployeeService.java create mode 100644 couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteEmployeeFallbackFactory.java create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/EmployeeController.java create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/EmployeeService.java create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/EmployeeServiceImpl.java diff --git a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteDeptService.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteDeptService.java index b4fec46..8a7dbfe 100644 --- a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteDeptService.java +++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteDeptService.java @@ -35,7 +35,6 @@ public interface RemoteDeptService { @GetMapping("/getSysDeptByDeptId/{deptId}") public Result> getSysDeptByDeptId(@PathVariable(value = "deptId") Long deptId); - /* * @param dept: * @return Result diff --git a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteEmployeeService.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteEmployeeService.java new file mode 100644 index 0000000..94bf73e --- /dev/null +++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteEmployeeService.java @@ -0,0 +1,95 @@ +package com.couplet.common.system.remote; + +import com.couplet.common.core.constant.ServiceNameConstants; +import com.couplet.common.core.domain.Result; +import com.couplet.common.core.web.page.TableDataInfo; +import com.couplet.common.system.domain.SysUser; +import com.couplet.common.system.remote.factory.RemoteEmployeeFallbackFactory; +import lombok.extern.java.Log; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/* + * @param null: + * @return null + * @author 付凡芮 + * @description 远程调用用户服务 + * @date + */ +@FeignClient(contextId = "remoteEmployeeService", + value = ServiceNameConstants.SYSTEM_SERVICE, + fallbackFactory = RemoteEmployeeFallbackFactory.class, + path = "/user") +public interface RemoteEmployeeService { + + + /* + * @param user: + * @return Result> + * @author 付凡芮 + * @description 调用用户列表 + * @date + */ + @PostMapping("/list") + public Result> list (SysUser user); + + + /* + * @param user: + * @return Result + * @author 付凡芮 + * @description 添加用户管理 + * @date + */ + @PostMapping + public Result add (@Validated @RequestBody SysUser user); + + + /* + * @param user: + * @return Result + * @author 付凡芮 + * @description 修改用户 + * @date + */ + @PutMapping + public Result edit (@Validated @RequestBody SysUser user); + + + /* + * @param userIds: + * @return Result + * @author 付凡芮 + * @description 删除用户 + * @date + */ + @DeleteMapping("/{userIds}") + public Result remove (@PathVariable(value = "userIds") Long[] userIds); + + /* + * @param null: + * @return null + * @author 付凡芮 + * @description X修改用户状态 + * @date + */ + @PutMapping("/changeStatus") + public Result changeStatus (@RequestBody SysUser user); + + + /* + * @param deptId: + * @return Result> + * @author 付凡芮 + * @description 根据deptId获取企业下有那些员工 + * @date + */ + @PostMapping("userList/{deptId}") + public Result> userList(@PathVariable(value = "deptId") Long deptId); + + + +} diff --git a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteDeptFallbackFactory.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteDeptFallbackFactory.java index e334518..e0a1b6d 100644 --- a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteDeptFallbackFactory.java +++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteDeptFallbackFactory.java @@ -11,7 +11,7 @@ import java.util.List; /** * @author fufanrui * @version 1.0 - * @description: TODO + * @description: 企业服务降级处理 * @date 2024/3/27 15:29 */ @Slf4j @@ -30,7 +30,6 @@ public class RemoteDeptFallbackFactory implements FallbackFactory> getSysDeptByDeptId(Long deptId) { return Result.error("调用失败...."+cause.getMessage()); } + /* * @param cause: * @return RemoteDeptService diff --git a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteEmployeeFallbackFactory.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteEmployeeFallbackFactory.java new file mode 100644 index 0000000..1687ff6 --- /dev/null +++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteEmployeeFallbackFactory.java @@ -0,0 +1,59 @@ +package com.couplet.common.system.remote.factory; + +import com.couplet.common.core.domain.Result; +import com.couplet.common.core.web.page.TableDataInfo; +import com.couplet.common.system.domain.SysUser; +import com.couplet.common.system.remote.RemoteEmployeeService; +import org.springframework.cloud.openfeign.FallbackFactory; + +import java.util.List; + +/** + * @author fufanrui + * @version 1.0 + * @description: 员工服务降级处理 + * @date 2024/3/31 19:43 + */ +public class RemoteEmployeeFallbackFactory implements FallbackFactory { + @Override + public RemoteEmployeeService create(Throwable cause) { + return new RemoteEmployeeService() { + /* + * @param user: + * @return Result> + * @author 付凡芮 + * @description 员工列表 + * @date + */ + @Override + public Result> list(SysUser user) { + return Result.error("调用失败"+cause.getMessage()); + } + + @Override + public Result add(SysUser user) { + return Result.error("调用失败"+cause.getMessage()); + } + + @Override + public Result edit(SysUser user) { + return Result.error("调用失败"+cause.getMessage()); + } + + @Override + public Result remove(Long[] userIds) { + return Result.error("调用失败"+cause.getMessage()); + } + + @Override + public Result changeStatus(SysUser user) { + return Result.error("调用失败"+cause.getMessage()); + } + + @Override + public Result> userList(Long deptId) { + return Result.error("调用失败...."+cause.getMessage()); + } + }; + } +} diff --git a/couplet-common/couplet-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/couplet-common/couplet-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index a990272..428b4e8 100644 --- a/couplet-common/couplet-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/couplet-common/couplet-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -2,3 +2,4 @@ com.couplet.common.system.remote.factory.RemoteUserFallbackFactory com.couplet.common.system.remote.factory.RemoteLogFallbackFactory com.couplet.common.system.remote.factory.RemoteFileFallbackFactory com.couplet.common.system.remote.factory.RemoteDeptFallbackFactory +com.couplet.common.system.remote.factory.RemoteEmployeeFallbackFactory diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/EmployeeController.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/EmployeeController.java new file mode 100644 index 0000000..c06e2c9 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/EmployeeController.java @@ -0,0 +1,96 @@ +package com.couplet.server.controller; + +import com.couplet.common.core.domain.Result; +import com.couplet.common.core.web.controller.BaseController; +import com.couplet.common.core.web.page.TableDataInfo; +import com.couplet.common.security.annotation.RequiresPermissions; +import com.couplet.common.system.domain.SysUser; +import com.couplet.server.service.EmployeeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +import static com.couplet.common.core.utils.PageUtils.startPage; + +/** + * @author fufanrui + * @version 1.0 + * @description: 员工管理控制器 + * @date 2024/3/31 19:41 + */ + +@RestController +@RequestMapping("employee") +public class EmployeeController extends BaseController { + + @Autowired + private EmployeeService employeeservice; + + /* + * @param user: + * @return Result> + * @author 付凡芮 + * @description 员工列表 + * @date + */ + @RequiresPermissions("system:user:list") + @PostMapping("employeeList") + public Result> userList (SysUser user){ + startPage(); + List list = employeeservice.userList(user); + return getDataTable(list); + } + /* + * @param user: + * @return Result + * @author 付凡芮 + * @description 添加员工 + * @date + */ + @PostMapping + @RequiresPermissions("system:user:add") + public Result insert (@RequestBody SysUser user) { + return employeeservice.insert(user); + } + + /* + * @param user: + * @return Result + * @author 付凡芮 + * @description 修改员工 + * @date + */ + @RequiresPermissions("system:user:edit") + @PutMapping + public Result edit (@RequestBody SysUser user) { + return employeeservice.deit(user); + } + + /* + * @param userIds: + * @return Result + * @author 付凡芮 + * @description 删除员工 + * @date + */ + @RequiresPermissions("system:user:remove") + @DeleteMapping("/{userIds}") + public Result remove (@PathVariable(value = "userIds") Long[] userIds) { + return employeeservice.remove(userIds); + } + + /* + * @param user: + * @return Result + * @author 付凡芮 + * @description 修改员工状态 + * @date + */ + @RequiresPermissions("system:user:edit") + @PutMapping("/changeStatus") + public Result changeStatus(@RequestBody SysUser user){ + return employeeservice.changeStatus(user); + } + +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/ManageController.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/ManageController.java index d260a66..443a909 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/ManageController.java +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/ManageController.java @@ -28,7 +28,7 @@ public class ManageController { * @description 登入后获取到企业下的所有部门 * @date */ - @GetMapping("manageList") + @PostMapping("manageList") @RequiresPermissions("system:dept:list") public Result> manageList() { List sysDepts = manageServer.selectDeptList(); @@ -51,6 +51,13 @@ public class ManageController { } + /* + * @param sysDept: + * @return Result + * @author 付凡芮 + * @description 修改企业部门信息 + * @date + */ @RequiresPermissions("system:dept:edit") @Log(title = "部门管理", businessType = BusinessType.UPDATE) @PutMapping @@ -58,6 +65,13 @@ public class ManageController { return manageServer.manageEdit(sysDept); } + /* + * @param deptId: + * @return Result + * @author 付凡芮 + * @description 删除部门信息 + * @date + */ @RequiresPermissions("system:dept:remove") @Log(title = "部门管理", businessType = BusinessType.DELETE) @DeleteMapping("/{deptId}") @@ -71,6 +85,13 @@ public class ManageController { // return manageServer.getSysDeptByDeptId(deptId); // } + /* + * @param deptId: + * @return Result + * @author 付凡芮 + * @description 根据deptId获取信息 + * @date + */ @RequiresPermissions("system:dept:query") @GetMapping(value = "/{deptId}") public Result getInfo(@PathVariable Long deptId) { @@ -79,15 +100,16 @@ public class ManageController { + /* + * @param deptId: + * @return Result + * @author 付凡芮 + * @description 获取企业列表 + * @date + */ @RequiresPermissions("system:dept:list") @GetMapping("/list/exclude/{deptId}") public Result excludeChild(@PathVariable(value = "deptId") Long deptId) { return manageServer.excludeChild(deptId); } - - - - - - } diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/EmployeeService.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/EmployeeService.java new file mode 100644 index 0000000..b30cc38 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/EmployeeService.java @@ -0,0 +1,22 @@ +package com.couplet.server.service; + +import com.couplet.common.core.domain.Result; +import com.couplet.common.core.web.page.TableDataInfo; +import com.couplet.common.system.domain.SysUser; + +import java.util.List; + +public interface EmployeeService { + TableDataInfo employeeList(SysUser user); + + Result insert(SysUser user); + + Result deit(SysUser user); + + Result remove(Long[] userIds); + + Result changeStatus(SysUser user); + + List userList(SysUser user); + +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/EmployeeServiceImpl.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/EmployeeServiceImpl.java new file mode 100644 index 0000000..faeacc6 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/EmployeeServiceImpl.java @@ -0,0 +1,106 @@ +package com.couplet.server.service.impl; + +import com.couplet.common.core.constant.SecurityConstants; +import com.couplet.common.core.domain.Result; +import com.couplet.common.core.web.page.TableDataInfo; +import com.couplet.common.security.utils.SecurityUtils; +import com.couplet.common.system.domain.LoginUser; +import com.couplet.common.system.domain.SysUser; +import com.couplet.common.system.remote.RemoteEmployeeService; +import com.couplet.common.system.remote.RemoteUserService; +import com.couplet.server.service.EmployeeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author fufanrui + * @version 1.0 + * @description: 员工管理服务实现类 + * @date 2024/3/31 19:42 + */ +@Service +public class EmployeeServiceImpl implements EmployeeService{ + + + @Autowired + private RemoteEmployeeService remoteEmployeeService; + @Autowired + private RemoteUserService remoteUserService; + + /* + * @param null: + * @return null + * @author 付凡芮 + * @description 员工列表 + * @date + */ + + @Override + public TableDataInfo employeeList(SysUser user) { + Result> list = remoteEmployeeService.list(user); + TableDataInfo employeeList = list.getData(); + return employeeList; + } + + /* + * @param user: + * @return Result + * @author 付凡芮 + * @description 添加员工 + * @date + */ + @Override + public Result insert(SysUser user) { + return remoteEmployeeService.add(user); + } + /* + * @param user: + * @return Result + * @author 付凡芮 + * @description 修改员工信息 + * @date + */ + @Override + public Result deit(SysUser user) { + return remoteEmployeeService.edit(user); + } + + /* + * @param userIds: + * @return Result + * @author 付凡芮 + * @description 删除员工信息 + * @date + */ + @Override + public Result remove(Long[] userIds) { + return remoteEmployeeService.remove(userIds); + } + + /* + * @param user: + * @return Result + * @author 付凡芮 + * @description 修改员工状态 + * @date + */ + @Override + public Result changeStatus(SysUser user) { + return remoteEmployeeService.changeStatus(user); + } + + @Override + public List userList(SysUser user) { + String username = SecurityUtils.getUsername(); + Result userInfo = remoteUserService.getUserInfo(username, SecurityConstants.FROM_SOURCE); + LoginUser data = userInfo.getData(); + SysUser sysUser = data.getSysUser(); + Long deptId = sysUser.getDeptId(); + Result> listResult = remoteEmployeeService.userList(deptId); + List userList = listResult.getData(); + return userList; + } + +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java index 48c8f28..33f2bf5 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java @@ -29,42 +29,78 @@ public class ManageServiceImpl implements ManageServer{ @Autowired private RemoteUserService remoteUserService; + /* + * @param : + * @return List + * @author 付凡芮 + * @description 企业管理列表 + * @date + */ @Override public List selectDeptList() { LoginUser loginUser = SecurityUtils.getLoginUser(); - String username = loginUser.getUsername(); - Result userInfo = remoteUserService.getUserInfo(username, SecurityConstants.FROM_SOURCE); - LoginUser user = userInfo.getData(); - Long deptId = user.getDeptId(); + Long deptId = loginUser.getSysUser().getDeptId(); Result> sysDeptByDeptId = remoteDeptService.getSysDeptByDeptId(deptId); List dept = sysDeptByDeptId.getData(); return dept; } + /* + * @param sysDept: + * @return Result + * @author 付凡芮 + * @description 添加企业部门 + * @date + */ @Override public Result insertDept(SysDept sysDept) { return remoteDeptService.add(sysDept); } + /* + * @param sysDept: + * @return Result + * @author 付凡芮 + * @description 修改企业部门信息 + * @date + */ @Override public Result manageEdit(SysDept sysDept) { return remoteDeptService.edit(sysDept); } + /* + * @param deptId: + * @return Result + * @author 付凡芮 + * @description 删除企业部门信息 + * @date + */ @Override public Result manageRemove(Long deptId) { return remoteDeptService.remove(deptId); } - - - + /* + * @param deptId: + * @return Result + * @author 付凡芮 + * @description 获取企业信息 + * @date + */ @Override public Result getInfo(Long deptId) { return remoteDeptService.getInfo(deptId); } + /* + * @param deptId: + * @return Result + * @author 付凡芮 + * @description 获取企业部门 + * @date + */ @Override public Result excludeChild(Long deptId) { return remoteDeptService.excludeChild(deptId); diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java index 1e07985..b4ad044 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java @@ -1,20 +1,31 @@ package com.couplet.system.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.couplet.common.core.constant.SecurityConstants; import com.couplet.common.core.constant.UserConstants; import com.couplet.common.core.utils.StringUtils; import com.couplet.common.core.web.controller.BaseController; import com.couplet.common.core.domain.Result; +import com.couplet.common.core.web.page.PageDomain; +import com.couplet.common.core.web.page.TableDataInfo; +import com.couplet.common.core.web.page.TableSupport; import com.couplet.common.log.annotation.Log; import com.couplet.common.log.enums.BusinessType; import com.couplet.common.security.annotation.RequiresPermissions; import com.couplet.common.security.utils.SecurityUtils; +import com.couplet.common.system.domain.LoginUser; import com.couplet.common.system.domain.SysDept; +import com.couplet.common.system.remote.RemoteUserService; import com.couplet.system.service.SysDeptService; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.math3.analysis.solvers.BrentSolver; +import org.apache.commons.math3.analysis.solvers.SecantSolver; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; import java.util.List; /** * 部门信息 @@ -26,7 +37,8 @@ public class SysDeptController extends BaseController { @Autowired private SysDeptService deptService; - + @Autowired + private RemoteUserService remoteUserService; /** * 获取部门列表 */ @@ -110,14 +122,13 @@ public class SysDeptController extends BaseController { } /** - * 根据企业ID获取企业下部门 - * @param deptId 企业ID - * @return 企业信息，内含有部门 + * */ @GetMapping("/getSysDeptByDeptId/{deptId}") public Result> getSysDeptByDeptId(@PathVariable(value = "deptId") Long deptId){ - List sysDept = deptService.getSysDeptByDeptId(deptId); - Result> success = Result.success(sysDept); + List sysDepts = deptService.getSysDeptByDeptId(deptId); + Result> success = Result.success(sysDepts); return success; } + } diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysUserController.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysUserController.java index 5a78769..860eb0f 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysUserController.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysUserController.java @@ -60,7 +60,7 @@ public class SysUserController extends BaseController { * 获取用户列表 */ @RequiresPermissions("system:user:list") - @GetMapping("/list") + @PostMapping("/list") public Result> list (SysUser user) { startPage(); List list = userService.selectUserList(user); @@ -107,7 +107,7 @@ public class SysUserController extends BaseController { // 权限集合 Set permissions = permissionService.getMenuPermission(sysUser); // 查询企业信息 - Long deptId = deptService.selectDeptIdByLeader(sysUser.getUserName()); + Long deptId = deptService.selectDeptIdByLeader(sysUser.getDept().getLeader()); LoginUser sysUserVo = new LoginUser(); sysUserVo.setSysUser(sysUser); sysUserVo.setRoles(roles); @@ -291,4 +291,19 @@ public class SysUserController extends BaseController { public Result deptTree (SysDept dept) { return success(deptService.selectDeptTreeList(dept)); } + + + /* + * @param null: + * @return null + * @author 付凡芮 + * @description 根据deptId获取企业下的员工 + * @date + */ + @PostMapping("userList/{deptId}") + public Result> userList(@PathVariable(value = "deptId") Long deptId){ + List userList = userService.userList(deptId); + Result> success = Result.success(userList); + return success; + } } diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/mapper/SysDeptMapper.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/mapper/SysDeptMapper.java index 93eaddf..48a0d5c 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/mapper/SysDeptMapper.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/mapper/SysDeptMapper.java @@ -129,7 +129,7 @@ public interface SysDeptMapper extends BaseMapper { */ public int deleteDeptById (Long deptId); - SysDept selectDeptIdByLeader(String userName); + List selectDeptIdByLeader(String userName); List getSysDeptByDeptId(Long deptId); diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/mapper/SysUserMapper.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/mapper/SysUserMapper.java index f2c57c7..87105d0 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/mapper/SysUserMapper.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/mapper/SysUserMapper.java @@ -139,4 +139,6 @@ public interface SysUserMapper extends BaseMapper { * @return 结果 */ public SysUser checkEmailUnique (String email); + + List userList(Long deptId); } diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysDeptService.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysDeptService.java index 00fb12f..9c62b45 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysDeptService.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysDeptService.java @@ -1,6 +1,7 @@ package com.couplet.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.couplet.common.core.web.page.TableDataInfo; import com.couplet.common.system.domain.SysDept; import com.couplet.system.domain.vo.TreeSelect; @@ -138,15 +139,17 @@ public interface SysDeptService extends IService { /** * 通过负责人查询企业ID - * @param userName 负责人 + * @param leader 负责人 * @return 企业ID */ - Long selectDeptIdByLeader (String userName); - + Long selectDeptIdByLeader(String leader); /** * 根据企业ID获取企业下部门 * @param deptId 企业ID * @return 企业信息，内含有部门 */ List getSysDeptByDeptId(Long deptId); + + + } diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysUserService.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysUserService.java index 6899bbe..d0db856 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysUserService.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysUserService.java @@ -225,4 +225,6 @@ public interface SysUserService extends IService { * @return 结果 */ public String importUser (List userList, Boolean isUpdateSupport, String operName); + + List userList(Long deptId); } diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysDeptServiceImpl.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysDeptServiceImpl.java index 89ddf0f..ae62121 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysDeptServiceImpl.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysDeptServiceImpl.java @@ -7,6 +7,7 @@ import com.couplet.common.core.exception.ServiceException; import com.couplet.common.core.text.Convert; import com.couplet.common.core.utils.SpringUtils; import com.couplet.common.core.utils.StringUtils; +import com.couplet.common.core.web.page.TableDataInfo; import com.couplet.common.datascope.annotation.DataScope; import com.couplet.common.security.utils.SecurityUtils; import com.couplet.common.system.domain.SysDept; @@ -284,16 +285,16 @@ public class SysDeptServiceImpl extends ServiceImpl impl /** * 通过负责人查询企业ID * - * @param userName 负责人 + * @param leader 负责人 * * @return 企业ID */ @Override - public Long selectDeptIdByLeader (String userName) { + public Long selectDeptIdByLeader (String leader) { - SysDept sysDept = deptMapper.selectDeptIdByLeader(userName); - - return sysDept == null ? null : sysDept.getDeptId(); + List sysDept = deptMapper.selectDeptIdByLeader(leader); + Long deptId = sysDept.get(0).getDeptId(); + return sysDept == null ? null : deptId; } @@ -308,9 +309,9 @@ public class SysDeptServiceImpl extends ServiceImpl impl @Override public List getSysDeptByDeptId(Long deptId) { - return deptMapper.getSysDeptByDeptId(deptId); } + /** * 递归列表 */ diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysUserServiceImpl.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysUserServiceImpl.java index 4683c96..50446df 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysUserServiceImpl.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysUserServiceImpl.java @@ -502,4 +502,10 @@ public class SysUserServiceImpl extends ServiceImpl impl return successMsg.toString(); } + @Override + public List userList(Long deptId) { + + return userMapper.userList(deptId); + } + } diff --git a/couplet-modules/couplet-system/src/main/resources/mapper/system/SysDeptMapper.xml b/couplet-modules/couplet-system/src/main/resources/mapper/system/SysDeptMapper.xml index 8adf7a8..4e0bb0f 100644 --- a/couplet-modules/couplet-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/couplet-modules/couplet-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -109,10 +109,13 @@ where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1 + diff --git a/couplet-modules/couplet-system/src/main/resources/mapper/system/SysUserMapper.xml b/couplet-modules/couplet-system/src/main/resources/mapper/system/SysUserMapper.xml index 25782d4..e9bba54 100644 --- a/couplet-modules/couplet-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/couplet-modules/couplet-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -183,6 +183,10 @@ and del_flag = '0' limit 1 + insert into sys_user(