root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:新增设备状态监控功能；修改点位查询和批量修改；任务下方ACSAGV参数修改；烘箱温度和时间用redis进行存储和查询；

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-08-14 18:05:12 +08:00
parent d97cb48021
commit e11d91580d
41 changed files with 1157 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java
View File

@@ -40,6 +40,7 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -59,15 +60,22 @@ public class UserController {
@ApiOperation("查询用户")
@GetMapping
public ResponseEntity<Object> query(UserQuery query, PageQuery page){
return new ResponseEntity(userService.getUserDetail(query, page),HttpStatus.OK);
public ResponseEntity<Object> query(UserQuery query, PageQuery page) {
return new ResponseEntity(userService.getUserDetail(query, page), HttpStatus.OK);
}
@ApiOperation("查询用户")
@PostMapping(value = "/getUserList")
public ResponseEntity<Object> query() {
List<SysUser> userList = userService.list(new QueryWrapper<SysUser>().eq("is_used", true));
return new ResponseEntity(userList, HttpStatus.OK);
}
@Log("新增用户")
@ApiOperation("新增用户")
@PostMapping
// @SaCheckPermission("user:add")
public ResponseEntity<Object> create(@RequestBody Map user){
public ResponseEntity<Object> create(@RequestBody Map user) {
userService.create(user);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@@ -76,7 +84,7 @@ public class UserController {
@ApiOperation("修改用户")
@PutMapping
// @SaCheckPermission("user:edit")
public ResponseEntity<Object> update( @RequestBody Map resources) throws Exception {
public ResponseEntity<Object> update(@RequestBody Map resources) throws Exception {
userService.update(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@@ -84,8 +92,8 @@ public class UserController {
@Log("修改用户：个人中心")
@ApiOperation("修改用户：个人中心")
// @PutMapping(value = "center")
public ResponseEntity<Object> center(@RequestBody SysUser resources){
if(!resources.getUserId().equals(StpUtil.getLoginIdAsLong())){
public ResponseEntity<Object> center(@RequestBody SysUser resources) {
if (!resources.getUserId().equals(StpUtil.getLoginIdAsLong())) {
throw new BadRequestException("不能修改他人资料");
}
userService.saveOrUpdate(resources);
@@ -110,20 +118,20 @@ public class UserController {
@ApiOperation("修改头像")
@PostMapping(value = "/updateAvatar")
public ResponseEntity<Object> updateAvatar(@RequestParam MultipartFile avatar){
public ResponseEntity<Object> updateAvatar(@RequestParam MultipartFile avatar) {
return new ResponseEntity<>(userService.updateAvatar(avatar), HttpStatus.OK);
}
@Log("修改邮箱")
@ApiOperation("修改邮箱")
@PostMapping(value = "/updateEmail/{code}")
public ResponseEntity<Object> updateEmail(@PathVariable String code,@RequestBody SysUser user) throws Exception {
String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,user.getPassword());
public ResponseEntity<Object> updateEmail(@PathVariable String code, @RequestBody SysUser user) throws Exception {
String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, user.getPassword());
SysUser userInfo = userService.getOne(new QueryWrapper<SysUser>().eq("username", SecurityUtils.getCurrentUsername()));
if(!SaSecureUtil.md5BySalt(userInfo.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(password, "salt"))){
if (!SaSecureUtil.md5BySalt(userInfo.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(password, "salt"))) {
throw new BadRequestException("密码错误");
}
userService.update(new UpdateWrapper<SysUser>().set(userInfo.getUsername(),user.getEmail()));
userService.update(new UpdateWrapper<SysUser>().set(userInfo.getUsername(), user.getEmail()));
return new ResponseEntity<>(HttpStatus.OK);
}