From 5418ea7855d16dcc0169d5ed554f7a23c4b55532 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 02 十二月 2025 10:37:12 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/EsSearchController.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 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 b3475fe..3198f1a 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
@@ -3,11 +3,15 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.EsModel;
import com.ruoyi.service.EsService;
-import org.springframework.data.elasticsearch.core.SearchHits;
+import com.ruoyi.service.ZfEconomyService;
+import com.ruoyi.service.impl.InterfaceBasedSearchRouter;
+import com.ruoyi.service.impl.ZfEconomyServiceImpl;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.websocket.server.PathParam;
+import java.util.Date;
import java.util.List;
/**
@@ -22,6 +26,12 @@
@Resource
EsService esService;
+
+ @Resource
+ InterfaceBasedSearchRouter interfaceBasedSearchRouter;
+
+ @Resource
+ ZfEconomyServiceImpl zfEconomyService;
@GetMapping()
public AjaxResult search(@PathParam("keyword") String keyword){
@@ -40,4 +50,22 @@
List<EsModel> modelList = esService.getAll();
return AjaxResult.success(modelList);
}
+
+ @GetMapping("/companion/{moduleCode}")
+ 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){
+ System.out.println("[[[[[["+moduleCode);
+ System.out.println("[[[[[["+companion);
+
+
+ System.out.println("[[[[[["+happenStartTime);
+ System.out.println("[[[[[["+happenEndTime);
+
+ return interfaceBasedSearchRouter.routeSearch(moduleCode,companion,happenStartTime,happenEndTime);
+ }
+
+
}
--
Gitblit v1.9.1