From f40f45162d69d751628a8fa0c6784abb237d4eaa Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期六, 03 九月 2022 16:48:11 +0800
Subject: [PATCH] 问题修复
---
src/main/java/com/whyc/service/DocUserService.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/whyc/service/DocUserService.java b/src/main/java/com/whyc/service/DocUserService.java
index c56a736..37d25af 100644
--- a/src/main/java/com/whyc/service/DocUserService.java
+++ b/src/main/java/com/whyc/service/DocUserService.java
@@ -9,7 +9,10 @@
import com.whyc.dto.Page;
import com.whyc.dto.Response;
import com.whyc.mapper.DocUserMapper;
+import com.whyc.pojo.DocDepart;
+import com.whyc.pojo.DocRole;
import com.whyc.pojo.DocUser;
+import com.whyc.pojo.Permit;
import com.whyc.util.ActionUtil;
import com.whyc.util.RSAUtil;
import org.apache.shiro.SecurityUtils;
@@ -25,7 +28,9 @@
import java.io.File;
import java.io.IOException;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import static com.whyc.util.ActionUtil.createFilefolderIFNotExist;
@@ -37,12 +42,21 @@
@Autowired
private DocFaceService faceService;
+ @Autowired
+ private DocRoleService roleService;
+
+ @Autowired
+ private DocDepartService departService;
+
+ @Autowired
+ private PermitService permitService;
+
//鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
public Response getAllUser(DocUser docUser, int pageCurr, int pageSize) {
PageHelper.startPage(pageCurr,pageSize);
List<DocUser> list=mapper.getAllUser(docUser);
PageInfo pageInfo=new PageInfo(list);
- return new Response().setII(1,list!=null?true:false,pageInfo,"鏁版嵁杩斿洖");
+ return new Response().setII(1,list!=null,pageInfo,"鏁版嵁杩斿洖");
}
//缂栬緫鎵�鏈夌敤鎴蜂俊鎭�
public Response updateUser(MultipartFile file,DocUser docUser) {
@@ -57,7 +71,7 @@
wrapper.set("role_id",docUser.getRoleId());
wrapper.eq("id",docUser.getId());
int bl=mapper.update(null,wrapper);
- return new Response().set(1,bl>0?true:false);
+ return new Response().set(1,bl>0);
}
//鏂版坊鍔犵敤鎴蜂俊鎭�
public Response addUser(MultipartFile file,DocUser docUser) {
@@ -75,7 +89,7 @@
docUser.setFaceId(String.valueOf(faceId));
docUser.setCreTime(new Date());
int bl=mapper.insert(docUser);
- return new Response().set(1,bl>0?true:false);
+ return new Response().set(1,bl>0);
}
//妫�娴嬫槸鍚﹀瓨鍦ㄩ噸鏂颁笂浼犵殑浜鸿劯
@@ -110,7 +124,7 @@
UpdateWrapper wrapper=new UpdateWrapper();
wrapper.eq("id",id);
int bl=mapper.delete(wrapper);
- return new Response().setII(1,bl>0?true:false,bl,"鍒犻櫎杩斿洖");
+ return new Response().setII(1,bl>0,bl,"鍒犻櫎杩斿洖");
}
public Response login(String name, String snId, HttpServletRequest request) {
@@ -135,22 +149,50 @@
DocUser userDB = (DocUser) subject.getPrincipal();
userDB.setSnId(null);
request.getSession().setAttribute("user", userDB);
- return response.setII(1,true, userDB,"鐧诲綍鎴愬姛");
+ //鏌ヨ瑙掕壊鍜岄儴闂ㄥ垪琛ㄤ俊鎭�
+ Map<String,Object> map = new HashMap<>();
+ List<DocDepart> departList = (List<DocDepart>) ((PageInfo)departService.getAllDepart().getData2()).getList();
+ List<DocRole> roleList = (List<DocRole>) ((PageInfo)roleService.getAllRole().getData2()).getList();
+ List<Permit> permitList = permitService.getPermitsByUname();
+ map.put("departs",departList);
+ map.put("roles",roleList);
+ map.put("permits",permitList);
+ return response.setIII(1,true, userDB,map,"鐧诲綍鎴愬姛");
}
//淇敼瀵嗙爜
public Response changeSnId(String name,String oldSnId, String newSnId) {
+ if(name==null||name.equals("")){
+ return new Response().set(1,false,"鎵句笉鍒扮敤鎴�");
+ }
//楠岃瘉鑰佸瘑鐮佹槸鍚︽纭�
String snIdRsa=mapper.selectSnId(name);
//瑙ｅ瘑
String snId=RSAUtil.decrypt(snIdRsa,RSAUtil.getPrivateKey());
- if(oldSnId.equals(snId)){
+ String[] decOld=RSAUtil.decryptFrontP(oldSnId,RSAUtil.fontSeparator);
+ String oldId=decOld[0];
+ String[] newOld=RSAUtil.decryptFrontP(newSnId,RSAUtil.fontSeparator);
+ String newId=newOld[0];
+ if(oldId.equals(snId)){
UpdateWrapper wrapper=new UpdateWrapper();
- wrapper.set("sn_id",RSAUtil.encrypt(newSnId,RSAUtil.getPublicKey()));
+ wrapper.set("sn_id",RSAUtil.encrypt(newId,RSAUtil.getPublicKey()));
wrapper.eq("name",name);
int bl=mapper.update(null,wrapper);
- return new Response().set(1,bl>0?true:false,"淇敼鎴愬姛");
+ return new Response().set(1,bl>0,"淇敼鎴愬姛");
}else {
- return new Response().set(1,false,"瀵嗙爜閿欒");
+ return new Response().set(1,false,"淇敼澶辫触");
}
}
+ //鏍规嵁瑙掕壊id鏌ヨ瀵瑰簲鐨勭敤鎴�
+ public Response getUserByRoleId(int roleId) {
+ QueryWrapper wrapper=new QueryWrapper();
+ wrapper.eq("role_id",roleId);
+ wrapper.select("id","name");
+ List<DocUser> list=mapper.selectList(wrapper);
+ return new Response().setII(1,list.size()>0,list,"杩斿洖鏁版嵁");
+ }
+ //鏌ヨ鎵�鏈夌敤鎴�(鏉冮檺绠＄悊鐢�)
+ public Response getAllDocUser() {
+ List<DocUser> list=mapper.getAllDocUser();
+ return new Response().setII(1,list!=null,list,"鏁版嵁杩斿洖");
+ }
}
--
Gitblit v1.9.1