From 354cc1c2c7ff69c1183d77f1761a71d1ad5669da Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 30 九月 2025 10:46:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
index ee5b173..28fc11a 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.model.TAppUser;
@@ -9,6 +10,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.web.bind.annotation.*;
/**
@@ -26,19 +28,28 @@
private final TAppUserService appUserService;
private final TokenService tokenService;
+ private final PasswordEncoder passwordEncoder;
@Autowired
- public TAppUserController(TAppUserService appUserService, TokenService tokenService) {
+ public TAppUserController(TAppUserService appUserService, TokenService tokenService, PasswordEncoder passwordEncoder) {
this.appUserService = appUserService;
this.tokenService = tokenService;
+ this.passwordEncoder = passwordEncoder;
}
/**
* 添加人员管理管理管理
*/
- @ApiOperation(value = "添加人员管理",response = TAppUser.class)
+ @ApiOperation(value = "注册人员管理",response = TAppUser.class)
@PostMapping(value = "/api/t-equipment/add")
public R<Boolean> add(@RequestBody String param) {
TAppUser dto = JSON.parseObject(param,TAppUser.class);
+ long count = appUserService.count(Wrappers.lambdaQuery(TAppUser.class).eq(TAppUser::getAccount, dto.getAccount()));
+ if (count>0) {
+ return R.fail("该账号已存在");
+ }
+ dto.setState(0);
+ dto.setStatus(1);
+ passwordEncoder.encode(dto.getPassword());
appUserService.save(dto);
return R.ok();
}
--
Gitblit v1.7.1