From 3ad8fb4e7cc1391e8090f3da6ffa9c48690a12a3 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 16 六月 2024 13:45:39 +0800
Subject: [PATCH] 修改了权限的代码

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java |   67 ++++++++++++++++++++++++++++-----
 1 files changed, 57 insertions(+), 10 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 1579775..c55d099 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
@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.zhang;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -12,11 +13,13 @@
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.domain.ZInfoUser;
 import com.ruoyi.domain.ZfRelation;
-import com.ruoyi.domain.dto.EmpowerDto;
+
 import com.ruoyi.domain.dto.Genealogy;
 import com.ruoyi.domain.dto.GenealogyExportDto;
 import com.ruoyi.domain.dto.RelationDto;
 import com.ruoyi.service.ZInfoUserService;
+import com.ruoyi.service.ZfFamilyService;
+import com.ruoyi.service.ZfRoleService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -25,6 +28,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.websocket.server.PathParam;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.regex.Pattern;
 
@@ -46,6 +50,12 @@
 
     @Resource
     private ZInfoUserService zInfoUserService;
+
+    @Resource
+    private ZfFamilyService zfFamilyService;
+
+    @Resource
+    private ZfRoleService zfRoleService;
 
 //    @GetMapping("/all")
 //    public AjaxResult  listAll(ZInfoUser zInfoUser){
@@ -104,7 +114,13 @@
     public AjaxResult getInfo() {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         Long userId = user.getUserId();
-        return AjaxResult.success(zInfoUserService.getById(userId));
+        return AjaxResult.success(zInfoUserService.getInfoById(userId));
+    }
+    @GetMapping("/{id}")
+    public AjaxResult getInfoById(@PathVariable("id") Long id) {
+      //  SysUser user = SecurityUtils.getLoginUser().getUser();
+        Long userId = id;
+        return AjaxResult.success(zInfoUserService.getInfoById(userId));
     }
 //
 
@@ -174,15 +190,22 @@
     }
 
 
+//    /**
+//     * 鎺堟潈
+//     */
+//    @PostMapping("/empower")
+//    public AjaxResult empower(@RequestBody EmpowerDto empowerDto){
+//
+//        return zInfoUserService.empower(empowerDto);
+//    }
     /**
-     * 鎺堟潈
+     * 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄瓙瀛�
      */
-    @PostMapping("/empower")
-    public AjaxResult empower(@RequestBody EmpowerDto empowerDto){
-
-        return zInfoUserService.empower(empowerDto);
-    }
-
+    @GetMapping("/uidAndUJd/{uid}/{tpfid}")
+        public AjaxResult findByUidAndUid(@PathVariable("uid")  Long uid,@PathVariable("tpfid")  Long tpfid)
+        {
+            return AjaxResult.success(zInfoUserService.findByuid(uid, tpfid));
+        }
     /**
      * 瀹舵牴缃�
      */
@@ -190,7 +213,14 @@
     public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth){
         return zInfoUserService.listWithTree(depth);
     }
-
+    /**
+     * 鏍规嵁瀹跺涵鎴愬憳鎵惧埌鎵�鏈変汉
+     */
+    @GetMapping("/allFamInfo")
+        public AjaxResult listAllFamilyPeople()
+        {
+            return zInfoUserService.listAllFamilyPeople();
+        }
 
     /**
      * 鎵惧埌鎵�鏈夌殑鎴愬憳
@@ -237,5 +267,22 @@
         util.exportExcel(response,list,"瀹惰氨璁板綍鏁版嵁");
     }
 
+    /**
+     * 瀹惰氨2.0
+     */
+    @GetMapping("/list/genealogy2")
+    public AjaxResult listGenealogy2(Genealogy genealogy){
+        Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+        Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+        return zInfoUserService.listGenealogy2(genealogy,pageNum,pageSize);
+    }
+
+    @GetMapping("/list/getInfoByfid/{fid}")
+    public AjaxResult getInfoByfid(@PathVariable("fid") Long fid)
+    {
+        return zInfoUserService.getInfoByfid(fid);
+    }
+
+
 }
 

--
Gitblit v1.9.1