From f1831ec9329d0fb5e424b35064ca8e5f05a7920a Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 08 七月 2025 22:21:34 +0800
Subject: [PATCH] 修改了数据
---
ruoyi-admin/src/main/resources/www.bendudu.com.pfx | 0
zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java | 28 ++++++
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNowServiceImpl.java | 35 ++++++++
zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java | 20 ++++-
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthHabitServiceImpl.java | 15 ++-
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthBaseServiceImpl.java | 37 +++++++++
ruoyi-admin/src/main/resources/application.yml | 2
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthInfoServiceImpl.java | 35 ++++++++
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNoteServiceImpl.java | 13 ++-
9 files changed, 166 insertions(+), 19 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 5553b5b..c7a11da 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -24,7 +24,7 @@
key-store: classpath:www.bendudu.com.pfx
# 鈥�.pfx鈥濊瘉涔﹀搴旀牸寮忥紝鈥�.jks"璇佷功瀵瑰簲鈥淩SA鈥�
key-store-type: PKCS12
- key-store-password: 5yheh725
+ key-store-password: n0l5twa7
#key-password: 绉侀挜瀵嗙爜
servlet:
diff --git a/ruoyi-admin/src/main/resources/www.bendudu.com.pfx b/ruoyi-admin/src/main/resources/www.bendudu.com.pfx
index 7cf9cd3..74c2b33 100644
--- a/ruoyi-admin/src/main/resources/www.bendudu.com.pfx
+++ b/ruoyi-admin/src/main/resources/www.bendudu.com.pfx
Binary files differ
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java
index ad7dc4d..1f48226 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java
@@ -9,6 +9,7 @@
import com.ruoyi.domain.MarrySelf;
import com.ruoyi.domain.MarryUser;
import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.domain.ZSelfNote;
import com.ruoyi.domain.dto.MarryInfoDto;
import com.ruoyi.domain.dto.MarryUserDto;
import com.ruoyi.mapper.MarrySelfMapper;
@@ -34,7 +35,8 @@
@Resource
MarryUserService marryUserService;
-
+ @Resource
+ ZInfoUserService zInfoUserService;
// @Resource
// MarrySelfService marrySelfService;
@@ -58,15 +60,25 @@
//鍐嶆煡璇㈠墠浠荤殑淇℃伅
LambdaQueryWrapper<MarryUser> marryUserLQW = new LambdaQueryWrapper<>();
- marryUserLQW.eq(MarryUser::getUid,userId);
+
+
+ //鏍规嵁userId鏌ヨ鍒癷nfouser鐨剈aid
+ ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
+ //鎷垮埌鎵�鏈夌殑sysid
+ List<Long> fms = zInfoUserService.findByUaidToFaid(zInfoUser.getUaid()).stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
+
+
+ marryUserLQW.in(MarryUser::getUid, fms);
+ // marryUserLQW.eq(MarryUser::getUid,userId);
List<MarryUser> spouseList = marryUserService.list(marryUserLQW);
List<MarryUserDto> frontList = spouseList.stream().map(s -> {
+ System.out.println(s);
MarryUserDto marryUserDto = new MarryUserDto();
BeanUtils.copyProperties(s, marryUserDto);
return marryUserDto;
}).collect(Collectors.toList());
-
-
+ System.out.println("++++++++++++----------------");
+ System.out.println(frontList);
//鏈�缁堣繑鍥炴暟鎹ā鍨�
MarryInfoDto result = new MarryInfoDto();
BeanUtils.copyProperties(myself,result);
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 e273ee2..55dca83 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
@@ -9,13 +9,20 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.domain.ZHealthBase;
+import com.ruoyi.domain.ZHealthNow;
+import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.dto.ZHealthBaseDto;
import com.ruoyi.domain.health.AllergyHistory;
import com.ruoyi.domain.health.BloodType;
import com.ruoyi.domain.health.GeneticDisease;
import com.ruoyi.mapper.ZHealthBaseMapper;
import com.ruoyi.service.ZHealthBaseService;
+import com.ruoyi.service.ZInfoUserService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -27,7 +34,8 @@
*/
@Service
public class ZHealthBaseServiceImpl extends ServiceImpl<ZHealthBaseMapper, ZHealthBase> implements ZHealthBaseService {
-
+ @Autowired
+ ZInfoUserService zInfoUserService;
@Override
public ZHealthBaseDto selectData() {
SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -37,6 +45,33 @@
lqw.eq(ZHealthBase::getUid,userId);
ZHealthBase zHealthBase = getOne(lqw);
+
+
+
+ if(zHealthBase==null)
+ {
+ //鏍规嵁userId鏌ヨ鍒癷nfouser鐨剈aid
+ ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
+ System.out.println("55555555555555555555");
+
+ //鎷垮埌鎵�鏈夌殑sysid
+ List<Long> fms = zInfoUserService.findByUaidToFaid(zInfoUser.getUaid()).stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
+ System.out.println(fms.size());
+
+ for(Long id:fms)
+ {
+ LambdaQueryWrapper<ZHealthBase> lqw1 = new LambdaQueryWrapper<>();
+
+ if(!id.equals(userId))
+ {
+
+ lqw1.eq(ZHealthBase::getUid, id);
+ zHealthBase = getOne(lqw1);
+ break;
+ }
+ }
+
+ }
//濡傛灉鏄涓�娆¤繘鏉ワ紝涔嬪墠娌℃湁杩欎釜鐢ㄦ埛鐨勬暟鎹紝鎶涘紓甯歌鐢ㄦ埛鍏堟彃鍏ユ暟鎹�
if(zHealthBase == null){
throw new RuntimeException("绗竴娆¤繘鏉�,璇峰厛濉啓濂芥暟鎹�");
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 d9462d3..1d23916 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
@@ -8,10 +8,8 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
-import com.ruoyi.domain.Physcial;
+import com.ruoyi.domain.*;
import com.ruoyi.domain.ZHealthHabit;
-import com.ruoyi.domain.ZHealthHabit;
-import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.dto.ZHealthHabitDto;
import com.ruoyi.domain.dto.ZHealthHabitDto;
import com.ruoyi.domain.health.*;
@@ -44,18 +42,25 @@
LambdaQueryWrapper<ZHealthHabit> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZHealthHabit::getUid,userId);
ZHealthHabit zHealthHabit = getOne(lqw);
+ System.out.println("+++++++6676+++++++++++");
+
if(zHealthHabit==null)
{
//鏍规嵁userId鏌ヨ鍒癷nfouser鐨剈aid
ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
+ System.out.println("++++++++++++++++++");
+
//鎷垮埌鎵�鏈夌殑sysid
List<Long> fms = zInfoUserService.findByUaidToFaid(zInfoUser.getUaid()).stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
for(Long id:fms)
{
+ LambdaQueryWrapper<ZHealthHabit> lqw1 = new LambdaQueryWrapper<>();
if(!id.equals(userId))
{
- lqw.eq(ZHealthHabit::getUid, id);
- zHealthHabit = getOne(lqw);
+ System.out.println("++++++++++++++++++");
+ System.out.println(id);
+ lqw1.eq(ZHealthHabit::getUid, id);
+ zHealthHabit = getOne(lqw1);
break;
}
}
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 11046e7..a40f734 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
@@ -8,7 +8,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
-import com.ruoyi.domain.ZHealthInfo;
+import com.ruoyi.domain.*;
import com.ruoyi.domain.ZHealthInfo;
import com.ruoyi.domain.ZHealthInfo;
import com.ruoyi.domain.dto.ZHealthInfoDto;
@@ -16,7 +16,12 @@
import com.ruoyi.domain.health.*;
import com.ruoyi.mapper.ZHealthInfoMapper;
import com.ruoyi.service.ZHealthInfoService;
+import com.ruoyi.service.ZInfoUserService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -28,7 +33,8 @@
*/
@Service
public class ZHealthInfoServiceImpl extends ServiceImpl<ZHealthInfoMapper, ZHealthInfo> implements ZHealthInfoService {
-
+ @Autowired
+ ZInfoUserService zInfoUserService;
@Override
public AjaxResult selectData() {
SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -38,6 +44,31 @@
lqw.eq(ZHealthInfo::getUid,userId);
ZHealthInfo zHealthInfo = getOne(lqw);
+
+
+ if(zHealthInfo==null)
+ {
+ //鏍规嵁userId鏌ヨ鍒癷nfouser鐨剈aid
+ ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
+// System.out.println("sdfsdf999000550");
+
+ //鎷垮埌鎵�鏈夌殑sysid
+ List<Long> fms = zInfoUserService.findByUaidToFaid(zInfoUser.getUaid()).stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
+ System.out.println(fms.size());
+
+ for(Long id:fms)
+ {
+ LambdaQueryWrapper<ZHealthInfo> lqw1 = new LambdaQueryWrapper<>();
+
+ if(!id.equals(userId))
+ {
+ lqw1.eq(ZHealthInfo::getUid, id);
+ zHealthInfo = getOne(lqw1);
+ break;
+ }
+ }
+
+ }
//濡傛灉鏄涓�娆¤繘鏉ワ紝涔嬪墠娌℃湁杩欎釜鐢ㄦ埛鐨勬暟鎹紝鎶涘紓甯歌鐢ㄦ埛鍏堟彃鍏ユ暟鎹�
if(zHealthInfo == null){
throw new RuntimeException("绗竴娆¤繘鏉�,璇峰厛濉啓濂芥暟鎹�");
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNoteServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNoteServiceImpl.java
index faebe6f..01bd032 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNoteServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNoteServiceImpl.java
@@ -39,20 +39,25 @@
{
//鏍规嵁userId鏌ヨ鍒癷nfouser鐨剈aid
ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
- System.out.println("sdfsdf999000550");
+// System.out.println("sdfsdf999000550");
//鎷垮埌鎵�鏈夌殑sysid
List<Long> fms = zInfoUserService.findByUaidToFaid(zInfoUser.getUaid()).stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
+ System.out.println(fms.size());
+
for(Long id:fms)
{
+ LambdaQueryWrapper<ZHealthNote> lqw1 = new LambdaQueryWrapper<>();
+
if(!id.equals(userId))
{
- lqw.eq(ZHealthNote::getUid, id);
- result = getOne(lqw);
+ lqw1.eq(ZHealthNote::getUid, id);
+ result = getOne(lqw1);
break;
}
}
- System.out.println("sdfsdf9990000");
+// System.out.println(result);
+// System.out.println("sdfsdf9990000");
}
if(result == null){
throw new RuntimeException("璇峰厛濉啓濂界敓娲讳範鎯暟鎹紒");
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 5c5f5d1..b7a416f 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
@@ -7,16 +7,22 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.domain.ZHealthNote;
import com.ruoyi.domain.ZHealthNow;
import com.ruoyi.domain.ZHealthNow;
+import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.dto.ZHealthNowDto;
import com.ruoyi.domain.dto.ZHealthNowDto;
import com.ruoyi.domain.health.*;
import com.ruoyi.mapper.ZHealthNowMapper;
import com.ruoyi.service.ZHealthNowService;
+import com.ruoyi.service.ZInfoUserService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.sql.rowset.BaseRowSet;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* @Author Jinquan_Ou
@@ -26,6 +32,9 @@
**/
@Service
public class ZHealthNowServiceImpl extends ServiceImpl<ZHealthNowMapper, ZHealthNow> implements ZHealthNowService {
+
+ @Autowired
+ ZInfoUserService zInfoUserService;
@Override
public AjaxResult selectData() {
SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -35,6 +44,32 @@
lqw.eq(ZHealthNow::getUid,userId);
ZHealthNow zHealthNow = getOne(lqw);
+ if(zHealthNow==null)
+ {
+ //鏍规嵁userId鏌ヨ鍒癷nfouser鐨剈aid
+ ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
+// System.out.println("sdfsdf999000550");
+
+ //鎷垮埌鎵�鏈夌殑sysid
+ List<Long> fms = zInfoUserService.findByUaidToFaid(zInfoUser.getUaid()).stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
+ System.out.println(fms.size());
+
+ for(Long id:fms)
+ {
+ LambdaQueryWrapper<ZHealthNow> lqw1 = new LambdaQueryWrapper<>();
+
+ if(!id.equals(userId))
+ {
+ lqw1.eq(ZHealthNow::getUid, id);
+ zHealthNow = getOne(lqw1);
+ break;
+ }
+ }
+ System.out.println(zHealthNow);
+ System.out.println("sdfsdf9990000");
+ System.out.println("sdfsdf9990000");
+ System.out.println("sdfsdf9990000");
+ }
//濡傛灉鏄涓�娆¤繘鏉ワ紝涔嬪墠娌℃湁杩欎釜鐢ㄦ埛鐨勬暟鎹紝鎶涘紓甯歌鐢ㄦ埛鍏堟彃鍏ユ暟鎹�
if(zHealthNow == null){
throw new RuntimeException("绗竴娆¤繘鏉�,璇峰厛濉啓濂芥暟鎹�");
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java
index fadc2f0..978c608 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java
@@ -72,6 +72,21 @@
return lqw;
}
+
+ private LambdaQueryWrapper<ZSelfNote> buildConditionSec(ZSelfNote zSelfNote,List<Long> userIds) {
+ LambdaQueryWrapper<ZSelfNote> lqw = new LambdaQueryWrapper<>();
+ // lqw.in(ZSelfNote::getUid, getAll())
+
+ lqw.in(ZSelfNote::getUid, userIds)
+ .like(StringUtils.isNotEmpty(zSelfNote.getPeople()), ZSelfNote::getPeople, zSelfNote.getPeople())
+ .like(StringUtils.isNotEmpty(zSelfNote.getTitle()), ZSelfNote::getTitle, zSelfNote.getTitle())
+ .like(StringUtils.isNotEmpty(zSelfNote.getAddress()),ZSelfNote::getAddress,zSelfNote.getAddress())
+ .like(StringUtils.isNotEmpty(zSelfNote.getRemark()),ZSelfNote::getRemark,zSelfNote.getRemark())
+ .between(zSelfNote.getHappenStartTime() != null && zSelfNote.getHappenEndTime() != null, ZSelfNote::getHappenTime, zSelfNote.getHappenStartTime(), zSelfNote.getHappenEndTime())
+ .orderByDesc(ZSelfNote::getCreateTime);
+ return lqw;
+ }
+
// public List<ZfShareData> getAllByShareId(ZfShareData zfShareData1){
// SysUser user = SecurityUtils.getLoginUser().getUser();
// Long userId = user.getUserId();
@@ -112,7 +127,7 @@
*/
@Override
public AjaxResult selectDataList(ZSelfNote zSelfNote, Integer pageNum, Integer pageSize) {
- LambdaQueryWrapper<ZSelfNote> lqw = buildCondition(zSelfNote);
+
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
@@ -129,7 +144,16 @@
return AjaxResult.success("璇峰墠寰�瀹舵棌鍚嶇О涓�"+byId.getClanName()+",鐢ㄦ埛鍚嶄负"+infoBysysId.getNickName()+"鐨勭敤鎴疯处鍙蜂笅鏌ョ湅");
}
}
-
+ // LambdaQueryWrapper<ZSelfNote> lqw = buildCondition(zSelfNote);
+ //鏍规嵁userId鏌ヨ鍒癷nfouser鐨剈aid
+ ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
+ //鎷垮埌鎵�鏈夌殑sysid
+ List<Long> fms = zInfoUserService.findByUaidToFaid(zInfoUser.getUaid()).stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
+ LambdaQueryWrapper<ZSelfNote> lqw;
+ if(!fms.isEmpty())
+ lqw = buildConditionSec(zSelfNote, fms);
+ else
+ lqw = buildCondition(zSelfNote);
Page<ZSelfNote> pageBean = new Page<>(pageNum, pageSize);
Page<ZSelfNote> pageResult = page(pageBean, lqw);
--
Gitblit v1.9.1