From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 06 八月 2025 15:37:20 +0800
Subject: [PATCH] 用户修改姓名和电话同步修改uaid
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 192 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 155 insertions(+), 37 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 d8a85b6..2941d4c 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,7 +1,9 @@
package com.ruoyi.web.controller.zhang;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mysql.cj.x.protobuf.MysqlxDatatypes;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -11,8 +13,8 @@
import com.ruoyi.common.utils.SecurityUtils;
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.common.utils.uuid.UUID;
+import com.ruoyi.domain.*;
import com.ruoyi.domain.dto.Genealogy;
import com.ruoyi.domain.dto.GenealogyExportDto;
@@ -21,17 +23,16 @@
import com.ruoyi.service.ZfFamilyService;
import com.ruoyi.service.ZfRoleService;
import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
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.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.regex.Pattern;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
@@ -49,9 +50,11 @@
@RestController
@RequestMapping("/self/user")
public class ZInfoUserController extends BaseController {
-
+ @Autowired
+ private ISysUserService userService;
@Resource
private ZInfoUserService zInfoUserService;
+
@Resource
private ZfFamilyService zfFamilyService;
@@ -119,12 +122,25 @@
public AjaxResult getInfo() {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- return AjaxResult.success(zInfoUserService.getInfoById(userId));
+
+
+
+ ZInfoUser zInfoUser = zInfoUserService.getInfoById(userId);
+ if(zInfoUser!=null)
+ {
+ return AjaxResult.success(zInfoUser);
+ }
+ else
+ return AjaxResult.success(user);
}
@GetMapping("/{id}")
public AjaxResult getInfoById(@PathVariable("id") Long id) {
- // SysUser user = SecurityUtils.getLoginUser().getUser();
+ // SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = id;
+
+
+ //鏌ヨsys_user琛�
+ // SysUser sysUser = sysUserService.selectUserById(userId);
return AjaxResult.success(zInfoUserService.getInfoById(userId));
}
//
@@ -141,10 +157,62 @@
// }
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- zInfoUser.setUserId(userId);
- return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
+ zInfoUser.setSysId(userId);
+
+ LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
+ uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
+
+ return toAjax(zInfoUserService.update(uw));
+ // saveOrUpdate(zInfoUser));
}
+ @Log(title = "涓汉璇︾粏淇℃伅璁板綍", businessType = BusinessType.INSERT)
+ @PutMapping("/updateInfo")
+ public AjaxResult updateInfo(@RequestBody ZInfoUser zInfoUser) {
+// if (!Pattern.matches("^[\\d]+(?:,[\\d]+)*$",zInfoUser.getFamilyId())) {
+// throw new RuntimeException("璇疯緭鍏ュ彧鏈夋暟瀛楀拰鑻辨枃閫楀彿鐨勫瓧绗︿覆锛屼笖鏁板瓧鍜岄�楀彿蹇呴』浜ゆ浛鍑虹幇");
+// }
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ zInfoUser.setSysId(userId);
+
+// ZInfoUser infoBysysId = zInfoUserService.getInfoBysysId(userId);
+//
+//
+// zInfoUser.setUserId(infoBysysId.getUserId());
+ user.setSex(zInfoUser.getSex()+"");
+ user.setUserName(zInfoUser.getOldName());
+ user.setPhonenumber(zInfoUser.getPhoneNumber());
+ String oriUaid = zInfoUser.getUaid();
+
+ String originalString = zInfoUser.getOldName()+"-"+zInfoUser.getPhoneNumber();
+ String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
+ zInfoUser.setUaid(uniqueId);
+
+//
+// us.setUserId(user.getSysId());
+// us.setUserName(user.getUserName());
+// us.setNickName(user.getNickName());
+// us.setRoleId(user.getRoleId());
+// us.setSex(user.getSex());
+// us.setStatus(user.getStatus());
+// us.setRemark(user.getRemark());
+ userService.updateUser(user);
+ //LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
+
+
+ //淇敼uaid鐩稿悓鐨勭敤鎴疯褰�
+ if(oriUaid!=null) {
+ List<ZInfoUser> list = zInfoUserService.findByUaidToFaid(oriUaid);
+ for(ZInfoUser zInfoUser1: list)
+ zInfoUser1.setUaid(oriUaid);
+ return toAjax(zInfoUserService.saveBatch(list));
+ }
+ else
+ // uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
+ return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
+ // saveOrUpdate(zInfoUser));
+ }
// /**
// * 淇敼涓汉璇︾粏淇℃伅璁板綍
@@ -206,27 +274,59 @@
/**
* 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄瓙瀛� tpfid:鑷繁id 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄紓鎬� 涓嶆槸鏈鐨勪汉閫�
*/
- @GetMapping("/uidAndUJd/{tpfid}/{sex}")
- public AjaxResult findByUidAndUid(@PathVariable("tpfid") Long tpfid, @PathVariable("sex") Integer sex)
- {
+ @GetMapping("/uidAndUJd/{tpfid}/{sex}/{clanId}")
+ public AjaxResult findByUidAndUid(@PathVariable("tpfid") Long tpfid, @PathVariable("sex") Integer sex, @PathVariable("clanId") Integer clanId)
+ {
// Integer sex = zInfoUserService.getInfoById(tpfid).getSex();
- //sex == 0 -> 鐢�
- if (sex == 1){
- sex = 0;
- }
- else if (sex == 0){
- sex = 1;
- }
- List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex);
- List<Long> satisfyIds = new ArrayList<>();
- for (ZInfoUser zInfoUser:zInfoUsers) {
- if (zInfoUser.getIsMyFamily() == 1)
- if (!zInfoUserService.findByuid(zInfoUser.getUserId(), tpfid)){
- satisfyIds.add(zInfoUser.getUserId());
- }
- }
- return AjaxResult.success(satisfyIds);
+ //sex == 0 -> 鐢�
+ if (sex == 1){
+ sex = 0;
}
+ else if (sex == 0){
+ sex = 1;
+ }
+ List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex, clanId);
+ List<HashMap<Long,String>> satisfyIds = new ArrayList<>();
+ HashMap<Long,String> bs = new HashMap<>();
+ for (ZInfoUser zInfoUser:zInfoUsers) {
+ if (!zInfoUserService.findByuid(zInfoUser.getUserId(), tpfid) && (zInfoUser.getMaritalStatus() == null || zInfoUser.getMaritalStatus() != 1)){
+ bs.put(zInfoUser.getUserId(),zInfoUser.getNickName());
+
+ }
+
+ }
+ satisfyIds.add(bs);
+ return AjaxResult.success(satisfyIds);
+ }
+
+ /**
+ * 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄瓙瀛� uid:闀胯緢id,tpfid:鎴戣嚜宸辩殑zinfoid
+ */
+ @GetMapping("/uidUJd/{uid}/{tpfid}")
+ public AjaxResult findByUidAndUid2(@PathVariable("uid") Long uid ,@PathVariable("tpfid") Long tpfid){
+ return AjaxResult.success( zInfoUserService.findByuid(uid,tpfid));
+ }
+
+ @GetMapping("/sex/{sex}/{clanId}")
+ public AjaxResult findBySex(@PathVariable("sex") Integer sex, @PathVariable("clanId") Integer clanId)
+ {
+// Integer sex = zInfoUserService.getInfoById(tpfid).getSex();
+ //sex == 0 -> 鐢�
+ if (sex == 1){
+ sex = 0;
+ }
+ else if (sex == 0){
+ sex = 1;
+ }
+ List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex, clanId);
+ List<HashMap<Long,String>> satisfyIds = new ArrayList<>();
+ HashMap<Long,String> bs = new HashMap<>();
+ for (ZInfoUser zInfoUser:zInfoUsers) {
+ bs.put(zInfoUser.getUserId(),zInfoUser.getNickName());
+ }
+ satisfyIds.add(bs);
+ return AjaxResult.success(satisfyIds);
+ }
/**
* 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄紓鎬�
*/
@@ -259,17 +359,17 @@
* 瀹舵牴缃�
*/
@GetMapping("/root")
- public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth){
- return zInfoUserService.listWithTree(depth);
+ public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth,@PathParam("clanId") Integer clanId){
+ return zInfoUserService.listWithTree(depth, clanId);
}
/**
* 鏍规嵁瀹跺涵鎴愬憳鎵惧埌鎵�鏈変汉
*/
@GetMapping("/allFamInfo")
- public AjaxResult listAllFamilyPeople()
- {
- return zInfoUserService.listAllFamilyPeople();
- }
+ public AjaxResult listAllFamilyPeople(@PathParam("clanId") Integer clanId)
+ {
+ return zInfoUserService.listAllFamilyPeople(clanId);
+ }
/**
* 鎵惧埌鎵�鏈夌殑鎴愬憳
@@ -303,6 +403,10 @@
public AjaxResult listGenealogy(Genealogy genealogy){
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Integer clanId = user.getClanId();
+ if(clanId != null) genealogy.setClanId(clanId);
+ System.out.println("11111111//"+clanId);
return zInfoUserService.listGenealogy(genealogy,pageNum,pageSize);
}
@@ -332,6 +436,20 @@
return zInfoUserService.getInfoByfid(fid);
}
+ /**
+ * 鍒嗕韩缁欏叾浠栧鏃忔暟鎹紝閫氳繃杈撳叆鍚嶅瓧鏌ユ壘鎵�鏈夌殑鍚屽悕鐢ㄦ埛鍜屽鏃忓彿
+ */
+ @PostMapping("/byName")
+ public AjaxResult listByUserNameDate(@RequestBody SysUser sysUser)
+ {
-}
+ List<SysUser> strings = sysUserMapper.getUserByUserName(sysUser.getUserName());
+ List<String> strings1= new ArrayList<>();
+ for (SysUser s:strings){
+ strings1.add(s.getNickName());
+ }
+ return zInfoUserService.findUserNameAClan(strings1);
+ }
+
+}
\ No newline at end of file
--
Gitblit v1.9.1