From 182b2b1d3464dc1e2dcfe83a9f11799a90e7db23 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期六, 23 八月 2025 20:58:21 +0800
Subject: [PATCH] 同一用户 健康模块 新增删除同一条数据
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 7 +++++--
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNowServiceImpl.java | 10 +++++++++-
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthHabitServiceImpl.java | 10 +++++++++-
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthBaseServiceImpl.java | 11 ++++++++++-
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthInfoServiceImpl.java | 10 +++++++++-
5 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index fd40fa4..5fb90a6 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -119,7 +119,6 @@
public boolean endOfLife(String username) {
SysUser sysUser = userService.selectUserByNickName(username);
- System.out.println("[[[[[[["+sysUser);
if (sysUser.getPaid() != null && sysUser.getPaid().equals(0) && !"4".equals(sysUser.getStatus())) {
Date startTime = sysUser.getCreateTime();
@@ -150,13 +149,14 @@
*/
public String login(String nickName, String password, String code, String uuid)
{
- endOfLife(nickName);
// 楠岃瘉鐮佹牎楠�
validateCaptcha(nickName, code, uuid);
// 鐧诲綍鍓嶇疆鏍￠獙
loginPreCheck(nickName, password);
// 鐢ㄦ埛楠岃瘉
Authentication authentication = null;
+
+
try
{
UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(nickName, password);
@@ -186,6 +186,9 @@
recordLoginInfo(loginUser.getUserId());
+ endOfLife(nickName);
+
+
SysUser sysUser = userService.selectUserByNickName(nickName);
//.selectUserByUserName(username);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthBaseServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthBaseServiceImpl.java
index 55dca83..9b37fb4 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthBaseServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthBaseServiceImpl.java
@@ -104,8 +104,17 @@
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
+
+ //鑾峰彇鍒板悓鎰忕敤鎴风殑sys_userId 鍙瓨鎴栦慨鏀逛竴鏉℃暟鎹�
+ ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
+ String uaid = zInfoUser.getUaid();
+ List<ZInfoUser> byUaidToFaid = zInfoUserService.findByUaidToFaid(uaid);
+ List<Long> collect = byUaidToFaid.stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
+
LambdaQueryWrapper<ZHealthBase> lqw = new LambdaQueryWrapper<>();
- lqw.eq(ZHealthBase::getUid,userId);
+ lqw.in(ZHealthBase::getUid,collect);
+
+
ZHealthBase getResult = getOne(lqw);
ZHealthBase zHealthBase = new ZHealthBase();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthHabitServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthHabitServiceImpl.java
index 1d23916..34e69a5 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthHabitServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthHabitServiceImpl.java
@@ -100,8 +100,16 @@
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
+ //鑾峰彇鍒板悓鎰忕敤鎴风殑sys_userId 鍙瓨鎴栦慨鏀逛竴鏉℃暟鎹�
+ ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
+ String uaid = zInfoUser.getUaid();
+ List<ZInfoUser> byUaidToFaid = zInfoUserService.findByUaidToFaid(uaid);
+ List<Long> collect = byUaidToFaid.stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
+
+
+
LambdaQueryWrapper<ZHealthHabit> lqw = new LambdaQueryWrapper<>();
- lqw.eq(ZHealthHabit::getUid,userId);
+ lqw.in(ZHealthHabit::getUid,collect);
ZHealthHabit getResult = getOne(lqw);
ZHealthHabit zHealthHabit = new ZHealthHabit();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthInfoServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthInfoServiceImpl.java
index a40f734..4809222 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthInfoServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthInfoServiceImpl.java
@@ -102,8 +102,16 @@
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
+ //鑾峰彇鍒板悓鎰忕敤鎴风殑sys_userId 鍙瓨鎴栦慨鏀逛竴鏉℃暟鎹�
+ ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
+ String uaid = zInfoUser.getUaid();
+ List<ZInfoUser> byUaidToFaid = zInfoUserService.findByUaidToFaid(uaid);
+ List<Long> collect = byUaidToFaid.stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
+
+
+
LambdaQueryWrapper<ZHealthInfo> lqw = new LambdaQueryWrapper<>();
- lqw.eq(ZHealthInfo::getUid,userId);
+ lqw.in(ZHealthInfo::getUid,collect);
ZHealthInfo getResult = getOne(lqw);
ZHealthInfo zHealthInfo = new ZHealthInfo();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNowServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNowServiceImpl.java
index b7a416f..0279101 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNowServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNowServiceImpl.java
@@ -107,8 +107,16 @@
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
+ //鑾峰彇鍒板悓鎰忕敤鎴风殑sys_userId 鍙瓨鎴栦慨鏀逛竴鏉℃暟鎹�
+ ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
+ String uaid = zInfoUser.getUaid();
+ List<ZInfoUser> byUaidToFaid = zInfoUserService.findByUaidToFaid(uaid);
+ List<Long> collect = byUaidToFaid.stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
+
+
+
LambdaQueryWrapper<ZHealthNow> lqw = new LambdaQueryWrapper<>();
- lqw.eq(ZHealthNow::getUid,userId);
+ lqw.in(ZHealthNow::getUid,collect);
ZHealthNow getResult = getOne(lqw);
ZHealthNow zHealthNow = new ZHealthNow();
--
Gitblit v1.9.1