From 3eb37463a952fb69d586769ca660886b956cb016 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 30 十二月 2025 12:24:40 +0800
Subject: [PATCH] 人物搜索 新加所有家族模块
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/EsSearchController.java | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/EsSearchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/EsSearchController.java
index 31efa74..2db0308 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/EsSearchController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/EsSearchController.java
@@ -2,6 +2,9 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.EsModel;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.domain.PeopleSea;
import com.ruoyi.service.EsService;
import com.ruoyi.service.ZfEconomyService;
import com.ruoyi.service.impl.InterfaceBasedSearchRouter;
@@ -15,6 +18,9 @@
import javax.websocket.server.PathParam;
import java.util.Date;
import java.util.List;
+
+import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
+import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
/**
* @Author Jinquan_Ou
@@ -54,19 +60,22 @@
}
@GetMapping("/companion/{moduleCode}")
- public AjaxResult getAllbyCAY( @PathVariable("moduleCode") String moduleCode,@RequestParam(value = "companion", required = false) String companion,
- @RequestParam(value = "happenStartTime", required = false)
+ public AjaxResult getAllbyCAY(@PathVariable("moduleCode") String moduleCode, @RequestParam(value = "companion", required = false) String companion,
+ @RequestParam(value = "happenStartTime", required = false)
@DateTimeFormat(pattern = "yyyy-MM-dd") Date happenStartTime,
- @RequestParam(value = "happenEndTime", required = false)
- @DateTimeFormat(pattern = "yyyy-MM-dd") Date happenEndTime){
+ @RequestParam(value = "happenEndTime", required = false)
+ @DateTimeFormat(pattern = "yyyy-MM-dd") Date happenEndTime, PeopleSea peopleSea){
System.out.println("[[[[[["+moduleCode);
System.out.println("[[[[[["+companion);
System.out.println("[[[[[["+happenStartTime);
System.out.println("[[[[[["+happenEndTime);
+
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
zfEconomyService.clearAllCache();
- return interfaceBasedSearchRouter.routeSearch(moduleCode,companion,happenStartTime,happenEndTime);
+ return interfaceBasedSearchRouter.routeSearch(peopleSea,pageNum,pageSize);
}
/**
* 鏂板鍏ㄦā鍧楁悳绱㈡帴鍙ｏ紙涓嶆寚瀹歮oduleCode锛�
@@ -76,14 +85,31 @@
@RequestParam(value = "happenStartTime", required = false)
@DateTimeFormat(pattern = "yyyy-MM-dd") Date happenStartTime,
@RequestParam(value = "happenEndTime", required = false)
- @DateTimeFormat(pattern = "yyyy-MM-dd") Date happenEndTime) {
+ @DateTimeFormat(pattern = "yyyy-MM-dd") Date happenEndTime, PeopleSea peopleSea) {
System.out.println("鍏ㄦā鍧楁悳绱� - 鍚屼即: " + companion);
System.out.println("鍏ㄦā鍧楁悳绱� - 寮�濮嬫椂闂�: " + happenStartTime);
System.out.println("鍏ㄦā鍧楁悳绱� - 缁撴潫鏃堕棿: " + happenEndTime);
zfEconomyService.clearAllCache();
// 浣跨敤null鎴栫┖瀛楃涓茶〃绀哄叏妯″潡鎼滅储
- return interfaceBasedSearchRouter.routeSearch(null, companion, happenStartTime, happenEndTime);
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return interfaceBasedSearchRouter.routeSearch(peopleSea,pageNum,pageSize);
+ }
+
+ /**
+ * 閫氱敤鎼滅储鎺ュ彛
+ * 鏀寔鍗曚釜銆佸涓�佸叏妯″潡鎼滅储
+ */
+ @PostMapping("/universal")
+ public AjaxResult universalSearch(@RequestBody PeopleSea peopleSea) {
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+
+ System.out.println("鍏ㄦā鍧楁悳绱� - 鍚屼即: " + peopleSea.getPeoples());
+ System.out.println("鍏ㄦā鍧楁悳绱� - 寮�濮嬫椂闂�: " + peopleSea.getStartTime());
+ System.out.println("鍏ㄦā鍧楁悳绱� - 缁撴潫鏃堕棿: " + peopleSea.getEndTime());
+ return interfaceBasedSearchRouter.routeSearch(peopleSea,pageNum,pageSize);
}
}
--
Gitblit v1.9.1