From c8a96c5e4ce5d5013a5ec508e2422f40ecdc311e Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期四, 25 七月 2024 19:10:59 +0800
Subject: [PATCH] 家族

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java |   81 +++++++++++++++++++++++++---------------
 1 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
index 8c5a3d5..194fad3 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
@@ -8,14 +8,9 @@
 import com.ruoyi.common.core.domain.entity.EsModel;
 import com.ruoyi.common.utils.MapUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.domain.ZInfoUser;
-import com.ruoyi.domain.ZfClan;
-import com.ruoyi.domain.ZfLog;
+import com.ruoyi.domain.*;
 import com.ruoyi.mapper.ZfClanMapper;
-import com.ruoyi.service.EsService;
-import com.ruoyi.service.ZInfoUserService;
-import com.ruoyi.service.ZfClanService;
-import com.ruoyi.service.ZfLogService;
+import com.ruoyi.service.*;
 import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.client.RequestOptions;
@@ -25,10 +20,7 @@
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 @Service
 public class ZfClanServiceImpl extends ServiceImpl<ZfClanMapper,ZfClan> implements ZfClanService {
@@ -48,25 +40,29 @@
     @Resource
     private ZfClanService zfClanService;
 
+    @Resource
+    private ZfClanManageService zfClanManageService;
+
 
     private LambdaQueryWrapper<ZfClan> buildCondition(ZfClan zfClan) {
         LambdaQueryWrapper<ZfClan> lqw = new LambdaQueryWrapper<>();
         lqw.orderByDesc(ZfClan::getClanId);
         lqw.like(StringUtils.isNotEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName())
-            .like(zfClan.getAdminId() !=0, ZfClan::getAdminId, zfClan.getAdminId())
-            .like(zfClan.getDadId() !=0 , ZfClan::getDadId, zfClan.getDadId())
-            .like(zfClan.getMomId() !=0, ZfClan::getMomId, zfClan.getMomId());
+                .like(zfClan.getAdminId() != null, ZfClan::getAdminId, zfClan.getAdminId())
+                .like(zfClan.getMomId() != null, ZfClan::getDadId, zfClan.getDadId())
+                .like(zfClan.getDadId() != null, ZfClan::getMomId, zfClan.getMomId());
         return lqw;
     }
 
     private LambdaQueryWrapper<ZfClan> uniqueCondition(ZfClan zfClan){
         LambdaQueryWrapper<ZfClan> lqw = new LambdaQueryWrapper<>();
         lqw.eq(!StringUtils.isEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName());
-        lqw.eq(zfClan.getAdminId() !=0, ZfClan::getAdminId, zfClan.getAdminId());
-        lqw.eq(zfClan.getDadId() !=0 , ZfClan::getDadId, zfClan.getDadId());
-        lqw.eq(zfClan.getMomId() !=0, ZfClan::getMomId, zfClan.getMomId());
+        lqw.eq(zfClan.getAdminId() !=null, ZfClan::getAdminId, zfClan.getAdminId());
+        lqw.eq(zfClan.getDadId() !=null , ZfClan::getDadId, zfClan.getDadId());
+        lqw.eq(zfClan.getMomId() !=null, ZfClan::getMomId, zfClan.getMomId());
         return lqw;
     }
+
 
     /**
      *
@@ -75,22 +71,37 @@
      */
     public Long getUserId(){
         ZInfoUser myself = zInfoUserService.getMyself();
+
         return myself.getUserId();
 
     }
 
+
     @Override
     public AjaxResult selectDataList(ZfClan zfClan, Integer pageNum, Integer pageSize) {
         LambdaQueryWrapper<ZfClan> lqw = buildCondition(zfClan);
+        List<ZfClan> beanRecords = list(lqw);
 
+        List<ZfClanDate> zfClanDates=new ArrayList<>();
 
-        Page<ZfClan> zfClanPage = new Page<>(pageNum, pageSize);
-        Page<ZfClan> pageResult = page(zfClanPage, lqw);
-        List<ZfClan> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
-//        System.out.println(beanRecords);
+        System.out.println(beanRecords);
+        for (ZfClan zfClan1: beanRecords) {
+            ZfClanDate zfClanDate = new ZfClanDate();
+            HashMap<Integer,String> adminName = new HashMap<>();
+            adminName.put(zfClan1.getAdminId(),zInfoUserService.getById(zfClan1.getAdminId()).getNickName());
+            zfClanDate.setAdminName(adminName);
+            HashMap<Integer,String> momName = new HashMap<>();
+            momName.put(zfClan1.getMomId(),zInfoUserService.getById(zfClan1.getMomId()).getNickName());
+            zfClanDate.setMomName(momName);
+            HashMap<Integer,String> dadName = new HashMap<>();
+            dadName.put(zfClan1.getDadId(),zInfoUserService.getById(zfClan1.getDadId()).getNickName());
+            zfClanDate.setDadName(dadName);
+            zfClanDate.setClanId(zfClan1.getClanId());
+            zfClanDate.setClanName(zfClan1.getClanName());
+            zfClanDates.add(zfClanDate);
+        }
 
-        HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
-        return AjaxResult.success(data);
+        return AjaxResult.success(zfClanDates);
 
 }
 
@@ -99,9 +110,13 @@
         LambdaQueryWrapper<ZfClan> lqw = uniqueCondition(zfClan);
         List<ZfClan> list = list(lqw);
 
+
         if(list.size()>0){
             throw new RuntimeException("璇峰嬁鏂板閲嶅瀹舵棌");
         }
+
+
+
 
         if (save(zfClan)) {
             EsModel esModel = new EsModel();
@@ -116,6 +131,10 @@
 //            esModel.setFid(familyId);
             esSer.insertTable(esModel);
 //            System.out.println(esModel);
+            zfClanManageService.addA(zfClan.getClanId(),zfClan.getDadId(),2);
+            zfClanManageService.addA(zfClan.getClanId(),zfClan.getMomId(),2);
+//            if (!zfClan.getDadId().equals(zfClan.getAdminId()) && !zfClan.getMomId().equals(zfClan.getAdminId()) )
+            zfClanManageService.addA(zfClan.getClanId(),zfClan.getAdminId(),1);
 
             return AjaxResult.success();
         } else {
@@ -128,8 +147,10 @@
     @Override
     public AjaxResult updateData(ZfClan zfClan) {
 
-        List<ZfClan> lqw = list(buildCondition(zfClan));
-
+//        if (!Long.valueOf(zfClanService.getById(zfClan.getClanId()).getAdminId()).equals(getUserId())) {
+//                throw new RuntimeException("鎮ㄤ笉鏄鐞嗗憳,娌℃湁鏉冨姏淇敼璇ュ鏃忎俊鎭�");
+//
+//        }
         ZfLog zfLog = new ZfLog();
         zfLog.setUpdateTime(LocalDateTime.now());
         zfLog.setModule("瀹舵棌");
@@ -175,13 +196,10 @@
     }
 
     @Override
-    public AjaxResult deleteData(Long[] ids) {
+    public AjaxResult deleteData(Long ids) {
         List<ZfClan> zfClans = listByIds(Arrays.asList(ids));
-        for (ZfClan zfClan : zfClans) {
-            if (!zfClan.getAdminId().equals(getUserId())) {
-                throw new RuntimeException("鎮ㄤ笉鏄鐞嗗憳,娌℃湁鏉冨姏鍒犻櫎璇ュ鏃�");
-            }
-        }
+
+        zfClanManageService.deleteMember(ids);
         if (zfClanService.removeByIds(Arrays.asList(ids))) {
 
             //鍒犻櫎es涓殑鏁版嵁
@@ -197,6 +215,7 @@
                 }
             });
 
+
             return AjaxResult.success();
         } else {
             return AjaxResult.error();

--
Gitblit v1.9.1