From a2cc89fdd214c1a350d1f5b06447c155c47a5c25 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 08 五月 2023 17:52:00 +0800
Subject: [PATCH] 888
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 104 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 89 insertions(+), 15 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 557bef7..341001e 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
@@ -11,6 +11,8 @@
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.EmpowerDto;
import com.ruoyi.service.ZInfoUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -18,15 +20,17 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import javax.websocket.server.PathParam;
import java.util.Arrays;
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
@@ -54,13 +58,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 +73,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,21 +98,23 @@
*/
// @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.getById(userId));
}
//
+
/**
* 鏂板銆佷慨鏀逛釜浜鸿缁嗕俊鎭褰�
*/
// @PreAuthorize("@ss.hasPermi('system:property:add')")
@Log(title = "涓汉璇︾粏淇℃伅璁板綍", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody ZInfoUser zInfoUser)
- {
+ public AjaxResult add(@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);
@@ -128,19 +132,89 @@
// 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));
}
+ /**
+ * 鏌ヨ瀹跺涵涓昏鎴愬憳鍙婂叧绯�
+ */
+ @GetMapping("/relation")
+ public AjaxResult listMyRelation() {
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ return zInfoUserService.searchMyRelation(userId);
+ }
+
+ @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);
+ }
+
+ /**
+ * 瀹舵牴缃�
+ */
+ @GetMapping("/root")
+ public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth){
+ return zInfoUserService.listWithTree(depth);
+ }
+
+
+ /**
+ * 鎵惧埌鎵�鏈夌殑鎴愬憳
+ */
+ @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);
+ }
+
}
--
Gitblit v1.9.1