修改了权限的代码

feige

2024-06-16 3ad8fb4e7cc1391e8090f3da6ffa9c48690a12a3

 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;
@@ -11,14 +12,23 @@
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.Genealogy;
import com.ruoyi.domain.dto.GenealogyExportDto;
import com.ruoyi.domain.dto.RelationDto;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfFamilyService;
import com.ruoyi.service.ZfRoleService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

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.regex.Pattern;

@@ -40,6 +50,12 @@

    @Resource
    private ZInfoUserService zInfoUserService;

    @Resource
    private ZfFamilyService zfFamilyService;

    @Resource
    private ZfRoleService zfRoleService;

//    @GetMapping("/all")
//    public AjaxResult  listAll(ZInfoUser zInfoUser){
@@ -98,25 +114,32 @@
    public AjaxResult getInfo() {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        return AjaxResult.success(zInfoUserService.getById(userId));
        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));
    }
//

    /**
     * 新增、修改个人详细信息记录
     * 修改个人详细信息记录
     */
//    @PreAuthorize("@ss.hasPermi('system:property:add')")
    @Log(title = "个人详细信息记录", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ZInfoUser zInfoUser) {
        if (!Pattern.matches("^[\\d]+(?:,[\\d]+)*$",zInfoUser.getFamilyId())) {
            throw new RuntimeException("请输入只有数字和英文逗号的字符串，且数字和逗号必须交替出现");
        }
    @PutMapping
    public AjaxResult update(@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);
        return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
    }


//    /**
//     * 修改个人详细信息记录
@@ -146,12 +169,118 @@
    /**
     * 查询家庭主要成员及关系
     */

    @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);
//    }
    /**
     * 根据用户id判断是否是子孙
     */
    @GetMapping("/uidAndUJd/{uid}/{tpfid}")
        public AjaxResult findByUidAndUid(@PathVariable("uid")  Long uid,@PathVariable("tpfid")  Long tpfid)
        {
            return AjaxResult.success(zInfoUserService.findByuid(uid, tpfid));
        }
    /**
     * 家根网
     */
    @GetMapping("/root")
    public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth){
        return zInfoUserService.listWithTree(depth);
    }
    /**
     * 根据家庭成员找到所有人
     */
    @GetMapping("/allFamInfo")
        public AjaxResult listAllFamilyPeople()
        {
            return zInfoUserService.listAllFamilyPeople();
        }

    /**
     * 找到所有的成员
     */
    @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,"家谱记录数据");
    }

    /**
     * 家谱2.0
     */
    @GetMapping("/list/genealogy2")
    public AjaxResult listGenealogy2(Genealogy genealogy){
        Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
        Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
        return zInfoUserService.listGenealogy2(genealogy,pageNum,pageSize);
    }

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