From c5525856b70f4ac7b0c7085a8db4fbd5a09928af Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 17 五月 2023 09:36:26 +0800
Subject: [PATCH] 导入的发生时间也添加了，ZfEventExcelBean
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 68 +++++++++++++++++++++++++++++++++-
1 files changed, 66 insertions(+), 2 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 5e294e7..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,8 +20,10 @@
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;
@@ -98,7 +102,6 @@
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
return AjaxResult.success(zInfoUserService.getById(userId));
-
}
//
@@ -109,6 +112,9 @@
@Log(title = "涓汉璇︾粏淇℃伅璁板綍", businessType = BusinessType.INSERT)
@PostMapping
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);
@@ -143,7 +149,6 @@
/**
* 鏌ヨ瀹跺涵涓昏鎴愬憳鍙婂叧绯�
*/
-
@GetMapping("/relation")
public AjaxResult listMyRelation() {
SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -151,6 +156,65 @@
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