From 2c93c9fd0c64f25fde9c84465179fce84b32be4d Mon Sep 17 00:00:00 2001
From: cym1102 <cym1102@qq.com>
Date: Tue, 10 Sep 2024 11:07:52 +0800
Subject: [PATCH] 1

---
 README.md                                           |  2 +-
 .../com/cym/controller/page/ExampleController.java  |  5 +++--
 src/main/java/com/cym/service/ExampleService.java   | 10 +++++++++-
 src/main/resources/templates/example/index.html     | 13 +++++++++++++
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 915992d..23e3c3d 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 本项目为springboot3的项目, 使用jdk21进行开发, 前端html模板为freemarker, 数据库orm为自研的jpaHelper.
 
-jpaHelper的使用说明看这个页面: https://gitee.com/cym1102/jpaHelper 主要特点是不需要手动维护数据库结构, 添加model后自动生成表结构
+jpaHelper的使用说明看这个页面: https://gitee.com/cym1102/jpaHelper 主要特点是不需要手动维护数据库结构, 添加model后自动生成表结构, 尽量不要写sql或xml文件, 使用ConditionAndWrapper ConditionOrWrapper进行sql构建和查询
 
 网页框架用的jquery + layui官网说明: https://layui.dev/
 
diff --git a/src/main/java/com/cym/controller/page/ExampleController.java b/src/main/java/com/cym/controller/page/ExampleController.java
index c013328..de07823 100644
--- a/src/main/java/com/cym/controller/page/ExampleController.java
+++ b/src/main/java/com/cym/controller/page/ExampleController.java
@@ -29,8 +29,8 @@ public class ExampleController extends BaseController {
 	ExampleService exampleService;
 
 	@RequestMapping("")
-	public ModelAndView index(ModelAndView modelAndView, Page page) {
-		page = exampleService.search(page);
+	public ModelAndView index(ModelAndView modelAndView, Page page, String keyword) {
+		page = exampleService.search(page, keyword);
 
 		List<ExampleExt> exts = new ArrayList<ExampleExt>();
 		for (Example example : (List<Example>) page.getList()) {
@@ -46,6 +46,7 @@ public class ExampleController extends BaseController {
 		
 		modelAndView.addObject("adminList", jpaHelper.findAll(Admin.class));
 		modelAndView.addObject("page", page);
+		modelAndView.addObject("keyword", keyword);
 		modelAndView.setViewName("/example/index");
 		return modelAndView;
 	}
diff --git a/src/main/java/com/cym/service/ExampleService.java b/src/main/java/com/cym/service/ExampleService.java
index 68e850d..f3dedfb 100644
--- a/src/main/java/com/cym/service/ExampleService.java
+++ b/src/main/java/com/cym/service/ExampleService.java
@@ -5,14 +5,22 @@ import org.springframework.stereotype.Service;
 
 import com.cym.bean.Page;
 import com.cym.model.Example;
+import com.cym.utils.ConditionAndWrapper;
 import com.cym.utils.JpaHelper;
 
+import cn.hutool.core.util.StrUtil;
+
 @Service
 public class ExampleService {
 	@Autowired
 	JpaHelper jpaHelper;
 
-	public Page search(Page page) {
+	public Page search(Page page, String keyword) {
+		ConditionAndWrapper conditionAndWrapper = new ConditionAndWrapper();
+		if (StrUtil.isNotEmpty(keyword)) {
+			conditionAndWrapper.like(Example::getName, keyword);
+		}
+
 		page = jpaHelper.findPageByQuery(page, Example.class);
 
 		return page;
diff --git a/src/main/resources/templates/example/index.html b/src/main/resources/templates/example/index.html
index ffb8883..dd9aa00 100644
--- a/src/main/resources/templates/example/index.html
+++ b/src/main/resources/templates/example/index.html
@@ -31,6 +31,19 @@
 						<div class="layui-inline">
 							<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" onclick="add()">添加模块</button>
 						</div>
+						
+						<div class="layui-inline">
+							<label class="layui-form-label" style="width: 70px;">关键字</label>
+							<div class="layui-input-inline" style="width: 150px;">
+								<input type="text" name="keyword" value="${keyword}" class="layui-input">
+							</div>
+						</div>
+						
+						<div class="layui-inline">
+							<button type="button" class="layui-btn layui-btn-sm" onclick="search()">搜索</button>
+						</div>
+						
+						
 						<input type="hidden" name="pageNum" value="${page.pageNum}"> 
 						<input type="hidden" name="pageSize" value="${page.pageSize}">
 					</div>