From f3f1875f2718c8753255896242ee67346790a7b4 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期五, 28 六月 2024 16:58:25 +0800
Subject: [PATCH] 修改直播申请
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 57 insertions(+), 1 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 ff960f0..c5e2f15 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;
@@ -19,6 +20,7 @@
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfFamilyService;
import com.ruoyi.service.ZfRoleService;
+import com.ruoyi.system.mapper.SysUserMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -26,7 +28,9 @@
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.regex.Pattern;
@@ -54,6 +58,9 @@
@Resource
private ZfRoleService zfRoleService;
+
+ @Resource
+ private SysUserMapper sysUserMapper;
// @GetMapping("/all")
// public AjaxResult listAll(ZInfoUser zInfoUser){
@@ -112,6 +119,12 @@
public AjaxResult getInfo() {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
+ 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));
}
//
@@ -190,7 +203,38 @@
//
// return zInfoUserService.empower(empowerDto);
// }
+ /**
+ * 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄瓙瀛�(uid:杈堝垎楂樼殑id,tpfid:杈堝垎浣庣殑id)
+ */
+ @GetMapping("/uidAndUJd/{uid}/{tpfid}")
+ public AjaxResult findByUidAndUid(@PathVariable("uid") Long uid,@PathVariable("tpfid") Long tpfid)
+ {
+ 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();
+ //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)){
+ nickName.add(zInfoUser.getNickName());
+ }
+ }
+ return AjaxResult.success(nickName);
+ }
/**
* 瀹舵牴缃�
*/
@@ -198,7 +242,14 @@
public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth){
return zInfoUserService.listWithTree(depth);
}
-
+ /**
+ * 鏍规嵁瀹跺涵鎴愬憳鎵惧埌鎵�鏈変汉
+ */
+ @GetMapping("/allFamInfo")
+ public AjaxResult listAllFamilyPeople()
+ {
+ return zInfoUserService.listAllFamilyPeople();
+ }
/**
* 鎵惧埌鎵�鏈夌殑鎴愬憳
@@ -255,6 +306,11 @@
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