From ebe782f6aa7e2a72926696348114a3348918d7b7 Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期二, 17 六月 2025 22:55:30 +0800 Subject: [PATCH] 修改了用户号码和用户姓名产生的uuid --- ruoyi-admin/src/test/java/com/ruoyi/ExcelTest.java | 2 +- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 19 ++++++++++++++++++- 2 files changed, 19 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 1c9772b..9ab3ed7 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 @@ -13,6 +13,7 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.utils.uuid.UUID; import com.ruoyi.domain.*; import com.ruoyi.domain.dto.Genealogy; @@ -182,6 +183,12 @@ 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()); @@ -192,8 +199,18 @@ // 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)); + return toAjax(zInfoUserService.saveOrUpdate(zInfoUser)); // saveOrUpdate(zInfoUser)); } diff --git a/ruoyi-admin/src/test/java/com/ruoyi/ExcelTest.java b/ruoyi-admin/src/test/java/com/ruoyi/ExcelTest.java index 7ae721b..8603d3e 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/ExcelTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/ExcelTest.java @@ -25,7 +25,7 @@ // 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 originalString="閽熷北"+"-13808810489"; String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString(); -- Gitblit v1.9.1