From c4aed9ce680b823e86864aa83cd61487e69a3494 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 30 五月 2023 20:52:00 +0800
Subject: [PATCH] 123

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java |   94 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 89 insertions(+), 5 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 5e294e7..1ceacc0 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
@@ -11,6 +11,11 @@
 import com.ruoyi.common.utils.ServletUtils;
 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -18,8 +23,10 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import javax.websocket.server.PathParam;
 import java.util.Arrays;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
 import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
@@ -98,7 +105,6 @@
         SysUser user = SecurityUtils.getLoginUser().getUser();
         Long userId = user.getUserId();
         return AjaxResult.success(zInfoUserService.getById(userId));
-
     }
 //
 
@@ -109,6 +115,9 @@
     @Log(title = "涓汉璇︾粏淇℃伅璁板綍", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ZInfoUser zInfoUser) {
+//        if (!Pattern.matches("^[\\d]+(?:,[\\d]+)*$",zInfoUser.getFamilyId())) {
+//            throw new RuntimeException("璇疯緭鍏ュ彧鏈夋暟瀛楀拰鑻辨枃閫楀彿鐨勫瓧绗︿覆锛屼笖鏁板瓧鍜岄�楀彿蹇呴』浜ゆ浛鍑虹幇");
+//        }
         SysUser user = SecurityUtils.getLoginUser().getUser();
         Long userId = user.getUserId();
         zInfoUser.setUserId(userId);
@@ -143,14 +152,89 @@
     /**
      * 鏌ヨ瀹跺涵涓昏鎴愬憳鍙婂叧绯�
      */
-
     @GetMapping("/relation")
     public AjaxResult listMyRelation() {
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        Long userId = user.getUserId();
-        return zInfoUserService.searchMyRelation(userId);
+        return zInfoUserService.searchMyRelation();
     }
 
+    @PostMapping("/relation")
+    public AjaxResult addRelation(@RequestBody ZfRelation zfRelation){
+        return zInfoUserService.addRelation(zfRelation);
+    }
+
+    @PutMapping("/relation")
+    public AjaxResult updateRelation(@RequestBody ZfRelation zfRelation){
+        return zInfoUserService.updateRelation(zfRelation);
+    }
+
+    @DeleteMapping("/relation/{ids}")
+    public AjaxResult deleteRelation(@PathVariable Long[] ids){
+        return zInfoUserService.deleteRelation(ids);
+    }
+
+
+    /**
+     * 鎺堟潈
+     */
+    @PostMapping("/empower")
+    public AjaxResult empower(@RequestBody EmpowerDto empowerDto){
+
+        return zInfoUserService.empower(empowerDto);
+    }
+
+    /**
+     * 瀹舵牴缃�
+     */
+    @GetMapping("/root")
+    public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth){
+        return zInfoUserService.listWithTree(depth);
+    }
+
+
+    /**
+     * 鎵惧埌鎵�鏈夌殑鎴愬憳
+     */
+    @GetMapping("/all")
+    public AjaxResult listAllPeople(){
+        return zInfoUserService.listAllExceptAdmin();
+    }
+
+    /**
+     * 鏂板銆佷慨鏀圭埗瀛愬叧绯�
+     */
+
+    @PutMapping("/setParent")
+    public AjaxResult addParent(@PathParam("fatherId")Long fatherId,@PathParam("motherId")Long motherId){
+        return zInfoUserService.addParent(fatherId,motherId);
+    }
+
+    /**
+     * 鏍规嵁鏈汉id鏌ヨ鏈汉淇℃伅浠ュ強閰嶅伓淇℃伅
+     */
+    @GetMapping("/listMyself/{id}")
+    public AjaxResult listMySelfAndSpouse(@PathVariable("id") Long id){
+        return zInfoUserService.listMySelfAndSpouse(id);
+    }
+
+    /**
+     * 瀹惰氨
+     */
+    @GetMapping("/list/genealogy")
+    public AjaxResult listGenealogy(Genealogy genealogy){
+        Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+        Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+        return zInfoUserService.listGenealogy(genealogy,pageNum,pageSize);
+    }
+
+    /**
+     * 瀵煎嚭瀹惰氨
+     */
+    @PostMapping("/export/genealogy")
+    public void exportGenealogy(@RequestBody List<GenealogyExportDto> params, HttpServletResponse response){
+        List<Genealogy> list= zInfoUserService.selectDatas(params);
+        ExcelUtil<Genealogy> util = new ExcelUtil<>(Genealogy.class);
+        util.exportExcel(response,list,"瀹惰氨璁板綍鏁版嵁");
+    }
 
 }
 

--
Gitblit v1.9.1