From b4895bdc5d9268e55c0023b92cc7c2d68ba33e46 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 05 十一月 2024 10:07:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java |   80 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
index 13bc437..081ad8d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
@@ -1,12 +1,24 @@
 package com.ruoyi.web.controller.zhang;
 
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.ZfEvent;
+import com.ruoyi.domain.ZfFamily;
 import com.ruoyi.domain.dto.UserInfoDto;
 import com.ruoyi.service.ZfFamilyService;
 import org.springframework.security.core.parameters.P;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
+import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
 
 /**
  * @Author Jinquan_Ou
@@ -22,8 +34,10 @@
     ZfFamilyService zfFamilyService;
 
     @GetMapping("/all")
-    public AjaxResult getAllFamily(){
-        return AjaxResult.success(zfFamilyService.list());
+    public AjaxResult getAllFamily(ZfFamily zfFamily){
+        Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+        Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+        return zfFamilyService.selectDataList(zfFamily, pageNo,pageSize);
     }
 
     /**
@@ -33,6 +47,15 @@
     public AjaxResult getByFamilyId(@PathVariable Long fid){
         return AjaxResult.success(zfFamilyService.getByFamilyId(fid));
     }
+    @GetMapping("/findByfid/{fid}")
+    public AjaxResult getByFId(@PathVariable("fid") Long fid){
+        return AjaxResult.success(zfFamilyService.getByFid(fid));
+    }
+    @GetMapping("/findByFname/{name}/{clanId}")
+    public AjaxResult getByFName(@PathVariable("name") String name, @PathVariable("clanId") Integer clanId){
+        return AjaxResult.success(zfFamilyService.getByName(name, clanId));
+    }
+
 
     /**
      * 鏌ョ湅褰撳墠鐢ㄦ埛褰撳墠瀹跺涵鐨勫搴垚鍛�
@@ -48,11 +71,64 @@
      */
     @PostMapping()
     public AjaxResult addFamilyMember(@RequestBody UserInfoDto userInfoDto){
+
         return zfFamilyService.addMember(userInfoDto);
 
     }
 
     /**
+     * 瀵煎嚭瀹跺涵澶т簨浠惰褰曞垪琛�
+     */
+//    @PreAuthorize("@ss.hasPermi('system:property:export')")
+    @Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response) {
+        List<ZfFamily> list = zfFamilyService.list();
+        System.out.println("------------------");
+        ExcelUtil<ZfFamily> util = new ExcelUtil<>(ZfFamily.class);
+        util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
+
+    }
+
+    @Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.DELETE)
+    @DeleteMapping("/deleteFam/{ids}")
+    public AjaxResult deleteFamily(@PathVariable Long[] ids) {
+        return zfFamilyService.deleteFam(ids);
+    }
+    /**
+     *
+     * @param zfFamily
+     * @return
+     */
+    @PostMapping("/addFam")
+    public AjaxResult addFamilyMember(@RequestBody ZfFamily zfFamily){
+
+        return zfFamilyService.addFamily(zfFamily);
+
+    }
+    /**
+     *
+     * @param zfFamily
+     * @return
+     */
+    @PostMapping("/findInfo")
+    public AjaxResult findFamilyMember(@RequestBody ZfFamily zfFamily){
+
+        return AjaxResult.success(zfFamilyService.getByNameAndUser(zfFamily));
+
+    }
+    /**
+     *
+     * @param zfFamily
+     * @return
+     */
+    @PostMapping("/updateFam")
+    public AjaxResult updateFamily(@RequestBody ZfFamily zfFamily){
+
+        return zfFamilyService.updateFam(zfFamily);
+
+    }
+    /**
      * 鍒犻櫎瀹跺涵鎴愬憳
      */
 

--
Gitblit v1.9.1