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/ZfClanServiceImpl.java | 107 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 70 insertions(+), 37 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 b34ee23..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
@@ -19,6 +19,7 @@
import javax.annotation.Resource;
import java.io.IOException;
+import java.sql.SQLIntegrityConstraintViolationException;
import java.time.LocalDateTime;
import java.util.*;
@@ -105,10 +106,21 @@
@Override
public List<ZfClan> selectByCondition(ZfClan zfClan) {
-
+ System.out.println("8008888//"+zfClan.getClanId());
LambdaQueryWrapper<ZfClan> lambdaQueryWrapper = buildCondition(zfClan);
- List<ZfClan> beanRecords = list(lambdaQueryWrapper);
- return beanRecords;
+ 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
@@ -158,43 +170,64 @@
zfLog.setModule("瀹舵棌");
// 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
--
Gitblit v1.9.1