From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001 From: zqy <2522236926@qq.com> Date: 星期三, 06 八月 2025 15:37:20 +0800 Subject: [PATCH] 用户修改姓名和电话同步修改uaid --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java | 143 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 138 insertions(+), 5 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 09398a8..9ceb213 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,32 @@ package com.ruoyi.web.controller.zhang; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.domain.ZInfoUser; +import com.ruoyi.domain.ZCertificate; +import com.ruoyi.domain.ZfEvent; +import com.ruoyi.domain.ZfFamily; +import com.ruoyi.domain.dto.UserInfoDto; +import com.ruoyi.service.ZInfoUserService; import com.ruoyi.service.ZfFamilyService; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.beans.factory.annotation.Autowired; +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.ArrayList; +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 @@ -21,10 +41,123 @@ @Resource ZfFamilyService zfFamilyService; + @Autowired + ZInfoUserService zInfoUserService; + @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); } + /** + * 鏍规嵁瀹跺涵id鏌ヨ瀹跺涵鎴愬憳 + */ + @GetMapping("/{fid}") + 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)); + } + + + /** + * 鏌ョ湅褰撳墠鐢ㄦ埛褰撳墠瀹跺涵鐨勫搴垚鍛� + */ + + @GetMapping("/now") + public AjaxResult getNowMember(){ + return AjaxResult.success(zfFamilyService.getNowMember()); + } + + /** + * 鏂板瀹跺涵鎴愬憳 + */ + @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) { + SysUser user = SecurityUtils.getLoginUser().getUser(); + Long userId = user.getUserId(); + + Integer clanId = user.getClanId(); + LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>(); + lqw.eq(ZfFamily::getClanId,clanId); + List<ZfFamily> list = zfFamilyService.list(lqw); + //.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); + + } + /** + * 鍒犻櫎瀹跺涵鎴愬憳 + */ + + @DeleteMapping() + public AjaxResult removeFamilyMember(@RequestBody UserInfoDto userInfoDto){ + return zfFamilyService.removeMember(userInfoDto); + } + + + } -- Gitblit v1.9.1