diff --git a/bookshelfplus-frontend/public/assets/stylesheets/style.css b/bookshelfplus-frontend/public/assets/stylesheets/style.css index 89a36dd..75ebf29 100644 --- a/bookshelfplus-frontend/public/assets/stylesheets/style.css +++ b/bookshelfplus-frontend/public/assets/stylesheets/style.css @@ -105,7 +105,7 @@ hr { /* 搜索框 */ .searchBox #searchInput { - padding: 0 10px; + /* padding: 0 10px; */ width: 300px; width: min(70vw, 280px); height: 30px; @@ -116,9 +116,12 @@ hr { border: none; border-bottom: 1px solid #ccc; - padding: 0.5em; + /* padding: 0.5em; */ font-size: 1em; outline: none; + + padding-bottom: 0.2em; + /* text-align: center; */ } .searchBox #searchInput:focus { @@ -128,6 +131,8 @@ hr { border: 1px solid rgb(133, 133, 133); border-radius: 3px; + + /* text-align: left; */ } .searchBox #searchButton { diff --git a/bookshelfplus-frontend/views/component/searchbox.html b/bookshelfplus-frontend/views/component/searchbox.html index 471d5a6..8c0ee97 100644 --- a/bookshelfplus-frontend/views/component/searchbox.html +++ b/bookshelfplus-frontend/views/component/searchbox.html @@ -48,8 +48,9 @@ $('#searchButton').click(function () { var searchBoxValue = $('#searchInput').val(); if (!searchBoxValue || searchBoxValue.trim() == "") { - alert("请输入搜索内容"); - return; + // alert("请输入搜索内容"); + // return; + window.location.href = "./search"; } window.location.href = "./search?keyword=" + encodeURIComponent(searchBoxValue.trim()); }); diff --git a/bookshelfplus-frontend/views/search.html b/bookshelfplus-frontend/views/search.html index 0bfcdf3..78ff1f6 100644 --- a/bookshelfplus-frontend/views/search.html +++ b/bookshelfplus-frontend/views/search.html @@ -52,7 +52,7 @@ } function search(searchboxValue) { - getRequest("/book/search", { bookName: encodeURIComponent(searchboxValue) }) + getRequest("/book/search", { bookName: searchboxValue }) .then(function (responseData) { var axiosData = responseData.data; var status = axiosData.status; @@ -66,12 +66,12 @@ var mainDivWidth = 80/*vw*/; // 定义div的宽度(用于计算表格中的数据的显示长度) var columnWidth = [23, 17, 30, 10, 20]; renderData.push({ - 书名: ` + 书名: ` ${element.bookName} `, - 分类: ` + 分类: ` ${element.category.name} @@ -89,7 +89,7 @@ }); if(renderData.length == 0) { - renderTable({ data: "没有搜索到相关书籍", tableId: "result-table", renderTableHead: true }); + renderTable({ data: `没有搜索到与 ${searchboxValue} 相关的书籍,请换个关键词再试试吧`, tableId: "result-table", renderTableHead: true }); } else { renderTable({ data: renderData, tableId: "result-table", renderTableHead: true }); } diff --git a/bookshelfplus/src/main/java/plus/bookshelf/Controller/Controller/BaseController.java b/bookshelfplus/src/main/java/plus/bookshelf/Controller/Controller/BaseController.java index 48c92ee..8cfc755 100644 --- a/bookshelfplus/src/main/java/plus/bookshelf/Controller/Controller/BaseController.java +++ b/bookshelfplus/src/main/java/plus/bookshelf/Controller/Controller/BaseController.java @@ -40,6 +40,7 @@ public class BaseController { /** * 保存用户的登录状态 + * * @return String uuidToken */ public String onLogin(UserModel userModel) { diff --git a/bookshelfplus/src/main/java/plus/bookshelf/Service/Impl/BookServiceImpl.java b/bookshelfplus/src/main/java/plus/bookshelf/Service/Impl/BookServiceImpl.java index 11029c6..d1fd57f 100644 --- a/bookshelfplus/src/main/java/plus/bookshelf/Service/Impl/BookServiceImpl.java +++ b/bookshelfplus/src/main/java/plus/bookshelf/Service/Impl/BookServiceImpl.java @@ -1,5 +1,7 @@ package plus.bookshelf.Service.Impl; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -50,14 +52,22 @@ public class BookServiceImpl implements BookService { } BookDOExample bookDOExample = new BookDOExample(); - BeanUtils.copyProperties(bookModel, bookDOExample); - List bookDOS = bookDOMapper.selectByExampleWithBLOBs(bookDOExample); + BookDOExample.Criteria criteria = bookDOExample.createCriteria(); - List bookModels = new ArrayList<>(); - for (BookDO bookDO : bookDOS) { - bookModels.add(convertFromDataObjecct(bookDO)); - } - return bookModels; + // criteria.andIsDeleteEqualTo(false); + // if (bookModel.getId() != null && bookModel.getId() != 0) + // criteria.andIdEqualTo(bookModel.getId()); + if (StringUtils.isNotBlank(bookModel.getBookName())) + criteria.andBookNameLike("%" + bookModel.getBookName() + "%"); + // if (StringUtils.isNotBlank(bookModel.getAuthor())) + // criteria.andAuthorEqualTo(bookModel.getAuthor()); + // if (bookModel.getCategory() != null && bookModel.getCategory().getId() != null && bookModel.getCategory().getId() != 0) + // criteria.andCategoryIdEqualTo(bookModel.getCategory().getId()); + // if (StringUtils.isNotBlank(bookModel.getPublishingHouse())) + // criteria.andPublishingHouseEqualTo(bookModel.getPublishingHouse()); + + List bookDOs = bookDOMapper.selectByExampleWithBLOBs(bookDOExample); + return convertFromDataObjecctList(bookDOs); } private BookModel convertFromDataObjecct(BookDO bookDO) { @@ -81,4 +91,12 @@ public class BookServiceImpl implements BookService { return bookModel; } + + private List convertFromDataObjecctList(List bookDOs) { + List bookModels = new ArrayList<>(); + for (BookDO bookDO : bookDOs) { + bookModels.add(convertFromDataObjecct(bookDO)); + } + return bookModels; + } }