From 3ad8fb4e7cc1391e8090f3da6ffa9c48690a12a3 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 16 六月 2024 13:45:39 +0800
Subject: [PATCH] 修改了权限的代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 171 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 149 insertions(+), 22 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 03fffb3..c55d099 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;
@@ -11,22 +12,32 @@
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;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author ojq
@@ -39,6 +50,12 @@
@Resource
private ZInfoUserService zInfoUserService;
+
+ @Resource
+ private ZfFamilyService zfFamilyService;
+
+ @Resource
+ private ZfRoleService zfRoleService;
// @GetMapping("/all")
// public AjaxResult listAll(ZInfoUser zInfoUser){
@@ -54,13 +71,12 @@
// @PreAuthorize("@ss.hasPermi('system:property:export')")
@Log(title = "涓汉璇︾粏淇℃伅璁板綍", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, ZInfoUser zInfoUser)
- {
+ public void export(HttpServletResponse response, ZInfoUser zInfoUser) {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
zInfoUser.setUserId(userId);
List<ZInfoUser> list = zInfoUserService.selectByCondition(zInfoUser);
- log.info("瀵煎嚭璁板綍涓�:{}",list);
+ log.info("瀵煎嚭璁板綍涓�:{}", list);
ExcelUtil<ZInfoUser> util = new ExcelUtil<>(ZInfoUser.class);
util.exportExcel(response, list, "涓汉璇︾粏淇℃伅璁板綍鏁版嵁");
}
@@ -70,14 +86,13 @@
*/
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
- public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
- {
+ public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
ExcelUtil<ZInfoUser> util = new ExcelUtil<>(ZInfoUser.class);
List<ZInfoUser> eventList = util.importExcel(file.getInputStream());
- log.info("涓汉璇︾粏淇℃伅鍒楄〃涓猴細{}",eventList);
- if(eventList.size()>1){
+ log.info("涓汉璇︾粏淇℃伅鍒楄〃涓猴細{}", eventList);
+ if (eventList.size() > 1) {
return AjaxResult.error("瀵煎叆涓汉淇℃伅鍙兘鏈変竴鏉¤褰�");
}
@@ -96,26 +111,35 @@
*/
// @PreAuthorize("@ss.hasPermi('system:property:query')")
@GetMapping()
- public AjaxResult getInfo()
- {
+ public AjaxResult getInfo() {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- return 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)
- {
+ @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));
}
+
// /**
// * 淇敼涓汉璇︾粏淇℃伅璁板綍
@@ -128,14 +152,14 @@
// return toAjax(zInfoUserService.updateById(zInfoUser));
// }
//
+
/**
* 鍒犻櫎涓汉璇︾粏淇℃伅璁板綍
*/
// @PreAuthorize("@ss.hasPermi('system:property:remove')")
@Log(title = "涓汉璇︾粏淇℃伅璁板綍", businessType = BusinessType.DELETE)
@DeleteMapping()
- public AjaxResult remove()
- {
+ public AjaxResult remove() {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
return toAjax(zInfoUserService.removeById(userId));
@@ -145,16 +169,119 @@
/**
* 鏌ヨ瀹跺涵涓昏鎴愬憳鍙婂叧绯�
*/
-
@GetMapping("/relation")
- public AjaxResult listMyRelation(){
- SysUser user = SecurityUtils.getLoginUser().getUser();
- Long userId = user.getUserId();
- return zInfoUserService.searchMyRelation(userId);
+ public AjaxResult listMyRelation() {
+ 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);
+ }
}
--
Gitblit v1.9.1