From 2723e04976f006ace42c6c53627b87e1cc95ff07 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 31 七月 2024 12:27:48 +0800
Subject: [PATCH] 修改bug&分享
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java | 69 ++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 29 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..ab4f6e0 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,23 @@
@Resource
private ZfClanService zfClanService;
+ @Resource
+ private ZfAncestorService zfAncestorService;
+
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());
+ lqw.like(StringUtils.isNotEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName());
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());
return lqw;
}
+
/**
*
@@ -75,9 +65,11 @@
*/
public Long getUserId(){
ZInfoUser myself = zInfoUserService.getMyself();
+
return myself.getUserId();
}
+
@Override
public AjaxResult selectDataList(ZfClan zfClan, Integer pageNum, Integer pageSize) {
@@ -86,22 +78,39 @@
Page<ZfClan> zfClanPage = new Page<>(pageNum, pageSize);
Page<ZfClan> pageResult = page(zfClanPage, lqw);
+
List<ZfClan> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
// System.out.println(beanRecords);
- HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
- return AjaxResult.success(data);
-}
+
+ HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+ return AjaxResult.success(data); }
+
+ @Override
+ public AjaxResult selectDataList(ZfClan zfClan){
+ LambdaQueryWrapper<ZfClan> lqw = buildCondition(zfClan);
+ List<ZfClan> zfClans = list(lqw);
+ List<ZfClan> satisfyList = new ArrayList<>();
+ for (ZfClan zfClan1: zfClans) {
+ if (zfAncestorService.count(zfClan1.getClanId())){
+ satisfyList.add(zfClan1);}
+ }
+ return AjaxResult.success(satisfyList);
+ }
@Override
public AjaxResult addData(ZfClan zfClan) {
LambdaQueryWrapper<ZfClan> lqw = uniqueCondition(zfClan);
List<ZfClan> list = list(lqw);
+
if(list.size()>0){
throw new RuntimeException("璇峰嬁鏂板閲嶅瀹舵棌");
}
+
+
+
if (save(zfClan)) {
EsModel esModel = new EsModel();
@@ -117,6 +126,7 @@
esSer.insertTable(esModel);
// System.out.println(esModel);
+
return AjaxResult.success();
} else {
return AjaxResult.error();
@@ -128,8 +138,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 +187,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("鎮ㄤ笉鏄鐞嗗憳,娌℃湁鏉冨姏鍒犻櫎璇ュ鏃�");
- }
- }
+
+ zfAncestorService.deleteMember(ids);
if (zfClanService.removeByIds(Arrays.asList(ids))) {
//鍒犻櫎es涓殑鏁版嵁
@@ -197,6 +206,8 @@
}
});
+
+
return AjaxResult.success();
} else {
return AjaxResult.error();
--
Gitblit v1.9.1