whywhyo
2023-08-09 ab24e68f152f9031a5ddfe4be7e82a5c84eb7476
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -12,11 +12,13 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfRelation;
import com.ruoyi.domain.dto.EmpowerDto;
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;
@@ -46,6 +48,12 @@
    @Resource
    private ZInfoUserService zInfoUserService;
    @Resource
    private ZfFamilyService zfFamilyService;
    @Resource
    private ZfRoleService zfRoleService;
//    @GetMapping("/all")
//    public AjaxResult  listAll(ZInfoUser zInfoUser){
@@ -104,7 +112,7 @@
    public AjaxResult getInfo() {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        return AjaxResult.success(zInfoUserService.getById(userId));
        return AjaxResult.success(zInfoUserService.getInfoById(userId));
    }
//
@@ -174,14 +182,14 @@
    }
    /**
     * 授权
     */
    @PostMapping("/empower")
    public AjaxResult empower(@RequestBody EmpowerDto empowerDto){
        return zInfoUserService.empower(empowerDto);
    }
//    /**
//     * 授权
//     */
//    @PostMapping("/empower")
//    public AjaxResult empower(@RequestBody EmpowerDto empowerDto){
//
//        return zInfoUserService.empower(empowerDto);
//    }
    /**
     * 家根网
@@ -237,5 +245,17 @@
        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);
    }
}