From 160e150009b51a39fa95d9462c3798ba28d51a09 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 15 八月 2023 08:49:47 +0800
Subject: [PATCH] 审批页面修改
---
src/main/java/com/whyc/controller/UserController.java | 102 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 87 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/whyc/controller/UserController.java b/src/main/java/com/whyc/controller/UserController.java
index 01d24f0..dd13eff 100644
--- a/src/main/java/com/whyc/controller/UserController.java
+++ b/src/main/java/com/whyc/controller/UserController.java
@@ -1,14 +1,12 @@
package com.whyc.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.api.R;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.whyc.dto.Response;
import com.whyc.pojo.UserInf;
import com.whyc.service.UserService;
import com.whyc.util.ActionUtil;
import com.whyc.util.RSAUtil;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -16,6 +14,7 @@
import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
+import java.security.InvalidParameterException;
import java.util.List;
@RestController
@@ -27,18 +26,23 @@
@Resource
private UserService userService;
- @PostMapping
- @ApiOperation(value = "娣诲姞")
- public Response add(@RequestBody UserInf user){
- return userService.add(user);
- }
+ //@PostMapping
+ //@ApiOperation(value = "娣诲姞")
+ //public Response add(@RequestBody UserInf user){
+ // return userService.add(user);
+ //}
- @PostMapping("/addByRSA")
+ @PostMapping
@ApiOperation(value = "娣诲姞-RSA鍔犲瘑")
public Response addByRSA(@RequestBody UserInf user){
return userService.addByRSA(user);
}
+ @PostMapping("register")
+ @ApiOperation(value = "娉ㄥ唽鐢ㄦ埛")
+ public Response register(@RequestBody UserInf user){
+ return userService.registerUser(user);
+ }
@GetMapping
@ApiOperation(value = "鏌ヨbyId")
public Response<UserInf> getById(@RequestParam int id){
@@ -53,16 +57,14 @@
@GetMapping("page")
@ApiOperation(value = "鏌ヨ鍒嗛〉")
- public Response<IPage<UserInf>> getPage(@RequestParam int pageNum,int pageSize){
- Page<Object> page = new Page<>(pageNum, pageSize);
- return new Response<IPage<UserInf>>().set(1,userService.getAllWithPage(page));
+ public Response getPage(@RequestParam int pageNum,int pageSize){
+ return new Response().set(1,userService.getAllWithPage(pageNum,pageSize));
}
@PutMapping
@ApiOperation(value = "缂栬緫")
public Response update(@RequestBody UserInf user){
- userService.update(user);
- return new Response().setII(1,"鏇存柊鎴愬姛");
+ return userService.update(user);
}
@DeleteMapping
@@ -116,7 +118,11 @@
@ApiOperation(value = "妫�鏌ョ敤鎴峰瘑鐮�")
public Response checkUserPassword(@RequestParam String password){
UserInf userInf = ActionUtil.getUser();
+ //鍓嶇浼犻�掔殑瀵嗙爜瑙ｅ瘑
+ password = RSAUtil.decryptFrontP(password, RSAUtil.fontSeparator)[0];
+ //鍐呭瓨瀛樺偍鐨勫瘑鐮佽В瀵�
String userPassword = userInf.getUpassword();
+ userPassword = RSAUtil.decrypt(userPassword,RSAUtil.getPrivateKey());
if (password.equals(userPassword)){
return new Response().set(1);
}else {
@@ -150,11 +156,43 @@
UserInf userInf = ActionUtil.getUser();
return userService.updatePassword(userInf,password);
}
+
@PostMapping("/updatePasswordByRSA")
@ApiOperation(value = "淇敼瀵嗙爜-RSA")
public Response updatePasswordByRSA(@RequestParam String password){
UserInf userInf = ActionUtil.getUser();
return userService.updatePasswordByRSA(userInf,password);
+ }
+
+ /**
+ * 1.棣栨鐧诲綍,璇峰厛淇敼鍒濆鍖栧彛浠�
+ * 2.瓒呰繃3涓湀娌℃湁淇敼鍙ｄ护,璇蜂慨鏀瑰彛浠ゅ悗閲嶆柊鐧诲綍
+ */
+ @PutMapping("updatePassword2")
+ @ApiOperation(value = "淇敼瀵嗙爜-3涓湀鏈櫥褰�")
+ public Response updatePassword2(@RequestParam String passwordOld,String passwordNew){
+ //鏍￠獙鑰佸瘑鐮�
+ String[] dataArr = RSAUtil.decryptFrontP(passwordOld, RSAUtil.fontSeparator);
+ passwordOld = dataArr[0];
+ String passwordMD5 = dataArr[1];
+ if(!ActionUtil.EncryptionMD5(passwordOld).equals(passwordMD5)){
+ throw new InvalidParameterException("鍙傛暟鏍￠獙澶辫触");
+ }
+ //鏍￠獙鏂板瘑鐮�
+ String[] dataNewArr = RSAUtil.decryptFrontP(passwordNew, RSAUtil.fontSeparator);
+ passwordNew = dataNewArr[0];
+ String passwordNewMD5 = dataNewArr[1];
+ if(!ActionUtil.EncryptionMD5(passwordNew).equals(passwordNewMD5)){
+ throw new InvalidParameterException("鍙傛暟鏍￠獙澶辫触");
+ }
+
+ UserInf userInf = ActionUtil.getUser();
+
+ //鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜鏄惁鍖呭惈
+ if(passwordNew.contains(userInf.getUName())){
+ return new Response().set(1,false,"瀵嗙爜鍖呭惈鐢ㄦ埛鍚�");
+ }
+ return userService.updatePassword2(userInf,passwordOld,passwordNew);
}
@@ -165,8 +203,42 @@
return new Response().set(1,userInf);
}
+ /**
+ * 璐﹀彿瑙ｉ攣
+ */
+ @ApiOperation(value = "璐﹀彿瑙ｉ攣",notes = "unLockType=1涓哄け璐ラ攣瀹氳В閿�,2涓轰笂涓湀鏈櫥褰曢攣瀹氳В閿�")
+ @PutMapping("unLock")
+ public Response unLock(@RequestParam int uId,@RequestParam int unLockType){
+ userService.unLock(uId,unLockType);
+ return new Response().setII(1,"瑙ｉ攣鎴愬姛");
+ }
+ /**
+ * 鍖呮満缁勯噸鍋氾紙绌挎妗嗭級鏌ヨ鎵�鏈夌殑鐢ㄦ埛-鏇存柊涓烘煡璇㈡湭琚坊鍔犲埌鏉冮檺缁勭殑鎵�鏈夌敤鎴�
+ */
+ @ApiOperation(value = "鍖呮満缁勯噸鍋氾紙绌挎妗嗭級鏌ヨ鎵�鏈夌殑鐢ㄦ埛")
+ @GetMapping("searchCS_All2")
+ public Response searchCS_All2(){
+ List<UserInf> list = userService.searchCS_All2();
+ return new Response().set(1,list);
+ }
+ /**
+ * 鍛婅娲惧崟涓紝鏌ヨ绔欑偣浜哄憳淇℃伅
+ * @param stationId
+ * @return
+ */
+ @ApiOperation(tags = "鍛婅娲惧崟", value = "鏍规嵁绔欑偣鏌ヨ鐩稿叧浜哄憳", notes = "User_infAction!getUserInfoByStationId")
+ @GetMapping("getUserInfoByStationId")
+ public Response getUserInfoByStationId(@RequestParam String stationId){
+ List<UserInf> list = userService.getUserInfoByStationId(stationId);
+ return new Response().set(1,list);
+ }
+ @ApiOperation(value = "浼崟鐐圭櫥褰�",notes = "杩斿洖鐨刣ata涓哄竷灏斿��,鏄惁鐧诲綍鎴愬姛;data2:鐢ㄦ埛鎵�鍦ㄧ殑鏉冮檺缁刬d;data3涓虹敤鎴峰璞�,鍐呭惈灞炴�id,uname,urole")
+ @GetMapping("loginByUId")
+ public Response searchSnIdByUId(@RequestParam int uId){
+ return userService.loginByUId(uId);
+ }
}
--
Gitblit v1.9.1