From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 17 一月 2025 16:40:43 +0800 Subject: [PATCH] bug修改 --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteUserService.java | 69 +++++++++++++++++++++++++++------- 1 files changed, 54 insertions(+), 15 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteUserService.java index a503218..4ac8e89 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteUserService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteUserService.java @@ -1,19 +1,19 @@ package com.ruoyi.system.api.service; -import com.ruoyi.system.api.domain.dto.AppEditUserDto; -import com.ruoyi.system.api.domain.poji.config.SysTag; -import com.ruoyi.system.api.model.*; -import org.springframework.cloud.openfeign.FeignClient; -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 org.springframework.web.bind.annotation.RequestHeader; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; +import com.ruoyi.system.api.domain.dto.AppEditUserDto; +import com.ruoyi.system.api.domain.dto.MgtFrozenMemberDto; import com.ruoyi.system.api.domain.poji.sys.SysUser; import com.ruoyi.system.api.factory.RemoteUserFallbackFactory; +import com.ruoyi.system.api.model.LoginUser; +import com.ruoyi.system.api.model.QwH5LoginVo; +import com.ruoyi.system.api.model.QwUserDetailDto; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 用户服务 @@ -44,9 +44,6 @@ public R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); - - - /** * @description: TODO * @author jqs34 @@ -65,6 +62,7 @@ @PostMapping("/user/getSysUserByMobile") public R<SysUser> getSysUserByMobile(@RequestBody String mobile); + /** * @description: 更新用户手机 * @author jqs34 @@ -73,7 +71,6 @@ */ @PostMapping("/user/registerUser") public R<SysUser> registerUser(@RequestBody SysUser sysUser); - /** @@ -93,6 +90,48 @@ @PostMapping("/user/editUserInfo") public R editUserInfo(@RequestBody AppEditUserDto appEditUserDto); - @PostMapping("/config/getSysTag") - public R<SysTag> getSysTag(@RequestBody Long sysTagId); + /** + * @description 冻结用户 + * @author jqs + * @date 2023/6/29 17:20 + * @param userId + * @return R<Activeness> + */ + @PostMapping("/user/frozenUser") + public R frozenUser(@RequestBody MgtFrozenMemberDto mgtFrozenMemberDto); + + /** + * @description 员工端登录 + * @author jqs + * @date 2023/7/14 10:04 + * @param qwUserDetail + * @return R<QwH5LoginVo> + */ + @PostMapping("/user/qwH5StaffLogin") + public R<QwH5LoginVo> qwH5StaffLogin(@RequestBody QwUserDetailDto qwUserDetail); + + /** + * 根据部门获取所有员工id + * @param userId + * @return + */ + @GetMapping("/user/getUserIdsByDept/{userId}") + public R<List<Long>> getUserIdsByDept(@PathVariable("userId") Long userId); + + + /** + * 根据部门id获取用户 + * @param deptId + * @return + */ + @PostMapping("/user/getUsersByDeptId") + R<List<SysUser>> getUsersByDeptId(@RequestBody Long deptId); + + + /** + * 获取当前用户权限范围内的员工id + * @return + */ + @PostMapping("/user/getScopeOfAuthorityUserId") + List<Long> getScopeOfAuthorityUserId(); } -- Gitblit v1.7.1