From 24c219c145f456bc9be8c26042351d7cde1c33c9 Mon Sep 17 00:00:00 2001 From: ffr <492210217@qq.com> Date: Sat, 30 Mar 2024 09:50:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/security/utils/SecurityUtils.java | 2 +- .../common/system/domain/LoginUser.java | 2 +- .../system/remote/RemoteDeptService.java | 18 +++++-- .../factory/RemoteDeptFallbackFactory.java | 17 +++++-- .../server/controller/ManageController.java | 47 +++++++++++++++---- .../couplet/server/service/ManageServer.java | 8 +++- .../service/impl/ManageServiceImpl.java | 31 ++++++++---- .../system/controller/SysDeptController.java | 12 +++-- .../system/controller/SysUserController.java | 2 +- .../couplet/system/mapper/SysDeptMapper.java | 5 ++ .../system/service/SysDeptService.java | 8 ++-- .../service/impl/SysDeptServiceImpl.java | 24 +++++----- .../resources/mapper/system/SysDeptMapper.xml | 6 +++ 13 files changed, 130 insertions(+), 52 deletions(-) diff --git a/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/utils/SecurityUtils.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/utils/SecurityUtils.java index 27f67ea..ceb5537 100644 --- a/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/utils/SecurityUtils.java +++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/utils/SecurityUtils.java @@ -49,7 +49,7 @@ public class SecurityUtils { * 获取登录企业ID */ public static Long getEnterpriseId(){ - Long enterpriseId = getLoginUser().getEnterpriseId(); + Long enterpriseId = getLoginUser().getDeptId(); Assert.notNull(enterpriseId, "该用户未绑定负责企业"); return enterpriseId; } diff --git a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/LoginUser.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/LoginUser.java index 338dcb9..e00c31e 100644 --- a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/LoginUser.java +++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/LoginUser.java @@ -61,7 +61,7 @@ public class LoginUser implements Serializable { /** * 企业ID */ - private Long enterpriseId; + private Long deptId; /** * 用户信息 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 a05dd4f..cdf107b 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 @@ -6,12 +6,18 @@ import com.couplet.common.core.web.page.TableDataInfo; import com.couplet.common.system.domain.SysDept; import com.couplet.common.system.domain.SysUser; import com.couplet.common.system.remote.factory.RemoteDeptFallbackFactory; +import lombok.extern.java.Log; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; -@FeignClient(contextId = "remoteFileService" , +@FeignClient(contextId = "remoteDeptService" , value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteDeptFallbackFactory.class, path = "/dept" @@ -28,9 +34,13 @@ public interface RemoteDeptService { /** * 根据企业ID获取企业下部门 - * @param enterpriseId 企业ID + * @param deptId 企业ID * @return 企业信息，内含有部门 */ - @GetMapping("/getSysDeptByEnterpriseId/{enterpriseId}") - public Result getSysDeptByEnterpriseId(@PathVariable(value = "enterpriseId") Long enterpriseId); + @GetMapping("/getSysDeptByDeptId/{deptId}") + public Result> getSysDeptByDeptId(@PathVariable(value = "deptId") Long deptId); + + + @PostMapping + public Result add (@Validated @RequestBody SysDept dept); } 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 24ef720..77b1c36 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 @@ -8,6 +8,8 @@ import com.couplet.common.system.remote.RemoteDeptService; import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.openfeign.FallbackFactory; +import java.util.List; + /** * @author fufanrui * @version 1.0 @@ -20,24 +22,31 @@ public class RemoteDeptFallbackFactory implements FallbackFactory getSysDeptByEnterpriseId (Long enterpriseId) { - return Result.error("调用失败..."+cause.getMessage()); + public Result> getSysDeptByDeptId(Long deptId) { + return Result.error("调用失败...."+cause.getMessage()); } + @Override + public Result add(SysDept dept) { + return Result.error("调用失败...."+cause.getMessage()); + } }; + } } 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 d51e9b6..fd75674 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 @@ -1,23 +1,50 @@ package com.couplet.server.controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.couplet.common.core.domain.Result; +import com.couplet.common.system.domain.SysDept; +import com.couplet.server.service.ManageServer; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import java.util.List; -/** - * @author fufanrui - * @version 1.0 - * @description: TODO - * @date 2024/3/27 15:33 - */ + @RestController @RequestMapping("/manage") public class ManageController { + @Autowired + private ManageServer manageServer; + + + /* + * @param sysDept: + * @return Result + * @author 付凡芮 + * @description 登入后获取到企业下的所有部门 + * @date + */ + @PostMapping("manageList") + public Result manageList(@RequestBody SysDept sysDept) { + List sysDepts = manageServer.selectDeptList(sysDept); + return Result.success(sysDepts); + } + + + /* + * @param sysDept: + * @return Result + * @author 付凡芮 + * @description 添加企业中的部门 + * @date + */ + @PostMapping("manageInsert") + public Result manageInsert(@RequestBody SysDept sysDept) { + + return manageServer.insertDept(sysDept); + } + diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java index 3728604..586c33e 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java @@ -1,9 +1,15 @@ package com.couplet.server.service; -import com.couplet.remote.DeptServiceFegin; +import com.couplet.common.core.domain.Result; +import com.couplet.common.system.domain.SysDept; import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; + public interface ManageServer { + List selectDeptList(SysDept sysDept); + + Result insertDept(SysDept sysDept); } 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 a0e9b61..188e3ee 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 @@ -1,32 +1,43 @@ 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.utils.StringUtils; 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.RemoteDeptService; +import com.couplet.common.system.remote.RemoteUserService; import com.couplet.server.service.ManageServer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + /** * @author fufanrui * @version 1.0 - * @description: TODO + * @description: 管理企业业务层 * @date 2024/3/27 15:34 */ @Service -public class ManageServiceImpl implements ManageServer { +public class ManageServiceImpl implements ManageServer{ @Autowired private RemoteDeptService remoteDeptService; - { - Long enterpriseId = SecurityUtils.getEnterpriseId(); - Result sysDeptByEnterpriseId = remoteDeptService.getSysDeptByEnterpriseId(enterpriseId); - if (sysDeptByEnterpriseId.getCode() == 200){ - SysDept sysDept = sysDeptByEnterpriseId.getData(); - } + @Autowired + private RemoteUserService remoteUserService; + @Override + public List selectDeptList(SysDept sysDept) { + Result userInfo = remoteUserService.getUserInfo(SecurityUtils.getUsername(), SecurityConstants.FROM_SOURCE); + LoginUser loginUser = userInfo.getData(); + Long deptId = loginUser.getDeptId(); + return remoteDeptService.getSysDeptByDeptId(deptId).getData(); } - - + @Override + public Result insertDept(SysDept sysDept) { + return remoteDeptService.add(sysDept); + } } 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 3d47e40..68349ae 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 @@ -110,12 +110,14 @@ public class SysDeptController extends BaseController { /** * 根据企业ID获取企业下部门 - * @param enterpriseId 企业ID + * @param deptId 企业ID * @return 企业信息，内含有部门 */ - @GetMapping("/getSysDeptByEnterpriseId/{enterpriseId}") - public Result getSysDeptByEnterpriseId(@PathVariable(value = "enterpriseId") Long enterpriseId){ - SysDept sysDept = deptService.getSysDeptByEnterpriseId(enterpriseId); - return Result.success(sysDept); + @GetMapping("/getSysDeptByDeptId/{deptId}") + + public Result> getSysDeptByDeptId(@PathVariable(value = "deptId") Long deptId){ + List sysDept = deptService.getSysDeptByDeptId(deptId); + Result> success = Result.success(sysDept); + 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 493cb33..10b04cc 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 @@ -113,7 +113,7 @@ public class SysUserController extends BaseController { sysUserVo.setSysUser(sysUser); sysUserVo.setRoles(roles); sysUserVo.setPermissions(permissions); - sysUserVo.setEnterpriseId(deptId); + sysUserVo.setDeptId(deptId); return Result.success(sysUserVo); } 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 6397d36..93eaddf 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 @@ -128,4 +128,9 @@ public interface SysDeptMapper extends BaseMapper { * @return 结果 */ public int deleteDeptById (Long deptId); + + SysDept selectDeptIdByLeader(String userName); + + List getSysDeptByDeptId(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 dde112b..00fb12f 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 @@ -138,15 +138,15 @@ public interface SysDeptService extends IService { /** * 通过负责人查询企业ID - * @param leader 负责人 + * @param userName 负责人 * @return 企业ID */ - Long selectDeptIdByLeader (String leader); + Long selectDeptIdByLeader (String userName); /** * 根据企业ID获取企业下部门 - * @param enterpriseId 企业ID + * @param deptId 企业ID * @return 企业信息，内含有部门 */ - SysDept getSysDeptByEnterpriseId (Long enterpriseId); + List getSysDeptByDeptId(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 05f5ec9..d2881ea 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 @@ -1,6 +1,6 @@ package com.couplet.system.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.couplet.common.core.constant.UserConstants; import com.couplet.common.core.exception.ServiceException; @@ -285,31 +285,33 @@ public class SysDeptServiceImpl extends ServiceImpl impl /** * 通过负责人查询企业ID * - * @param leader 负责人 + * @param userName 负责人 * * @return 企业ID */ @Override - public Long selectDeptIdByLeader (String leader) { - SysDept sysDept = getOne(new LambdaQueryWrapper<>() {{ - eq(SysDept::getLeader, leader); - }}); + public Long selectDeptIdByLeader (String userName) { + + SysDept sysDept = deptMapper.selectDeptIdByLeader(userName); return sysDept == null ? null : sysDept.getDeptId(); } + + /** * 根据企业ID获取企业下部门 * - * @param enterpriseId 企业ID + * @param deptId 企业ID * * @return 企业信息，内含有部门 */ - @Override - public SysDept getSysDeptByEnterpriseId (Long enterpriseId) { - return null; - } + @Override + public List getSysDeptByDeptId(Long deptId) { + + return deptMapper.getSysDeptByDeptId(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 a680f7f..8adf7a8 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 @@ -108,6 +108,12 @@ where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1 + + insert into sys_dept(