From 86d65e6f837ff14b090ffc3312c013987b6f67d8 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 14 十月 2025 21:59:13 +0800
Subject: [PATCH] 荣誉 新增两个字段的查询
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java | 183 +++++++++++++++++++++++++++++----------------
1 files changed, 119 insertions(+), 64 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..1efa98a 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;
@@ -24,11 +19,9 @@
import javax.annotation.Resource;
import java.io.IOException;
+import java.sql.SQLIntegrityConstraintViolationException;
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 +41,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 +66,11 @@
*/
public Long getUserId(){
ZInfoUser myself = zInfoUserService.getMyself();
+
return myself.getUserId();
}
+
@Override
public AjaxResult selectDataList(ZfClan zfClan, Integer pageNum, Integer pageSize) {
@@ -86,13 +79,49 @@
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);
+ return AjaxResult.success(data); }
-}
+ @Override
+ public AjaxResult selectData() {
+ List<ZfClan> lis = this.list();
+ return AjaxResult.success(lis);
+ }
+
+ @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 List<ZfClan> selectByCondition(ZfClan zfClan) {
+
+ System.out.println("8008888//"+zfClan.getClanId());
+ LambdaQueryWrapper<ZfClan> lambdaQueryWrapper = buildCondition(zfClan);
+ lambdaQueryWrapper.eq(zfClan.getClanId()!=null,ZfClan::getClanId,zfClan.getClanId());
+
+ return list(lambdaQueryWrapper);
+ }
+
+ @Override
+ public List<ZfClan> selectByIds(Long[] ids) {
+ List<ZfClan> list = new ArrayList<>();
+ if(ids.length!=0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
@Override
public AjaxResult addData(ZfClan zfClan) {
@@ -102,6 +131,9 @@
if(list.size()>0){
throw new RuntimeException("璇峰嬁鏂板閲嶅瀹舵棌");
}
+
+
+
if (save(zfClan)) {
EsModel esModel = new EsModel();
@@ -117,6 +149,7 @@
esSer.insertTable(esModel);
// System.out.println(esModel);
+
return AjaxResult.success();
} else {
return AjaxResult.error();
@@ -128,60 +161,80 @@
@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("瀹舵棌");
- zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+// zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
zfLogService.save(zfLog);
+
+ LambdaQueryWrapper<ZfClan> lqw = new LambdaQueryWrapper<>();
+ lqw.orderByDesc(ZfClan::getClanId);
+ lqw.eq(StringUtils.isNotEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName());
+ List<ZfClan> lis = this.list(lqw);
// System.out.println("===================================="+meeting);
- if(updateById(zfClan)){
- //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
- ZfClan dataById = getById(zfClan.getClanId());
+ if(lis.size()>0)
+ {
+ return AjaxResult.success("瀹舵棌鍚嶇О涓嶈兘閲嶅锛�");
- //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
- EsModel esResult = esSer.findByCtId(dataById.getClanId(), "瀹舵棌");
-// System.out.println("===================================="+meeting);
- if (esResult == null){
- return AjaxResult.success();
- }
-
- //鎿嶄綔es淇敼鏁版嵁
- EsModel newModel = new EsModel();
- if(zfClan.getClanName()!=null){
- newModel.setBy1(zfClan.getClanName());
- }else {
- newModel.setBy1(dataById.getClanName());
- }
-//
-
- UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
- updateRequest.doc(
- "by1",newModel.getBy1()
-
- );
-
- try {
- restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
-
- return AjaxResult.success();
- }else {
- return AjaxResult.error();
}
+ else
+ {
+ boolean res = updateById(zfClan);
+ return AjaxResult.success();
+ }
+
+ // if(res){
+
+ // }else {
+ // return AjaxResult.success("瀹舵棌鍚嶇О涓嶈兘閲嶅锛�");
+ // }
+
+
+
+ // return AjaxResult.success("瀹舵棌鍚嶇О涓嶈兘閲嶅锛�");
+// //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
+// ZfClan dataById = getById(zfClan.getClanId());
+//
+// //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
+// EsModel esResult = esSer.findByCtId(dataById.getClanId(), "瀹舵棌");
+//// System.out.println("===================================="+meeting);
+// if (esResult == null){
+// return AjaxResult.success();
+// }
+//
+// //鎿嶄綔es淇敼鏁版嵁
+// EsModel newModel = new EsModel();
+// if(zfClan.getClanName()!=null){
+// newModel.setBy1(zfClan.getClanName());
+// }else {
+// newModel.setBy1(dataById.getClanName());
+// }
+////
+//
+// UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
+// updateRequest.doc(
+// "by1",newModel.getBy1()
+//
+// );
+
+// try {
+// restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
+// } catch (IOException e) {
+// throw new RuntimeException(e);
+// }
+
+
}
@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 +250,8 @@
}
});
+
+
return AjaxResult.success();
} else {
return AjaxResult.error();
--
Gitblit v1.9.1