From cedaeeed6d401aefebf93ea6ea21cc9e06d5f5db Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 02 十二月 2025 10:36:48 +0800
Subject: [PATCH] 新增搜索 模块+同伴+时间
---
zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java | 78 +++++++++++++++++++++++++++++++++------
1 files changed, 66 insertions(+), 12 deletions(-)
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 c3e7f70..6a3816b 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
@@ -8,15 +8,20 @@
import com.ruoyi.common.utils.bean.BeanUtils;
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;
import com.ruoyi.service.MarrySelfService;
import com.ruoyi.service.MarryUserService;
+import com.ruoyi.service.ZInfoUserService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -31,8 +36,44 @@
@Resource
MarryUserService marryUserService;
+ @Resource
+ ZInfoUserService zInfoUserService;
+
// @Resource
// MarrySelfService marrySelfService;
+
+ @Override
+ public void setMarryInfoSame(ZInfoUser zInfoUser,Long id){
+
+ List<ZInfoUser> byUaidToFaid = zInfoUserService.findByUaidToFaid(zInfoUser.getUaid());
+
+ List<Long> resultIds = byUaidToFaid.stream()
+ .map(ZInfoUser::getSysId)
+ .filter(sysId -> !Objects.equals(sysId, zInfoUser.getSysId()))
+ .collect(Collectors.toList());
+ if (resultIds.size() != 0){
+
+ LambdaQueryWrapper<MarrySelf> marrySelfLQW = new LambdaQueryWrapper<>();
+ marrySelfLQW.eq(MarrySelf::getUid,resultIds.get(0));
+ MarrySelf myself = getOne(marrySelfLQW);
+
+
+ MarrySelf newUser = new MarrySelf();
+ // 鎷疯礉鎵�鏈夊睘鎬�
+ org.springframework.beans.BeanUtils.copyProperties(myself, newUser);
+
+ newUser.setUid(zInfoUser.getSysId());
+ newUser.setId(id);
+
+
+ System.out.println("ddddd"+newUser);
+
+
+ this.updateById(newUser);
+ }
+
+ }
+
@Override
public AjaxResult getInfo() {
@@ -46,23 +87,31 @@
MarrySelf myself = getOne(marrySelfLQW);
if(myself == null){
- MarrySelf marryInfoDto=new MarrySelf();
- marryInfoDto.setUid(userId);
- save(marryInfoDto);
throw new RuntimeException("璇峰厛缂栬緫淇℃伅");
}
//鍐嶆煡璇㈠墠浠荤殑淇℃伅
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());
+
+ fms.add(zInfoUser.getSysId());
+
+ 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);
@@ -72,30 +121,35 @@
}
@Override
- public AjaxResult updateData(MarryInfoDto marryInfoDto) {
+ public Boolean updateData(MarryInfoDto marryInfoDto) {
- SysUser user = SecurityUtils.getLoginUser().getUser();
- Long userId = user.getUserId();
+// SysUser user = SecurityUtils.getLoginUser().getUser();
+// Long userId = user.getUserId();
MarrySelf marrySelf = new MarrySelf();
BeanUtils.copyProperties(marryInfoDto,marrySelf);
- marrySelf.setUid(userId);
+ marrySelf.setUid(marryInfoDto.getUid());
//鍏堟煡璇㈡暟鎹簱涓湁娌℃湁鏈敤鎴风殑鏁版嵁
LambdaQueryWrapper<MarrySelf> lqw = new LambdaQueryWrapper<>();
- lqw.eq(MarrySelf::getUid,userId);
+ lqw.eq(MarrySelf::getUid,marryInfoDto.getUid());
List<MarrySelf> list = list(lqw);
+
if(list.isEmpty()){
//濡傛灉鏄┖鐨勶紝閭ｅ氨鏄柊澧�
save(marrySelf);
}else {
+
//鍚﹀垯灏辨槸淇敼
marrySelf.setId(list.get(0).getId());
updateById(marrySelf);
}
- return AjaxResult.success();
+
+
+
+ return true;
}
}
--
Gitblit v1.9.1