From 97d0917628eba0baabd89269161eaf1732037673 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 14 六月 2025 14:56:10 +0800
Subject: [PATCH] 增加了一个uaid，来给每个用户唯一标识
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 8 ++++++++
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java | 9 +++++++++
ruoyi-admin/src/test/java/com/ruoyi/ExcelTest.java | 8 ++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 14 ++++++++++++++
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 4 ++++
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java | 1 +
6 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 48e60aa..02d3675 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -13,6 +13,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.entity.sysUserInfo;
+import com.ruoyi.common.utils.uuid.UUID;
import com.ruoyi.domain.*;
import com.ruoyi.domain.dto.MarryInfoDto;
import com.ruoyi.service.*;
@@ -381,6 +382,19 @@
infoUser.setNickName(userAll.getNickName());
infoUser.setOldName(userAll.getUserName());
infoUser.setPhoneNumber(userAll.getPhonenumber());
+
+
+ //璁剧疆鏂扮殑usid
+// UUID uuid= UUID.fromString(userAll.getUserName()+userAll.getPhonenumber());
+// String usid = uuid.toString();
+
+
+ String originalString=userAll.getUserName()+"-"+userAll.getPhonenumber();
+
+ String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
+ infoUser.setUaid(uniqueId);
+
+
System.out.println(userAll.getSex());
System.out.println("鎬у埆鐨勫師鍥�");
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/ExcelTest.java b/ruoyi-admin/src/test/java/com/ruoyi/ExcelTest.java
index a201ed9..7ae721b 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/ExcelTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/ExcelTest.java
@@ -1,7 +1,9 @@
package com.ruoyi;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.utils.uuid.UUID;
import com.ruoyi.domain.ZfProperty;
+import com.ruoyi.framework.web.domain.server.Sys;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@@ -23,5 +25,11 @@
// InputStream is = new FileInputStream(new File("D:\\test.xlsx"));
// ExcelUtil<ZfProperty> util = new ExcelUtil<ZfProperty>(ZfProperty.class);
// List<ZfProperty> userList = util.importExcel(is);
+ String originalString="寮犺嫢鍙�"+"-13602730899";
+
+ String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
+
+ //String usid = uuid.toString();
+ System.out.println(uniqueId);
}
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
index bb8ab99..b08a6e2 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -231,6 +231,10 @@
*/
private String secondFamilyId;
+ /**
+ * 鍒ゆ柇鍞竴鐨勭敤鎴风紪鐮�
+ */
+ private String uaid;
private Long sysId;
/**
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
index f7c4872..61e8a8f 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -25,6 +25,7 @@
Boolean findByuid(Long uid, Long tfid);
+ List<ZInfoUser> findByUaidToFaid(String usid);
List<ZInfoUser> selectByClanId(Integer clanId);
AjaxResult findUserNameAClan(List<String> nickNames);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index f756ced..483d1c3 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -84,6 +84,14 @@
}
@Override
+ public List<ZInfoUser> findByUaidToFaid(String usid) {
+ ZInfoUser zInfoUser = new ZInfoUser();
+ zInfoUser.setUaid(usid);
+ LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
+ return list(lqw);
+ }
+
+ @Override
public List<ZInfoUser> selectByClanId(Integer clanId) {
ZInfoUser zInfoUser = new ZInfoUser();
zInfoUser.setClanId(clanId);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
index de001af..9f92e63 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
@@ -228,6 +228,15 @@
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
+
+
+ //鏍规嵁uaid鏌ヨ鐩稿悓鍚嶅瓧涓嬪埆鐨勫搴噷鑷繁鐨勬暟鎹�
+ // Long fmid;
+ List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList());
+ if(fms.size()!=0)
+ {
+ idList.add(fms.get(0));
+ }
//鍔犱笂鑷繁瀹跺涵鐨刬d
idList.add(familyId);
System.out.println(authority);
--
Gitblit v1.9.1