From 5e2ebcceae4bc34b46370f2c10110cd72e7f4fba Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 22 八月 2024 10:59:29 +0800
Subject: [PATCH] 修改权限相关
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 105 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 79 insertions(+), 26 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
index c5e2f15..b2ba6e9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -2,6 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mysql.cj.x.protobuf.MysqlxDatatypes;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -12,6 +13,7 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.domain.ZfDoctor;
import com.ruoyi.domain.ZfRelation;
import com.ruoyi.domain.dto.Genealogy;
@@ -28,10 +30,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.websocket.server.PathParam;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.regex.Pattern;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
@@ -204,21 +203,12 @@
// return zInfoUserService.empower(empowerDto);
// }
/**
- * 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄瓙瀛�(uid:杈堝垎楂樼殑id,tpfid:杈堝垎浣庣殑id)
+ * 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄瓙瀛� tpfid:鑷繁id 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄紓鎬� 涓嶆槸鏈鐨勪汉閫�
*/
- @GetMapping("/uidAndUJd/{uid}/{tpfid}")
- public AjaxResult findByUidAndUid(@PathVariable("uid") Long uid,@PathVariable("tpfid") Long tpfid)
+ @GetMapping("/uidAndUJd/{tpfid}/{sex}")
+ public AjaxResult findByUidAndUid(@PathVariable("tpfid") Long tpfid, @PathVariable("sex") Integer sex)
{
- return AjaxResult.success(zInfoUserService.findByuid(uid, tpfid));
- }
- /**
- * 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄紓鎬�
- */
-
- @GetMapping("/sex/{uid}/{tpfid}")
- public AjaxResult findBySex(@PathVariable("uid") Long uid,@PathVariable("tpfid") Long tpfid)
- {
- Integer sex = zInfoUserService.getInfoById(tpfid).getSex();
+// Integer sex = zInfoUserService.getInfoById(tpfid).getSex();
//sex == 0 -> 鐢�
if (sex == 1){
sex = 0;
@@ -227,28 +217,91 @@
sex = 1;
}
List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex);
- List<String> nickName = new ArrayList<>();
+ List<HashMap<Long,String>> satisfyIds = new ArrayList<>();
+ HashMap<Long,String> bs = new HashMap<>();
for (ZInfoUser zInfoUser:zInfoUsers) {
- if (!zInfoUserService.findByuid(uid, tpfid)){
- nickName.add(zInfoUser.getNickName());
- }
+ if (!zInfoUserService.findByuid(zInfoUser.getUserId(), tpfid) && (zInfoUser.getMaritalStatus() == null || zInfoUser.getMaritalStatus() != 1)){
+ bs.put(zInfoUser.getUserId(),zInfoUser.getNickName());
+
+ }
+
}
- return AjaxResult.success(nickName);
+ satisfyIds.add(bs);
+ return AjaxResult.success(satisfyIds);
}
+
+ /**
+ * 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄瓙瀛� uid:闀胯緢id,tpfid:鎴戣嚜宸辩殑zinfoid
+ */
+ @GetMapping("/uidUJd/{uid}/{tpfid}")
+ public AjaxResult findByUidAndUid2(@PathVariable("uid") Long uid ,@PathVariable("tpfid") Long tpfid){
+ return AjaxResult.success( zInfoUserService.findByuid(uid,tpfid));
+ }
+
+ @GetMapping("/sex/{sex}")
+ public AjaxResult findBySex(@PathVariable("sex") Integer sex)
+ {
+// Integer sex = zInfoUserService.getInfoById(tpfid).getSex();
+ //sex == 0 -> 鐢�
+ if (sex == 1){
+ sex = 0;
+ }
+ else if (sex == 0){
+ sex = 1;
+ }
+ List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex);
+ List<HashMap<Long,String>> satisfyIds = new ArrayList<>();
+ HashMap<Long,String> bs = new HashMap<>();
+ for (ZInfoUser zInfoUser:zInfoUsers) {
+ if (zInfoUser.getMaritalStatus() ==null || zInfoUser.getMaritalStatus() != 1 )
+ bs.put(zInfoUser.getUserId(),zInfoUser.getNickName());
+
+ }
+ satisfyIds.add(bs);
+ return AjaxResult.success(satisfyIds);
+ }
+ /**
+ * 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄紓鎬�
+ */
+
+// /**
+// * 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄瓙瀛�(uid:?,tpfid:鑷繁id) 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄紓鎬� 涓嶆槸鏈鐨勪汉閫�
+// */
+// @GetMapping("/uidAndUJd/{uid}/{tpfid}/{sex}")
+// public AjaxResult findByUidAndUid(@PathVariable("uid") Long uid,@PathVariable("tpfid") Long tpfid, @PathVariable("sex") Integer sex)
+// {
+//// Integer sex = zInfoUserService.getInfoById(tpfid).getSex();
+// //sex == 0 -> 鐢�
+// if (sex == 1){
+// sex = 0;
+// }
+// else if (sex == 0){
+// sex = 1;
+// }
+// List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex);
+// List<String> nickName = new ArrayList<>();
+// for (ZInfoUser zInfoUser:zInfoUsers) {
+// if (!zInfoUserService.findByuid(uid, tpfid)){
+// if (zInfoUser.getIsMyFamily() == 1)
+// nickName.add(zInfoUser.getNickName());
+// }
+// }
+// return AjaxResult.success(nickName);
+// }
/**
* 瀹舵牴缃�
*/
@GetMapping("/root")
- public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth){
- return zInfoUserService.listWithTree(depth);
+ public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth,@PathParam("clanId") Integer clanId){
+ return zInfoUserService.listWithTree(depth, clanId);
}
/**
* 鏍规嵁瀹跺涵鎴愬憳鎵惧埌鎵�鏈変汉
*/
@GetMapping("/allFamInfo")
- public AjaxResult listAllFamilyPeople()
+ public AjaxResult listAllFamilyPeople(@PathParam("clanId") Integer clanId)
{
- return zInfoUserService.listAllFamilyPeople();
+ return zInfoUserService.listAllFamilyPeople(clanId);
}
/**
--
Gitblit v1.9.1