From 7a8a84577894b766a95c6cbfa5ac7b51e54ac242 Mon Sep 17 00:00:00 2001
From: zhai <1528081232@qq.com>
Date: 星期三, 17 九月 2025 09:06:54 +0800
Subject: [PATCH] 1、获取文件大写修改 2、提交jdbc连接地质
---
src/main/java/com/zbooksoft/gdmis/controller/SearchController.java | 63 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zbooksoft/gdmis/controller/SearchController.java b/src/main/java/com/zbooksoft/gdmis/controller/SearchController.java
index 59d44aa..fdbb734 100644
--- a/src/main/java/com/zbooksoft/gdmis/controller/SearchController.java
+++ b/src/main/java/com/zbooksoft/gdmis/controller/SearchController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.mapper.SqlRunner;
import com.fasterxml.jackson.core.type.TypeReference;
import com.ruili.wcp.common.CustomConfigUtil;
import com.ruili.wcp.common.JSONUtil;
@@ -18,10 +19,7 @@
import com.ruili.wcp.web.model.easyui.PagedAndFilteredInputDto;
import com.ruili.wcp.web.model.easyui.PagedSortedAndFilteredInputDto;
import com.zbooksoft.gdmis.config.ArchivesCustomConfig;
-import com.zbooksoft.gdmis.data.entity.CatAjjxx;
-import com.zbooksoft.gdmis.data.entity.CatCgwjxx;
-import com.zbooksoft.gdmis.data.entity.CatSwajxx;
-import com.zbooksoft.gdmis.data.entity.CatYswjxx;
+import com.zbooksoft.gdmis.data.entity.*;
import com.zbooksoft.gdmis.service.CatAjjxxService;
import com.zbooksoft.gdmis.service.CatCgwjxxService;
import com.zbooksoft.gdmis.service.CatSwajxxService;
@@ -84,6 +82,7 @@
JdbcTemplate jdbcTemplate;
@Autowired
RestHighLevelClient restHighLevelClient;
+
private static final Logger logger = LoggerFactory.getLogger(SearchController.class);
@@ -152,7 +151,7 @@
SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();
// 浠庡叏鏂囧唴瀹瑰拰鏍囬涓绱㈠叧閿瓧
MultiMatchQueryBuilder matchQueryBuilder = QueryBuilders.multiMatchQuery(input.getSearchText(), "fullText", "WJM")
- .minimumShouldMatch("50%").operator(Operator.AND);
+ .minimumShouldMatch("50%").operator(Operator.OR);
boolBuilder.must(matchQueryBuilder);
if (filterMapStr != null && !filterMapStr.equals("")) {
@@ -246,8 +245,20 @@
}
}
}
- List<Map<String, Object>> rows = jdbcTemplate.queryForList(selSql);
- return rows;
+
+ // 娣诲姞鍒嗛〉鏀寔
+ String countSql = "SELECT COUNT(*) FROM (" + selSql + ") tmp_count";
+ Integer total = jdbcTemplate.queryForObject(countSql, Integer.class);
+
+ // 娣诲姞鍒嗛〉鏌ヨ
+ String pageSql = selSql + " LIMIT " + (pageInput.getPage() - 1) * pageInput.getRows() + ", " + pageInput.getRows();
+ List<Map<String, Object>> rows = jdbcTemplate.queryForList(pageSql);
+
+ // 鏋勯�犲垎椤电粨鏋�
+ Map<String, Object> result = new HashMap<>();
+ result.put("total", total);
+ result.put("rows", rows);
+ return result;
} catch (Exception e) {
logger.error(e.getMessage(), e);
return new AjaxResponse(new ErrorInfo(e.getMessage()), false);
@@ -344,31 +355,29 @@
@ResponseBody
@RequiresUser
public Object getSuperSearchData(@RequestParam String keywordMapStr, PagedSortedAndFilteredInputDto pageInput) {
+
+ keywordMapStr = StringEscapeUtils.unescapeHtml4(keywordMapStr);
+
try {
- Page<CatAjjxx> page = new Page(pageInput.getPage(), pageInput.getRows());
- QueryWrapper<CatAjjxx> catAjjxxQueryWrapper = new QueryWrapper<>();
- catAjjxxQueryWrapper.eq("fbzt", "1");
+ String selSql = "select * from view_all_utlization where 1=1";
+
if (keywordMapStr != null && !keywordMapStr.equals("")) {
- Map<String, String> filterMap = JSONUtil.string2Obj(keywordMapStr, new TypeReference<Map<String, String>>() {
- });
- for (Map.Entry<String, String> entry : filterMap.entrySet()) {
- if ("startXCSJ".equals(entry.getKey()) && !"".equals(entry.getValue())) {
- catAjjxxQueryWrapper.gt("XCSJ", entry.getValue());
- } else if ("endXCSJ".equals(entry.getKey()) && !"".equals(entry.getValue())) {
- catAjjxxQueryWrapper.lt("XCSJ", entry.getValue());
- } else if (!"".equals(entry.getKey()) && !"".equals(entry.getValue())) {
- catAjjxxQueryWrapper.like(entry.getKey(), entry.getValue());
- }
- }
+ String customSql = getAdvancedConditionsSql(keywordMapStr, 1984044085226344449l);
+ selSql += " and" + customSql;
}
- String customSql = getAdvancedConditionsSql(null, null);
- IPage<CatAjjxx> logPage = catAjjxxService.page(page, catAjjxxQueryWrapper);
- DataTableVO<CatAjjxx> dataTable = new DataTableVO();
- dataTable.setTotal(logPage.getTotal());
- dataTable.setRows(logPage.getRecords());
+ // 娣诲姞鍒嗛〉鏀寔
+ String countSql = "SELECT COUNT(*) FROM (" + selSql + ") tmp_count";
+ Integer total = jdbcTemplate.queryForObject(countSql, Integer.class);
+ // 娣诲姞鍒嗛〉鏌ヨ
+ String pageSql = selSql + " LIMIT " + (pageInput.getPage() - 1) * pageInput.getRows() + ", " + pageInput.getRows();
+ List<Map<String, Object>> rows = jdbcTemplate.queryForList(pageSql);
- return dataTable;
+ // 鏋勯�犲垎椤电粨鏋�
+ Map<String, Object> result = new HashMap<>();
+ result.put("total", total);
+ result.put("rows", rows);
+ return result;
} catch (Exception e) {
logger.error(e.getMessage(), e);
return new AjaxResponse(new ErrorInfo(e.getMessage()), false);
--
Gitblit v1.9.1