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/ZfFamilyServiceImpl.java | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 172 insertions(+), 1 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java
index 48cb8b8..8f28484 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java
@@ -1,14 +1,32 @@
package com.ruoyi.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.MapUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfFamily;
+import com.ruoyi.domain.ZfProperty;
+import com.ruoyi.domain.dto.UserInfoDto;
import com.ruoyi.mapper.ZfEventMapper;
import com.ruoyi.mapper.ZfFamilyMapper;
+import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfEventService;
import com.ruoyi.service.ZfFamilyService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* @Author Jinquan_Ou
@@ -18,10 +36,163 @@
**/
@Service
public class ZfFamilyServiceImpl extends ServiceImpl<ZfFamilyMapper, ZfFamily> implements ZfFamilyService {
+ @Autowired
+ ZInfoUserService zInfoUserService;
+
+ @Resource
+ ZfFamilyMapper zfFamilyMapper;
+ @Resource
+ ZfFamilyService zfFamilyService;
+
@Override
- public ZfFamily getByName(String familyName) {
+ public AjaxResult selectDataList(ZfFamily zfFamily, Integer pageNum, Integer pageSize) {
+
+
+ LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
+
+ lqw.eq(zfFamily.getClanId()!=null,ZfFamily::getClanId,zfFamily.getClanId());
+ lqw.like(zfFamily.getName()!=null,ZfFamily::getName,zfFamily.getName());
+ Page<ZfFamily> zfPropertyPage = new Page<>(pageNum, pageSize);
+ Page<ZfFamily> pageResult = page(zfPropertyPage, lqw);
+
+ List<ZfFamily> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+ HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+
+ return AjaxResult.success(data);
+ }
+
+ @Override
+ public ZfFamily getByNameAndUser(ZfFamily zfFamily) {
+ LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZfFamily::getName,zfFamily.getName()).or().eq(ZfFamily::getFid, zfFamily.getFid());
+ return getOne(lqw);
+ }
+
+ @Override
+ public ZfFamily getByName(String familyName, Integer clanId) {
LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZfFamily::getName,familyName);
+ lqw.eq(ZfFamily::getClanId, clanId);
return getOne(lqw);
}
+
+ @Override
+ public ZfFamily getByFid(Long fid) {
+ LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZfFamily::getFid,fid);
+ return getOne(lqw); }
+
+ @Override
+ public ZfFamily getByFamId(Long fid) {
+ LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZfFamily::getId,fid);
+ return getOne(lqw);
+ }
+ @Override
+ public List<ZfFamily> getByClanId(Long clanId){
+ LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZfFamily::getClanId,clanId);
+ return list(lqw);
+ }
+
+ @Override
+ public List<UserInfoDto> getByFamilyId(Long fid) {
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZInfoUser::getFamilyId,fid);
+ List<ZInfoUser> list = zInfoUserService.list(lqw);
+ return list.stream().map(
+ zInfoUser -> {
+ UserInfoDto userInfoDto = new UserInfoDto();
+ userInfoDto.setId(zInfoUser.getUserId());
+ userInfoDto.setFamilyId(zInfoUser.getFamilyId());
+ userInfoDto.setName(zInfoUser.getNickName());
+ userInfoDto.setFamilyName(getById(zInfoUser.getFamilyId()).getName());
+ return userInfoDto;
+ }
+ ).collect(Collectors.toList());
+
+ }
+
+ @Override
+ public List<UserInfoDto> getNowMember() {
+
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ ZInfoUser myself = zInfoUserService.getById(userId);
+ return getByFamilyId(myself.getFamilyId());
+ }
+
+ @Override
+ public AjaxResult addMember(UserInfoDto userInfoDto) {
+
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ ZInfoUser myself = zInfoUserService.getById(userId);
+
+ //鏌ョ湅褰撳墠鐢ㄦ埛鏄笉鏄鐞嗗憳
+ if(myself.getRoleId()!=1 && myself.getRoleId()!=2){
+ throw new RuntimeException("浣犱笉鏄搴鐞嗗憳锛屾病鏈夋潈闄愭搷浣�");
+ }
+
+ Long uid = userInfoDto.getId();
+// Long targetFamilyId = zInfoUserService.getById(uid).getFamilyId();
+ UpdateWrapper<ZInfoUser> luw = new UpdateWrapper<>();
+ luw.eq("user_id",uid);
+ //update from z_info_user set family_id = #{targetFamilyId where user_id = #{uid}
+ luw.setSql("family_id = "+myself.getFamilyId());
+
+ zInfoUserService.update(luw);
+ return AjaxResult.success();
+
+ }
+
+ @Override
+ public AjaxResult removeMember(UserInfoDto userInfoDto) {
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ ZInfoUser myself = zInfoUserService.getById(userId);
+
+ //鏌ョ湅褰撳墠鐢ㄦ埛鏄笉鏄鐞嗗憳
+ if(myself.getRoleId()!=1 && myself.getRoleId()!=2){
+ throw new RuntimeException("浣犱笉鏄搴鐞嗗憳锛屾病鏈夋潈闄愭搷浣�");
+ }
+
+ Long uid = userInfoDto.getId();
+// Long targetFamilyId = zInfoUserService.getById(uid).getFamilyId();
+ UpdateWrapper<ZInfoUser> luw = new UpdateWrapper<>();
+ luw.eq("user_id",uid);
+ //update from z_info_user set family_id = #{targetFamilyId where user_id = #{uid}
+ luw.setSql("family_id = "+null);
+
+ zInfoUserService.update(luw);
+ return AjaxResult.success();
+
+ }
+
+ @Override
+ public AjaxResult addFamily(ZfFamily zfFamily) {
+ int res = zfFamilyMapper.insert(zfFamily);
+ return AjaxResult.success();
+ }
+
+ @Override
+ public AjaxResult updateFam(ZfFamily zfFamily) {
+ int res = zfFamilyMapper.updateById(zfFamily);
+
+ if(res!=0) {
+ return AjaxResult.success();
+ }else
+ return AjaxResult.error("淇敼澶辫触,瀹跺涵鍙蜂笉鑳介噸澶�");
+ }
+
+ @Override
+ public AjaxResult deleteFam(Long[] ids) {
+ if (zfFamilyService.removeByIds(Arrays.asList(ids))) {
+ return AjaxResult.success();
+ }
+ else
+ return AjaxResult.error();
+
+
+ }
}
--
Gitblit v1.9.1