大屏页面初始化
This commit is contained in:
@@ -1,15 +1,12 @@
|
||||
package com.mini.mybigscreen.Auth;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.mini.mybigscreen.Model.LoginRequest;
|
||||
import com.mini.mybigscreen.Model.Result;
|
||||
import com.mini.mybigscreen.Model.loginUser;
|
||||
import com.mini.mybigscreen.Model.userInfo;
|
||||
import com.mini.mybigscreen.Model.*;
|
||||
import com.mini.mybigscreen.biz.domain.HomeUser;
|
||||
import com.mini.mybigscreen.biz.service.HomeUserService;
|
||||
import com.mini.mybigscreen.utils.AesUtil;
|
||||
import com.mini.mybigscreen.utils.KeyUtil;
|
||||
import com.mini.mybigscreen.utils.TextUtil;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpSession;
|
||||
@@ -50,16 +47,30 @@ public class userController {
|
||||
*/
|
||||
|
||||
@PostMapping("/editPasswd")
|
||||
public Result<?> getUserSave(String userId, String oldPasswd, String password) {
|
||||
public Result<Message> getUserSave(String userId, String oldPasswd, String password) {
|
||||
LambdaQueryWrapper<HomeUser> query = new LambdaQueryWrapper<HomeUser>()
|
||||
.eq(HomeUser::getUserId, userId)
|
||||
.eq(HomeUser::getPassword, AesUtil.encrypt(password));
|
||||
.eq(HomeUser::getPassword, AesUtil.encrypt(oldPasswd));
|
||||
HomeUser user = userService.getOne(query, true);
|
||||
if (ObjectUtils.isEmpty(user)) {
|
||||
return Result.error("旧密码输入错误");
|
||||
}
|
||||
user.setPassword(AesUtil.encrypt(password));
|
||||
userService.update(user, query);
|
||||
return Result.success();
|
||||
return Result.success(new Message("密码修改成功,请重新登录",200));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化密码
|
||||
*/
|
||||
@PostMapping("initPasswd")
|
||||
public Result<Message> getUserInit(String userId) {
|
||||
String password = KeyUtil.ObjKey(6, 0);
|
||||
LambdaQueryWrapper<HomeUser> query = new LambdaQueryWrapper<HomeUser>()
|
||||
.eq(HomeUser::getUserId, userId);
|
||||
HomeUser user = userService.getOne(query, true);
|
||||
user.setPassword(AesUtil.encrypt(password));
|
||||
userService.update(user, query);
|
||||
return Result.success(new Message(TextUtil.getTitleDesc("密码初始化成功,新密码", password), 200));
|
||||
}
|
||||
}
|
||||
@@ -9,9 +9,9 @@ public class Message implements Serializable {
|
||||
|
||||
|
||||
private String msg;
|
||||
private String code;
|
||||
private Integer code;
|
||||
|
||||
public Message(String msg,String code){
|
||||
public Message(String msg,Integer code){
|
||||
this.msg = msg;
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
@@ -19,11 +19,11 @@ public class CompanyController {
|
||||
|
||||
|
||||
public Result<Message> save() {
|
||||
return Result.success(new Message("数据新增成功", "200"));
|
||||
return Result.success(new Message("数据新增成功", 200));
|
||||
}
|
||||
|
||||
|
||||
public Result<Message> delete() {
|
||||
return Result.success(new Message("数据删除成功", "200"));
|
||||
return Result.success(new Message("数据删除成功", 200));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,13 +31,4 @@ public class ErpAccountController {
|
||||
return Result.success(accountService.list());
|
||||
}
|
||||
|
||||
|
||||
public Result<Message> save() {
|
||||
return Result.success(new Message("数据新增成功", "200"));
|
||||
}
|
||||
|
||||
|
||||
public Result<Message> delete() {
|
||||
return Result.success(new Message("数据删除成功", "200"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,11 +40,11 @@ public class ErpCategoryController {
|
||||
|
||||
|
||||
public Result<Message> save() {
|
||||
return Result.success(new Message("数据新增成功", "200"));
|
||||
return Result.success(new Message("数据新增成功", 200));
|
||||
}
|
||||
|
||||
|
||||
public Result<Message> delete() {
|
||||
return Result.success(new Message("数据删除成功", "200"));
|
||||
return Result.success(new Message("数据删除成功", 200));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -49,11 +49,11 @@ public class ErpTransactionFlowController {
|
||||
|
||||
|
||||
public Result<Message> save() {
|
||||
return Result.success(new Message("数据新增成功", "200"));
|
||||
return Result.success(new Message("数据新增成功", 200));
|
||||
}
|
||||
|
||||
|
||||
public Result<Message> delete() {
|
||||
return Result.success(new Message("数据删除成功", "200"));
|
||||
return Result.success(new Message("数据删除成功", 200));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -147,12 +147,12 @@ public class HomeMenuController {
|
||||
|
||||
|
||||
public Result<Message> save() {
|
||||
return Result.success(new Message("数据新增成功", "200"));
|
||||
return Result.success(new Message("数据新增成功", 200));
|
||||
}
|
||||
|
||||
|
||||
public Result<Message> delete() {
|
||||
return Result.success(new Message("数据删除成功", "200"));
|
||||
return Result.success(new Message("数据删除成功", 200));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -19,11 +19,11 @@ public class HomeModuleController {
|
||||
|
||||
|
||||
public Result<Message> save() {
|
||||
return Result.success(new Message("数据新增成功", "200"));
|
||||
return Result.success(new Message("数据新增成功", 200));
|
||||
}
|
||||
|
||||
|
||||
public Result<Message> delete() {
|
||||
return Result.success(new Message("数据删除成功", "200"));
|
||||
return Result.success(new Message("数据删除成功", 200));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,11 +58,11 @@ public class HomeModuleUserController {
|
||||
|
||||
|
||||
public Result<Message> save() {
|
||||
return Result.success(new Message("数据新增成功", "200"));
|
||||
return Result.success(new Message("数据新增成功", 200));
|
||||
}
|
||||
|
||||
|
||||
public Result<Message> delete() {
|
||||
return Result.success(new Message("数据删除成功", "200"));
|
||||
return Result.success(new Message("数据删除成功", 200));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,11 +33,11 @@ public class HomeRoleController {
|
||||
|
||||
|
||||
public Result<Message> save() {
|
||||
return Result.success(new Message("数据新增成功", "200"));
|
||||
return Result.success(new Message("数据新增成功", 200));
|
||||
}
|
||||
|
||||
|
||||
public Result<Message> delete() {
|
||||
return Result.success(new Message("数据删除成功", "200"));
|
||||
return Result.success(new Message("数据删除成功", 200));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,11 +19,11 @@ public class HomeRoleMenuController {
|
||||
|
||||
|
||||
public Result<Message> save() {
|
||||
return Result.success(new Message("数据新增成功", "200"));
|
||||
return Result.success(new Message("数据新增成功", 200));
|
||||
}
|
||||
|
||||
|
||||
public Result<Message> delete() {
|
||||
return Result.success(new Message("数据删除成功", "200"));
|
||||
return Result.success(new Message("数据删除成功", 200));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,13 +54,13 @@ public class HomeUserController {
|
||||
? userService.update(homeUser,
|
||||
new LambdaUpdateWrapper<HomeUser>().eq(HomeUser::getUserId, homeUser.getUserId())
|
||||
) : userService.save(homeUser);
|
||||
return Result.success(new Message(homeUser.getIsEdit() ? "数据修改成功" : "数据新增成功", "200"));
|
||||
return Result.success(new Message(homeUser.getIsEdit() ? "数据修改成功" : "数据新增成功", 200));
|
||||
}
|
||||
|
||||
@PostMapping("delete")
|
||||
public Result<Message> delete(String userId) {
|
||||
userService.removeById(userId);
|
||||
return Result.success(new Message("数据删除成功", "200"));
|
||||
return Result.success(new Message("数据删除成功", 200));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -38,12 +38,12 @@ public class IndexInfoController {
|
||||
}
|
||||
|
||||
public Result<Message> save() {
|
||||
return Result.success(new Message("数据新增成功", "200"));
|
||||
return Result.success(new Message("数据新增成功", 200));
|
||||
}
|
||||
|
||||
|
||||
public Result<Message> delete() {
|
||||
return Result.success(new Message("数据删除成功", "200"));
|
||||
return Result.success(new Message("数据删除成功", 200));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -42,10 +42,12 @@ public class ItemInfoController {
|
||||
}
|
||||
|
||||
public Result<Message> save() {
|
||||
return Result.success(new Message("数据新增成功", "200"));
|
||||
return Result.success(new Message("数据新增成功", 200));
|
||||
}
|
||||
|
||||
|
||||
public Result<Message> delete() {
|
||||
return Result.success(new Message("数据删除成功", "200"));
|
||||
return Result.success(new Message("数据删除成功", 200));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -20,10 +20,11 @@ public class ResumeEmployeeController {
|
||||
|
||||
|
||||
public Result<Message> save() {
|
||||
return Result.success(new Message("数据新增成功", "200"));
|
||||
return Result.success(new Message("数据新增成功", 200));
|
||||
}
|
||||
|
||||
|
||||
public Result<Message> delete() {
|
||||
return Result.success(new Message("数据删除成功", "200"));
|
||||
return Result.success(new Message("数据删除成功", 200));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,11 +47,11 @@ public class WebsiteStorageController {
|
||||
|
||||
|
||||
public Result<Message> save() {
|
||||
return Result.success(new Message("数据新增成功", "200"));
|
||||
return Result.success(new Message("数据新增成功", 200));
|
||||
}
|
||||
|
||||
|
||||
public Result<Message> delete() {
|
||||
return Result.success(new Message("数据删除成功", "200"));
|
||||
return Result.success(new Message("数据删除成功", 200));
|
||||
}
|
||||
}
|
||||
|
||||
10
src/main/java/com/mini/mybigscreen/utils/TextUtil.java
Normal file
10
src/main/java/com/mini/mybigscreen/utils/TextUtil.java
Normal file
@@ -0,0 +1,10 @@
|
||||
package com.mini.mybigscreen.utils;
|
||||
|
||||
public class TextUtil {
|
||||
|
||||
private static final String TITLE_DESC_FORMAT = "%s: %s";
|
||||
|
||||
public static String getTitleDesc(String title, String desc) {
|
||||
return String.format(TITLE_DESC_FORMAT, title, desc);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user