修改权限相关

feige

2024-08-22 5e2ebcceae4bc34b46370f2c10110cd72e7f4fba

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java

@@ -2,6 +2,7 @@


import com.fasterxml.jackson.annotation.JsonFormat;
import com.mysql.cj.x.protobuf.MysqlxDatatypes;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -12,6 +13,7 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfDoctor;
import com.ruoyi.domain.ZfRelation;

import com.ruoyi.domain.dto.Genealogy;
@@ -20,6 +22,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;
@@ -27,9 +30,7 @@
import javax.annotation.Resource;
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.*;
import java.util.regex.Pattern;

import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
@@ -56,6 +57,9 @@

    @Resource
    private ZfRoleService zfRoleService;

    @Resource
    private SysUserMapper sysUserMapper;

//    @GetMapping("/all")
//    public AjaxResult  listAll(ZInfoUser zInfoUser){
@@ -198,21 +202,106 @@
//
//        return zInfoUserService.empower(empowerDto);
//    }
    /**
     * 根据用户id判断是否是子孙 tpfid:自己id 根据用户id判断是否是异性  不是本家的人选
     */
    @GetMapping("/uidAndUJd/{tpfid}/{sex}")
        public AjaxResult findByUidAndUid(@PathVariable("tpfid")  Long tpfid, @PathVariable("sex")  Integer sex)
        {
//            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<HashMap<Long,String>> satisfyIds = new ArrayList<>();
            HashMap<Long,String> bs = new HashMap<>();
            for (ZInfoUser zInfoUser:zInfoUsers) {
                    if (!zInfoUserService.findByuid(zInfoUser.getUserId(), tpfid) && (zInfoUser.getMaritalStatus() == null || zInfoUser.getMaritalStatus() != 1)){
                        bs.put(zInfoUser.getUserId(),zInfoUser.getNickName());

                    }

            }
            satisfyIds.add(bs);
            return AjaxResult.success(satisfyIds);
        }

    /**
     * 根据用户id判断是否是子孙 uid:长辈id,tpfid:我自己的zinfoid
     */
    @GetMapping("/uidUJd/{uid}/{tpfid}")
    public AjaxResult findByUidAndUid2(@PathVariable("uid") Long uid ,@PathVariable("tpfid")  Long tpfid){
        return AjaxResult.success( zInfoUserService.findByuid(uid,tpfid));
    }

    @GetMapping("/sex/{sex}")
    public AjaxResult findBySex(@PathVariable("sex")  Integer sex)
    {
//            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<HashMap<Long,String>> satisfyIds = new ArrayList<>();
        HashMap<Long,String> bs = new HashMap<>();
        for (ZInfoUser zInfoUser:zInfoUsers) {
            if (zInfoUser.getMaritalStatus() ==null || zInfoUser.getMaritalStatus() != 1 )
                bs.put(zInfoUser.getUserId(),zInfoUser.getNickName());

        }
        satisfyIds.add(bs);
        return AjaxResult.success(satisfyIds);
    }
    /**
     * 根据用户id判断是否是异性
     */

//    /**
//     * 根据用户id判断是否是子孙(uid:?,tpfid:自己id) 根据用户id判断是否是异性     不是本家的人选
//     */
//    @GetMapping("/uidAndUJd/{uid}/{tpfid}/{sex}")
//        public AjaxResult findByUidAndUid(@PathVariable("uid")  Long uid,@PathVariable("tpfid")  Long tpfid, @PathVariable("sex")  Integer sex)
//        {
////            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)){
//                    if (zInfoUser.getIsMyFamily() == 1)
//                        nickName.add(zInfoUser.getNickName());
//                }
//            }
//            return AjaxResult.success(nickName);
//        }
    /**
     * 家根网
     */
    @GetMapping("/root")
    public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth){
        return zInfoUserService.listWithTree(depth);
    public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth,@PathParam("clanId") Integer clanId){
        return zInfoUserService.listWithTree(depth, clanId);
    }
    /**
     * 根据家庭成员找到所有人
     */
    @GetMapping("/allFamInfo")
        public AjaxResult listAllFamilyPeople()
        public AjaxResult listAllFamilyPeople(@PathParam("clanId") Integer clanId)
        {
            return zInfoUserService.listAllFamilyPeople();
            return zInfoUserService.listAllFamilyPeople(clanId);
        }

    /**
@@ -270,6 +359,11 @@
        return zInfoUserService.listGenealogy2(genealogy,pageNum,pageSize);
    }

    @GetMapping("/list/getInfoByfid/{fid}")
    public AjaxResult getInfoByfid(@PathVariable("fid") Long fid)
    {
        return zInfoUserService.getInfoByfid(fid);
    }


}