diff --git a/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java b/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java index f491499..30ff94f 100644 --- a/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java +++ b/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java @@ -3,11 +3,14 @@ package org.springblade.modules.business.contraller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.modules.business.enums.WorkOrderStatusEnum; import org.springblade.modules.business.pojo.entity.Device; import org.springblade.modules.business.pojo.entity.maintenance.MaintenancePersonnel; import org.springblade.modules.business.pojo.entity.maintenance.MaintenancePlan; @@ -15,7 +18,6 @@ import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTask; import org.springblade.modules.business.pojo.entity.workorder.WorkOrder; import org.springblade.modules.business.pojo.vo.MaintenanceTaskVO; import org.springblade.modules.business.pojo.vo.PieStatVO; -import org.springblade.modules.business.pojo.vo.SearchMaintenancePersonnelVO; import org.springblade.modules.business.service.IDeviceService; import org.springblade.modules.business.service.IMaintenancePlanService; import org.springblade.modules.business.service.IMaintenanceTaskService; @@ -42,6 +44,7 @@ import static org.springblade.modules.business.enums.WorkOrderStatusEnum.*; * @author BladeX * @since 2024-10-14 */ +@Slf4j @RestController @AllArgsConstructor @RequestMapping("/workBenches") @@ -58,16 +61,29 @@ public class WorkBenchesController extends BladeController { */ @GetMapping("/overview") public R>> overview() { + BladeUser bladeUser = AuthUtil.getUser(); + Long userId = bladeUser.getUserId(); List> list = new ArrayList<>(); // 实验室巡检数量 Map map1 = new HashMap<>(); map1.put("name", "实验室巡检"); - map1.put("num", maintenancePlanService.count(Wrappers.lambdaQuery(MaintenancePlan.class))); + LambdaQueryWrapper wrapper1 = Wrappers.lambdaQuery(MaintenancePlan.class); + if (!bladeUser.getRoleName().contains("administrator") && !bladeUser.getRoleName().contains("admin")) { + wrapper1.eq(MaintenancePlan::getDeptId, bladeUser.getDeptId()); + } + map1.put("num", maintenancePlanService.count(wrapper1)); list.add(map1); // 报送记录数量 Map map2 = new HashMap<>(); map2.put("name", "报送记录"); - map2.put("num", workOrderService.count(Wrappers.lambdaQuery(WorkOrder.class).ne(WorkOrder::getStatus, -1))); + LambdaQueryWrapper wrapper2 = Wrappers.lambdaQuery(WorkOrder.class); + User user = userService.getById(userId); + if (user.getRoleId().equals("1123598816738675201")) { + map2.put("num", workOrderService.count(wrapper2)); + } else { + wrapper2.eq(WorkOrder::getCreateUser, userId); + map2.put("num", workOrderService.count(wrapper2)); + } list.add(map2); // 设备报警数量 Map map3 = new HashMap<>(); diff --git a/src/main/java/org/springblade/modules/business/contraller/supplies/ApplyController.java b/src/main/java/org/springblade/modules/business/contraller/supplies/ApplyController.java index 9dedc40..96ae460 100644 --- a/src/main/java/org/springblade/modules/business/contraller/supplies/ApplyController.java +++ b/src/main/java/org/springblade/modules/business/contraller/supplies/ApplyController.java @@ -2,6 +2,7 @@ package org.springblade.modules.business.contraller.supplies; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import jakarta.validation.Valid; @@ -61,6 +62,7 @@ public class ApplyController extends BladeController { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(Apply.class); wrapper.orderByDesc(Apply::getCreateTime); wrapper.eq(apply.getIsReturn() != null, Apply::getIsReturn, apply.getIsReturn()); + wrapper.eq(StringUtils.isNotBlank(apply.getApplyUser()), Apply::getApplyUser, apply.getApplyUser()); IPage pages = applyService.page(Condition.getPage(query), wrapper); List records = pages.getRecords(); if (CollectionUtil.isNotEmpty(records)) { diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java index 0fa990f..8215c14 100644 --- a/src/main/java/org/springblade/modules/system/controller/UserController.java +++ b/src/main/java/org/springblade/modules/system/controller/UserController.java @@ -85,309 +85,309 @@ import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE; @Tag(name = "用户", description = "用户") public class UserController { - private final IUserService userService; - - private final RedisTemplate redisTemplate; - - private final AliSmsTemplate smsTemplate; - - private final IDeptService deptService; - - /** - * 查询单条 - */ - @ApiOperationSupport(order = 1) - @Operation(summary = "查看详情", description = "传入id") - @GetMapping("/detail") - @PreAuth(RoleConstant.HAS_ROLE_ADMIN) - public R detail(User user) { - User detail = userService.getOne(Condition.getQueryWrapper(user)); - return R.data(UserWrapper.build().entityVO(detail)); - } - - /** - * 查询单条 - */ - @ApiOperationSupport(order = 2) - @Operation(summary = "查看详情", description = "传入id") - @GetMapping("/info") - public R info(BladeUser user) { - User detail = userService.getById(user.getUserId()); - return R.data(UserWrapper.build().entityVO(detail)); - } - - /** - * 用户列表 - */ - @GetMapping("/list") - @Parameters({ - @Parameter(name = "account", description = "账号名", in = ParameterIn.QUERY, schema = @Schema(type = "string")), - @Parameter(name = "realName", description = "姓名", in = ParameterIn.QUERY, schema = @Schema(type = "string")) - }) - @ApiOperationSupport(order = 3) - @Operation(summary = "列表", description = "传入account和realName") - @PreAuth(RoleConstant.HAS_ROLE_ADMIN) - public R> list(@Parameter(hidden = true) @RequestParam Map user, Query query, BladeUser bladeUser) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(user, User.class); - IPage pages = userService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()) : queryWrapper); - return R.data(UserWrapper.build().pageVO(pages)); - } - - /** - * 自定义用户列表 - */ - @GetMapping("/page") - @Parameters({ - @Parameter(name = "account", description = "账号名", in = ParameterIn.QUERY, schema = @Schema(type = "string")), - @Parameter(name = "realName", description = "姓名", in = ParameterIn.QUERY, schema = @Schema(type = "string")) - }) - @ApiOperationSupport(order = 3) - @Operation(summary = "列表", description = "传入account和realName") - @PreAuth(RoleConstant.HAS_ROLE_ADMIN) - public R> page(@Parameter(hidden = true) User user, Query query, Long deptId, BladeUser bladeUser) { - IPage pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId())); - return R.data(UserWrapper.build().pageVO(pages)); - } - - /** - * 新增或修改 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 4) - @Operation(summary = "新增或修改", description = "传入User") - @PreAuth(RoleConstant.HAS_ROLE_ADMIN) - public R submit(@Valid @RequestBody User user) { - CacheUtil.clear(USER_CACHE); - return R.status(userService.submit(user)); - } - - /** - * 修改 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @Operation(summary = "修改", description = "传入User") - public R update(@Valid @RequestBody User user) { - CacheUtil.clear(USER_CACHE); - return R.status(userService.updateUser(user)); - } - - /** - * 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 6) - @Operation(summary = "删除", description = "传入id集合") - @PreAuth(RoleConstant.HAS_ROLE_ADMIN) - public R remove(@RequestParam String ids) { - CacheUtil.clear(USER_CACHE); - return R.status(userService.removeUser(ids)); - } - - /** - * 设置菜单权限 - */ - @PostMapping("/grant") - @ApiOperationSupport(order = 7) - @Operation(summary = "权限设置", description = "传入roleId集合以及menuId集合") - @PreAuth(RoleConstant.HAS_ROLE_ADMIN) - public R grant(@Parameter(description = "userId集合", required = true) @RequestParam String userIds, - @Parameter(description = "roleId集合", required = true) @RequestParam String roleIds) { - boolean temp = userService.grant(userIds, roleIds); - return R.status(temp); - } - - /** - * 重置密码 - */ - @PostMapping("/reset-password") - @ApiOperationSupport(order = 8) - @Operation(summary = "初始化密码", description = "传入userId集合") - @PreAuth(RoleConstant.HAS_ROLE_ADMIN) - public R resetPassword(@Parameter(description = "userId集合", required = true) @RequestParam String userIds) { - boolean temp = userService.resetPassword(userIds); - return R.status(temp); - } - - /** - * 修改密码 - */ - @PostMapping("/update-password") - @ApiOperationSupport(order = 9) - @Operation(summary = "修改密码", description = "传入密码") - public R updatePassword(BladeUser user, @Parameter(description = "旧密码", required = true) @RequestParam String oldPassword, - @Parameter(description = "新密码", required = true) @RequestParam String newPassword, - @Parameter(description = "新密码", required = true) @RequestParam String newPassword1) { - boolean temp = userService.updatePassword(user.getUserId(), oldPassword, newPassword, newPassword1); - return R.status(temp); - } - - /** - * 修改基本信息 - */ - @PostMapping("/update-info") - @ApiOperationSupport(order = 10) - @Operation(summary = "修改基本信息", description = "传入User") - public R updateInfo(@Valid @RequestBody User user) { - CacheUtil.clear(USER_CACHE); - return R.status(userService.updateUserInfo(user)); - } - - /** - * 用户列表 - */ - @GetMapping("/user-list") - @ApiOperationSupport(order = 11) - @Operation(summary = "用户列表", description = "传入user") - public R> userList(User user, BladeUser bladeUser) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(user); - List list = userService.list((!AuthUtil.isAdministrator()) ? queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()) : queryWrapper); - return R.data(UserWrapper.build().listVO(list)); - } - - /** - * 导入用户 - */ - @PostMapping("import-user") - @ApiOperationSupport(order = 12) - @Operation(summary = "导入用户", description = "传入excel") - @PreAuth(RoleConstant.HAS_ROLE_ADMIN) - public R importUser(MultipartFile file, Integer isCovered) { - UserImporter userImporter = new UserImporter(userService, isCovered == 1); - ExcelUtil.save(file, userImporter, UserExcel.class); - return R.success("操作成功"); - } - - /** - * 导出用户 - */ - @GetMapping("export-user") - @ApiOperationSupport(order = 13) - @Operation(summary = "导出用户", description = "传入user") - @PreAuth(RoleConstant.HAS_ROLE_ADMIN) - public void exportUser(@Parameter(hidden = true) @RequestParam Map user, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(user, User.class); - if (!AuthUtil.isAdministrator()) { - queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()); - } - queryWrapper.lambda().eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = userService.exportUser(queryWrapper); - ExcelUtil.export(response, "用户数据" + DateUtil.time(), "用户数据表", list, UserExcel.class); - } - - /** - * 导出模板 - */ - @GetMapping("export-template") - @ApiOperationSupport(order = 14) - @Operation(summary = "导出模板") - public void exportUser(HttpServletResponse response) { - List list = new ArrayList<>(); - ExcelUtil.export(response, "用户数据模板", "用户数据表", list, UserExcel.class); - } - - /** - * 第三方注册用户 - */ - @PostMapping("/register-guest") - @ApiOperationSupport(order = 15) - @Operation(summary = "第三方注册用户", description = "传入user") - public R registerGuest(User user, Long oauthId) { - return R.status(userService.registerGuest(user, oauthId)); - } - - /** - * 配置用户平台信息 - */ - @PostMapping("/update-platform") - @ApiOperationSupport(order = 16) - @Operation(summary = "配置用户平台信息", description = "传入user") - public R updatePlatform(Long userId, Integer userType, String userExt) { - return R.status(userService.updatePlatform(userId, userType, userExt)); - } - - /** - * 查看平台详情 - */ - @ApiOperationSupport(order = 17) - @Operation(summary = "查看平台详情", description = "传入id") - @GetMapping("/platform-detail") - @PreAuth(RoleConstant.HAS_ROLE_ADMIN) - public R platformDetail(User user) { - return R.data(userService.platformDetail(user)); - } - - /** - * 用户解锁 - */ - @PostMapping("/unlock") - @ApiOperationSupport(order = 18) - @Operation(summary = "账号解锁", description = "传入id集合") - @PreAuth(RoleConstant.HAS_ROLE_ADMIN) - public R unlock(String userIds) { - return R.status(userService.unlock(userIds)); - } - - /** - * 审核通过 - */ - @PostMapping("/audit-pass") - @ApiOperationSupport(order = 19) - @Operation(summary = "审核通过", description = "传入id集合") - @PreAuth(RoleConstant.HAS_ROLE_ADMIN) - public R auditPass(String userIds) { - return R.status(userService.auditPass(userIds)); - } - - /** - * 审核拒绝 - */ - @PostMapping("/audit-refuse") - @ApiOperationSupport(order = 20) - @Operation(summary = "审核拒绝", description = "传入id集合") - @PreAuth(RoleConstant.HAS_ROLE_ADMIN) - public R auditRefuse(String userIds) { - return R.status(userService.auditRefuse(userIds)); - } - - - /** - * 获取维修人员 - */ - @GetMapping("/repairPersons") - @Operation(summary = "获取维修人员", description = "获取维修人员") - public R> repairPersons(boolean isRepair) { - // User user = UserCache.getUser(AuthUtil.getUserId()); - // List users = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getDeptId, user.getDeptId()).ne(isRepair, User::getRoleId, user.getRoleId())); - List users = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, "1839552581620793346")); - return R.data(users); - } - - /** - * 维修人员坐标更新 - */ - @PostMapping("/updateCoordinate") - public R updateCoordinate(@RequestBody User user) { - CacheUtil.put(SYS_CACHE, "coordinate:id:", user.getId(), user.getAddressLon() + "," + user.getAddressLon()); - return R.status(true); - } - - /** - * 获取维修人员坐标 - */ - @GetMapping("/getCoordinate") - public R getCoordinate(String userId) { - String coordinate = CacheUtil.get(SYS_CACHE, "coordinate:id:", userId, String.class); - return R.data(coordinate); - } - - /** - * 获取客服下绑定实验室所有用户 - */ - @GetMapping("/getLimsUsers") - public R> getLimsUsers() { - List users = userService.getLimsUsers(); - return R.data(users); - } + private final IUserService userService; + + private final RedisTemplate redisTemplate; + + private final AliSmsTemplate smsTemplate; + + private final IDeptService deptService; + + /** + * 查询单条 + */ + @ApiOperationSupport(order = 1) + @Operation(summary = "查看详情", description = "传入id") + @GetMapping("/detail") + @PreAuth(RoleConstant.HAS_ROLE_ADMIN) + public R detail(User user) { + User detail = userService.getOne(Condition.getQueryWrapper(user)); + return R.data(UserWrapper.build().entityVO(detail)); + } + + /** + * 查询单条 + */ + @ApiOperationSupport(order = 2) + @Operation(summary = "查看详情", description = "传入id") + @GetMapping("/info") + public R info(BladeUser user) { + User detail = userService.getById(user.getUserId()); + return R.data(UserWrapper.build().entityVO(detail)); + } + + /** + * 用户列表 + */ + @GetMapping("/list") + @Parameters({ + @Parameter(name = "account", description = "账号名", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "realName", description = "姓名", in = ParameterIn.QUERY, schema = @Schema(type = "string")) + }) + @ApiOperationSupport(order = 3) + @Operation(summary = "列表", description = "传入account和realName") + @PreAuth(RoleConstant.HAS_ROLE_ADMIN) + public R> list(@Parameter(hidden = true) @RequestParam Map user, Query query, BladeUser bladeUser) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(user, User.class); + IPage pages = userService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()) : queryWrapper); + return R.data(UserWrapper.build().pageVO(pages)); + } + + /** + * 自定义用户列表 + */ + @GetMapping("/page") + @Parameters({ + @Parameter(name = "account", description = "账号名", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "realName", description = "姓名", in = ParameterIn.QUERY, schema = @Schema(type = "string")) + }) + @ApiOperationSupport(order = 3) + @Operation(summary = "列表", description = "传入account和realName") + @PreAuth(RoleConstant.HAS_ROLE_ADMIN) + public R> page(@Parameter(hidden = true) User user, Query query, Long deptId, BladeUser bladeUser) { + IPage pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId())); + return R.data(UserWrapper.build().pageVO(pages)); + } + + /** + * 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增或修改", description = "传入User") + @PreAuth(RoleConstant.HAS_ROLE_ADMIN) + public R submit(@Valid @RequestBody User user) { + CacheUtil.clear(USER_CACHE); + return R.status(userService.submit(user)); + } + + /** + * 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入User") + public R update(@Valid @RequestBody User user) { + CacheUtil.clear(USER_CACHE); + return R.status(userService.updateUser(user)); + } + + /** + * 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 6) + @Operation(summary = "删除", description = "传入id集合") + @PreAuth(RoleConstant.HAS_ROLE_ADMIN) + public R remove(@RequestParam String ids) { + CacheUtil.clear(USER_CACHE); + return R.status(userService.removeUser(ids)); + } + + /** + * 设置菜单权限 + */ + @PostMapping("/grant") + @ApiOperationSupport(order = 7) + @Operation(summary = "权限设置", description = "传入roleId集合以及menuId集合") + @PreAuth(RoleConstant.HAS_ROLE_ADMIN) + public R grant(@Parameter(description = "userId集合", required = true) @RequestParam String userIds, + @Parameter(description = "roleId集合", required = true) @RequestParam String roleIds) { + boolean temp = userService.grant(userIds, roleIds); + return R.status(temp); + } + + /** + * 重置密码 + */ + @PostMapping("/reset-password") + @ApiOperationSupport(order = 8) + @Operation(summary = "初始化密码", description = "传入userId集合") + @PreAuth(RoleConstant.HAS_ROLE_ADMIN) + public R resetPassword(@Parameter(description = "userId集合", required = true) @RequestParam String userIds) { + boolean temp = userService.resetPassword(userIds); + return R.status(temp); + } + + /** + * 修改密码 + */ + @PostMapping("/update-password") + @ApiOperationSupport(order = 9) + @Operation(summary = "修改密码", description = "传入密码") + public R updatePassword(BladeUser user, @Parameter(description = "旧密码", required = true) @RequestParam String oldPassword, + @Parameter(description = "新密码", required = true) @RequestParam String newPassword, + @Parameter(description = "新密码", required = true) @RequestParam String newPassword1) { + boolean temp = userService.updatePassword(user.getUserId(), oldPassword, newPassword, newPassword1); + return R.status(temp); + } + + /** + * 修改基本信息 + */ + @PostMapping("/update-info") + @ApiOperationSupport(order = 10) + @Operation(summary = "修改基本信息", description = "传入User") + public R updateInfo(@Valid @RequestBody User user) { + CacheUtil.clear(USER_CACHE); + return R.status(userService.updateUserInfo(user)); + } + + /** + * 用户列表 + */ + @GetMapping("/user-list") + @ApiOperationSupport(order = 11) + @Operation(summary = "用户列表", description = "传入user") + public R> userList(User user, BladeUser bladeUser) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(user); + List list = userService.list((!AuthUtil.isAdministrator()) ? queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()) : queryWrapper); + return R.data(UserWrapper.build().listVO(list)); + } + + /** + * 导入用户 + */ + @PostMapping("import-user") + @ApiOperationSupport(order = 12) + @Operation(summary = "导入用户", description = "传入excel") + @PreAuth(RoleConstant.HAS_ROLE_ADMIN) + public R importUser(MultipartFile file, Integer isCovered) { + UserImporter userImporter = new UserImporter(userService, isCovered == 1); + ExcelUtil.save(file, userImporter, UserExcel.class); + return R.success("操作成功"); + } + + /** + * 导出用户 + */ + @GetMapping("export-user") + @ApiOperationSupport(order = 13) + @Operation(summary = "导出用户", description = "传入user") + @PreAuth(RoleConstant.HAS_ROLE_ADMIN) + public void exportUser(@Parameter(hidden = true) @RequestParam Map user, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(user, User.class); + if (!AuthUtil.isAdministrator()) { + queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()); + } + queryWrapper.lambda().eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = userService.exportUser(queryWrapper); + ExcelUtil.export(response, "用户数据" + DateUtil.time(), "用户数据表", list, UserExcel.class); + } + + /** + * 导出模板 + */ + @GetMapping("export-template") + @ApiOperationSupport(order = 14) + @Operation(summary = "导出模板") + public void exportUser(HttpServletResponse response) { + List list = new ArrayList<>(); + ExcelUtil.export(response, "用户数据模板", "用户数据表", list, UserExcel.class); + } + + /** + * 第三方注册用户 + */ + @PostMapping("/register-guest") + @ApiOperationSupport(order = 15) + @Operation(summary = "第三方注册用户", description = "传入user") + public R registerGuest(User user, Long oauthId) { + return R.status(userService.registerGuest(user, oauthId)); + } + + /** + * 配置用户平台信息 + */ + @PostMapping("/update-platform") + @ApiOperationSupport(order = 16) + @Operation(summary = "配置用户平台信息", description = "传入user") + public R updatePlatform(Long userId, Integer userType, String userExt) { + return R.status(userService.updatePlatform(userId, userType, userExt)); + } + + /** + * 查看平台详情 + */ + @ApiOperationSupport(order = 17) + @Operation(summary = "查看平台详情", description = "传入id") + @GetMapping("/platform-detail") + @PreAuth(RoleConstant.HAS_ROLE_ADMIN) + public R platformDetail(User user) { + return R.data(userService.platformDetail(user)); + } + + /** + * 用户解锁 + */ + @PostMapping("/unlock") + @ApiOperationSupport(order = 18) + @Operation(summary = "账号解锁", description = "传入id集合") + @PreAuth(RoleConstant.HAS_ROLE_ADMIN) + public R unlock(String userIds) { + return R.status(userService.unlock(userIds)); + } + + /** + * 审核通过 + */ + @PostMapping("/audit-pass") + @ApiOperationSupport(order = 19) + @Operation(summary = "审核通过", description = "传入id集合") + @PreAuth(RoleConstant.HAS_ROLE_ADMIN) + public R auditPass(String userIds) { + return R.status(userService.auditPass(userIds)); + } + + /** + * 审核拒绝 + */ + @PostMapping("/audit-refuse") + @ApiOperationSupport(order = 20) + @Operation(summary = "审核拒绝", description = "传入id集合") + @PreAuth(RoleConstant.HAS_ROLE_ADMIN) + public R auditRefuse(String userIds) { + return R.status(userService.auditRefuse(userIds)); + } + + + /** + * 获取维修人员 + */ + @GetMapping("/repairPersons") + @Operation(summary = "获取维修人员", description = "获取维修人员") + public R> repairPersons(boolean isRepair) { + // User user = UserCache.getUser(AuthUtil.getUserId()); + // List users = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getDeptId, user.getDeptId()).ne(isRepair, User::getRoleId, user.getRoleId())); + List users = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, "1839552581620793346")); + return R.data(users); + } + + /** + * 维修人员坐标更新 + */ + @PostMapping("/updateCoordinate") + public R updateCoordinate(@RequestBody User user) { + CacheUtil.put(SYS_CACHE, "coordinate:id:", user.getId(), user.getAddressLon() + "," + user.getAddressLat()); + return R.status(true); + } + + /** + * 获取维修人员坐标 + */ + @GetMapping("/getCoordinate") + public R getCoordinate(String userId) { + String coordinate = CacheUtil.get(SYS_CACHE, "coordinate:id:", userId, String.class); + return R.data(coordinate); + } + + /** + * 获取客服下绑定实验室所有用户 + */ + @GetMapping("/getLimsUsers") + public R> getLimsUsers() { + List users = userService.getLimsUsers(); + return R.data(users); + } }