From 2282a5708bcdc181c2a52b2ec68049a5b60c8d22 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Thu, 12 Feb 2026 10:01:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E4=BA=BA=E5=91=98=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=A4=87=E7=94=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/feign/IWorkCenterClient.java | 8 ++- .../desk/basic/feign/WorkCenterClient.java | 11 +++- blade-service/blade-system/pom.xml | 4 ++ .../system/controller/UserController.java | 53 ++++++++++++++++++- 4 files changed, 72 insertions(+), 4 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/feign/IWorkCenterClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/feign/IWorkCenterClient.java index 2bc3aadc..bee97d05 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/feign/IWorkCenterClient.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/feign/IWorkCenterClient.java @@ -28,6 +28,7 @@ package org.springblade.desk.basic.feign; import org.springblade.core.launch.constant.AppConstant; import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.desk.basic.pojo.entity.WorkCenter; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -43,9 +44,9 @@ import org.springframework.web.bind.annotation.RequestParam; ) public interface IWorkCenterClient { - String API_PREFIX = "/feign/workCenter"; + String API_PREFIX = "/feign/client/workCenter"; String GET_BY_ID = API_PREFIX + "/getById"; - + String GET_TeamSet_BY_ID = API_PREFIX + "/getTeamSetById"; /** * 根据id获取作业中心 * @@ -54,4 +55,7 @@ public interface IWorkCenterClient { */ @GetMapping(GET_BY_ID) R getById(@RequestParam("id") Long workCenterId); + + @GetMapping(GET_TeamSet_BY_ID) + R getTeamSetById(@RequestParam("id") Long id); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/feign/WorkCenterClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/feign/WorkCenterClient.java index f286d780..f28d2d37 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/feign/WorkCenterClient.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/feign/WorkCenterClient.java @@ -2,10 +2,13 @@ package org.springblade.desk.basic.feign; import io.swagger.v3.oas.annotations.Hidden; +import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.desk.basic.pojo.entity.WorkCenter; +import org.springblade.desk.basic.service.ITeamSetService; import org.springblade.desk.basic.service.IWorkCenterService; import org.springframework.web.bind.annotation.RestController; @@ -21,10 +24,16 @@ import org.springframework.web.bind.annotation.RestController; public class WorkCenterClient implements IWorkCenterClient { private final IWorkCenterService workCenterService; - + @Resource + private ITeamSetService service; @Override public R getById(Long workCenterId) { WorkCenter workCenter = workCenterService.getById(workCenterId); return R.data(workCenter); } + + @Override + public R getTeamSetById(Long id) { + return R.data(service.getById(id)); + } } diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index 12b0c163..de9725e4 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -38,6 +38,10 @@ org.springblade blade-user-api + + org.springblade + blade-desk-api + diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java index 7ab891db..7de4aae1 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java @@ -50,7 +50,10 @@ import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.StringPool; +import org.springblade.desk.basic.feign.IWorkCenterClient; +import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.system.excel.UserExcel; import org.springblade.system.excel.UserImporter; import org.springblade.system.pojo.entity.User; @@ -81,7 +84,7 @@ public class UserController { private final IUserService userService; private final IUserExtService userExtService; - + private final IWorkCenterClient workCenterClient; /** * 查询单条 */ @@ -94,6 +97,54 @@ public class UserController { return R.data(UserWrapper.build().entityVO(detail)); } + + @PostMapping("/getUnSelectUser") + @ApiOperationSupport(order = 31) + @Operation(summary = "获取未选择人员", description = "传入WorkCenter List") + public R> getUnSelectUser(@Valid @RequestBody TeamSet teamSet) { + List teams = new ArrayList<>(); +// QueryWrapper qw = Condition.getQueryWrapper(teamSet); +// TeamSet detail = service.getOne(qw); + + TeamSet detail = workCenterClient.getTeamSetById(teamSet.getId()).getData(); + + if(detail != null){ + String teamId = detail.getTeamMemberId(); + + if(null != teamId && !"".equals(teamId)){ + List ids = Func.toLongList(teamId); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.notIn("id",ids); + teams = userService.list(queryWrapper); + }else{ + QueryWrapper queryWrapper = new QueryWrapper<>(); + teams = userService.list(queryWrapper); + } + } + return R.data(teams); + } + + + @PostMapping("/getSelectUser") + @ApiOperationSupport(order = 31) + @Operation(summary = "获取已选择人员", description = "传入WorkCenter List") + public R> getSelectUser(@Valid @RequestBody TeamSet teamSet) { + List teams = new ArrayList<>(); + TeamSet detail = workCenterClient.getTeamSetById(teamSet.getId()).getData(); + if(detail != null){ + String teamId = detail.getTeamMemberId(); + if(null != teamId && !"".equals(teamId)){ + List ids = Func.toLongList(teamId); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id",ids); + teams = userService.list(queryWrapper); + } + } + return R.data(teams); + } + + + /** * 查询单条 */