From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回
---
src/main/java/org/springblade/modules/system/controller/UserWxController.java | 78 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserWxController.java b/src/main/java/org/springblade/modules/system/controller/UserWxController.java
index dda1f1f..4002b53 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserWxController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserWxController.java
@@ -111,7 +111,85 @@
return R.status(result);
}
+ /**
+ * 自定义用户列表(微信小程序注册用户数据和系统用户数据结构一致,库不同)
+ */
+ @GetMapping("/page")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"),
+ @ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string")
+ })
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "列表", notes = "传入account和realName")
+ public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId) {
+ IPage<UserVO> pages = userWxService.selectUserPage(Condition.getPage(query), user, deptId, (AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : AuthUtil.getTenantId()));
+ return R.data(pages);
+ }
+
+ /**
+ * 用户详情
+ *
+ * @param user
+ * @return
+ */
+ @GetMapping("/details")
+ public R details(User user) {
+ UserVO userInfo = userWxService.getUserDetailById(user.getId());
+ if (null != userInfo.getFingerprint() && !userInfo.getFingerprint().equals("")) {
+ //url 转base64
+ String base64Url = ImageUtils.imageUrlToBase64(userInfo.getFingerprint());
+ userInfo.setFingerprint(base64Url);
+ }
+ return R.data(userInfo);
+ }
+
+ /**
+ * 重置密码
+ */
+ @PostMapping("/reset-password")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "初始化密码", notes = "传入userId集合")
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ public R resetPassword(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds) {
+ boolean temp = userWxService.resetPassword(userIds);
+ return R.status(temp);
+ }
+
+ /**
+ * 修改密码
+ */
+ @PostMapping("/update-password")
+ @ApiOperationSupport(order = 9)
+ @ApiOperation(value = "修改密码", notes = "传入密码")
+ public R updatePassword(@ApiParam(value = "旧密码", required = true) @RequestParam String oldPassword,
+ @ApiParam(value = "新密码", required = true) @RequestParam String newPassword,
+ @ApiParam(value = "新密码", required = true) @RequestParam String newPassword1) {
+ boolean temp = userWxService.updatePassword(AuthUtil.getUserId(), oldPassword, newPassword, newPassword1);
+ return R.status(temp);
+ }
+ /**
+ * 删除
+ */
+ @PostMapping("/remove")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "删除", notes = "传入id集合")
+ public R remove(@RequestParam String ids) {
+// CacheUtil.clear(USER_CACHE);
+ List<String> list = Arrays.asList(ids.split(","));
+ return R.status(userWxService.removeUser(ids));
+ }
+
+ /**
+ * 导出用户
+ */
+ @GetMapping("export-user")
+ @ApiOperationSupport(order = 13)
+ @ApiOperation(value = "导出用户", notes = "传入user")
+ public void exportUser(@ApiIgnore @RequestParam Map<String, Object> user, BladeUser bladeUser, HttpServletResponse response) {
+ List<UserWxExcel> list = userWxService.exportUser(user);
+ ExcelUtil.export(response, "小程序用户数据" + DateUtil.time(), "用户数据表", list, UserWxExcel.class);
+ }
}
--
Gitblit v1.9.3