Merge branch 'feature/platform_book_1217' into 'master'

feat:[none] 平台端查询书刊sql调整

See merge request rays/pcloud-book!1111

pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml

@@ -435,8 +435,8 @@
 		AND (
 			B.BOOK_NAME LIKE CONCAT('%', #{bookName},'%')
 			<if test="bookNameList != null and bookNameList.size > 0">
-				<foreach collection="bookNameList" item="item" open=" " separator=" " close=" ">
-					OR B.BOOK_NAME LIKE CONCAT('%', '${item}','%')
+				<foreach collection="bookNameList" item="item" open="or (" separator="and" close=")">
+					B.BOOK_NAME LIKE CONCAT('%', #{item},'%')
 				</foreach>
 			</if>
 		)
@@ -494,8 +494,8 @@
 					AND (
 						B.BOOK_NAME LIKE CONCAT('%', #{bookName},'%')
 						<if test="bookNameList != null and bookNameList.size > 0">
-							<foreach collection="bookNameList" item="item" open=" " separator=" " close=" ">
-								OR B.BOOK_NAME LIKE CONCAT('%', '${item}','%')
+							<foreach collection="bookNameList" item="item" open="or (" separator="and" close=")">
+								B.BOOK_NAME LIKE CONCAT('%', #{item},'%')
 							</foreach>
 						</if>
 					)

pcloud-service-book/src/test/java/com.pcloud.book.test/BookDaoTest.java

+package com.pcloud.book.test;
+
+import com.alibaba.fastjson.JSON;
+import com.google.common.collect.Lists;
+import com.pcloud.book.BookApplication;
+import com.pcloud.book.book.dao.BookDao;
+import com.pcloud.book.book.dto.BookDto;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@Slf4j
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = {BookApplication.class, BookDaoTest.class})
+public class BookDaoTest {
+
+    @Autowired
+    private BookDao bookDao;
+
+    @Test
+    public void testGetListPage() {
+
+        String bookName = "时间 朋友";
+
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("bookName", bookName);
+
+        String[] bookNameList = bookName.trim().split("\\s+");
+        paramMap.put("bookNameList", Lists.newArrayList(bookNameList));
+        paramMap.put("currentPage", 0);
+        paramMap.put("numPerPage", 10);
+        int count = bookDao.getBookCount4Platform(paramMap);
+        List<BookDto> list = bookDao.getListPage4Platform(paramMap);
+
+        log.info("count===>{}", count);
+        log.info("list===>{}", JSON.toJSONString(list));
+    }
+
+
+}

pcloud-service-book/src/test/resources/logback.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="3 seconds">
+	<!-- 控制台调试输出 -->
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
+		</encoder>
+		<!--日志级别过滤-->
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>DEBUG</level>
+		</filter>
+	</appender>
+	
+
+	<!-- INFO级别以上的日志全部都输出，不同的级别输出在不同的文件里面 -->
+	<root>
+		<level value="INFO"/>
+		<appender-ref ref="STDOUT" />
+	</root>
+
+	<logger name="io.micrometer.influx.InfluxRegistry" level="ERROR"/>
+	<logger name="com.pcloud.book.book.dao" level="DEBUG"/>
+	<logger name="com.pcloud.book.group.dao" level="DEBUG"/>
+
+</configuration>
\ No newline at end of file