From af5920d1ddd31fe19b122d83d01ea04262759a0b Mon Sep 17 00:00:00 2001
From: ck <851316342@qq.com>
Date: Thu, 15 Oct 2020 22:20:30 +0800
Subject: [PATCH] up

---
 .../bsd/cases/mapper/CaseCategoryMapper.java    |  5 +++++
 .../java/com/bsd/cases/model/CaseCategory.java  |  1 +
 .../java/com/bsd/cases/vo/CaseSearchVo.java     | 17 +++++++++++++++++
 src/main/java/com/bsd/cases/vo/CaseVo.java      |  8 --------
 .../resources/mapper/CaseCategoryMapper.xml     |  7 ++++++-
 5 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/com/bsd/cases/vo/CaseSearchVo.java
 delete mode 100644 src/main/java/com/bsd/cases/vo/CaseVo.java

diff --git a/src/main/java/com/bsd/cases/mapper/CaseCategoryMapper.java b/src/main/java/com/bsd/cases/mapper/CaseCategoryMapper.java
index 8fdfd13..a6cf030 100644
--- a/src/main/java/com/bsd/cases/mapper/CaseCategoryMapper.java
+++ b/src/main/java/com/bsd/cases/mapper/CaseCategoryMapper.java
@@ -2,8 +2,13 @@ package com.bsd.cases.mapper;
 
 import com.bsd.cases.model.CaseCategory;
 import com.bsd.cases.util.CommonMapper;
+import com.bsd.cases.vo.CaseSearchVo;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface CaseCategoryMapper extends CommonMapper<CaseCategory> {
+    List<CaseSearchVo> search(@Param("name") String name);
 }
diff --git a/src/main/java/com/bsd/cases/model/CaseCategory.java b/src/main/java/com/bsd/cases/model/CaseCategory.java
index 70616c0..a69a324 100644
--- a/src/main/java/com/bsd/cases/model/CaseCategory.java
+++ b/src/main/java/com/bsd/cases/model/CaseCategory.java
@@ -15,4 +15,5 @@ public class CaseCategory extends BaseEntity{
 
     private Long parentId;
 
+    private String url;
 }
diff --git a/src/main/java/com/bsd/cases/vo/CaseSearchVo.java b/src/main/java/com/bsd/cases/vo/CaseSearchVo.java
new file mode 100644
index 0000000..dad61ac
--- /dev/null
+++ b/src/main/java/com/bsd/cases/vo/CaseSearchVo.java
@@ -0,0 +1,17 @@
+package com.bsd.cases.vo;
+
+import lombok.Data;
+
+@Data
+public class CaseSearchVo {
+
+    private Long id;
+
+    private String name;
+
+    private String url;
+    /**
+     * type 是 0 就是category type 是 1 是content
+     */
+    private Integer type;
+}
diff --git a/src/main/java/com/bsd/cases/vo/CaseVo.java b/src/main/java/com/bsd/cases/vo/CaseVo.java
deleted file mode 100644
index 47169ad..0000000
--- a/src/main/java/com/bsd/cases/vo/CaseVo.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.bsd.cases.vo;
-
-import lombok.Data;
-
-@Data
-public class CaseVo {
-
-}
diff --git a/src/main/resources/mapper/CaseCategoryMapper.xml b/src/main/resources/mapper/CaseCategoryMapper.xml
index 8726ef2..77fc657 100644
--- a/src/main/resources/mapper/CaseCategoryMapper.xml
+++ b/src/main/resources/mapper/CaseCategoryMapper.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bsd.cases.mapper.CaseCategoryMapper">
-
+    <select id="search" resultType="com.bsd.cases.vo.CaseSearchVo">
+        SELECT id , 0 as type,`name` FROM case_category
+        union ALL
+        SELECT id ,1 as type,content_title as `name` from case_content
+        WHERE `name` LIKE CONCAT('%',#{name},'%')
+    </select>
 </mapper>