增加了一个uaid，来给每个用户唯一标识

feige

2025-06-14 97d0917628eba0baabd89269161eaf1732037673

增加了一个uaid，来给每个用户唯一标识

 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("性别的原因");


 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);
    }
}

 zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java

@@ -231,6 +231,10 @@
     */
    private String secondFamilyId;

    /**
     * 判断唯一的用户编码
     */
    private String uaid;

    private Long sysId;
    /**

 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);

 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);

 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));
        }
        //加上自己家庭的id
        idList.add(familyId);
        System.out.println(authority);