|
@@ -1,6 +1,11 @@
|
|
|
package com.ruoyi.project.VRdemo.controller;
|
|
|
|
|
|
+import com.alibaba.fastjson2.JSONObject;
|
|
|
+import com.github.pagehelper.PageInfo;
|
|
|
import com.ruoyi.framework.aspectj.lang.annotation.Anonymous;
|
|
|
+import com.ruoyi.framework.web.controller.BaseController;
|
|
|
+import com.ruoyi.framework.web.domain.AjaxResult;
|
|
|
+import com.ruoyi.framework.web.page.TableDataInfo;
|
|
|
import com.ruoyi.project.VRdemo.domain.SearchData;
|
|
|
import com.ruoyi.project.VRdemo.service.ISearchService;
|
|
|
import org.apache.poi.ss.formula.functions.T;
|
|
@@ -11,7 +16,7 @@ import java.util.List;
|
|
|
|
|
|
@RestController
|
|
|
@RequestMapping("/vr/search")
|
|
|
-public class SearchController {
|
|
|
+public class SearchController extends BaseController {
|
|
|
|
|
|
@Autowired
|
|
|
private ISearchService searchService;
|
|
@@ -19,7 +24,18 @@ public class SearchController {
|
|
|
// 高级检索功能接口
|
|
|
@Anonymous
|
|
|
@PostMapping("/SearchDatabases")
|
|
|
- public List<Object> searchDatabases(@RequestBody List<SearchData> searchData) {
|
|
|
- return searchService.MappingSelection(searchData);
|
|
|
+ public TableDataInfo searchDatabases(@RequestBody JSONObject jsonObject) {
|
|
|
+ List<SearchData> searchData = jsonObject.getList("searchData", SearchData.class);
|
|
|
+ Integer pageNum = jsonObject.getInteger("pageNum");
|
|
|
+ Integer pageSize = jsonObject.getInteger("pageSize");
|
|
|
+
|
|
|
+ List<Object> list = searchService.MappingSelection(searchData);
|
|
|
+ TableDataInfo rspData = new TableDataInfo();
|
|
|
+ rspData.setCode(200);
|
|
|
+ rspData.setMsg("查询成功");
|
|
|
+ rspData.setRows(searchService.startPage(list, pageNum, pageSize));
|
|
|
+ rspData.setTotal(new PageInfo(list).getTotal());
|
|
|
+
|
|
|
+ return rspData;
|
|
|
}
|
|
|
}
|