话题检索更新

src/main/java/cn/meteor/beyondclouds/modules/topic/api/TopicApi.java

@@ -4,7 +4,6 @@ import cn.meteor.beyondclouds.common.form.PageForm;
 import cn.meteor.beyondclouds.core.annotation.CurrentSubject;
 import cn.meteor.beyondclouds.core.api.Response;
 import cn.meteor.beyondclouds.core.bean.Subject;
-import cn.meteor.beyondclouds.modules.topic.bean.TopicResult;
 import cn.meteor.beyondclouds.modules.topic.entity.Topic;
 import cn.meteor.beyondclouds.modules.topic.form.CreateTopicForm;
 import cn.meteor.beyondclouds.modules.topic.service.ITopicService;
@@ -17,6 +16,7 @@ import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * @author 胡明森
@@ -63,12 +63,12 @@ public class TopicApi {
 
 
     @ApiOperation("检索话题")
-    @GetMapping("/topics/{keywords}")
-    public Response searchTopics(@PathVariable("keywords") String keywords) {
+    @GetMapping("/topic/search")
+    public Response<List<Topic>> searchTopics(@RequestParam("keywords") String keywords) {
 
-        TopicResult topicResult=iTopicService.searchTopics(keywords);
+        List<Topic> topics = iTopicService.searchTopics(keywords);
 
-        return Response.success(topicResult);
+        return Response.success(topics);
     }
 
 

src/main/java/cn/meteor/beyondclouds/modules/topic/bean/TopicResult.java

-package cn.meteor.beyondclouds.modules.topic.bean;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author 胡明森
- * @since 2020/1/31
- */
-@Data
-@ApiModel("话题返回结果")
-public class TopicResult {
-
-    @ApiModelProperty(value = "话题创建者ID")
-    private String userId;
-
-    @ApiModelProperty(value = "话题名称")
-    private String topicName;
-
-    @ApiModelProperty(value = "话题图标")
-    private String topicIcon;
-
-    @ApiModelProperty(value = "封面图")
-    private String cover;
-
-    @ApiModelProperty(value = "话题描述")
-    private String topicDescrption;
-
-    @ApiModelProperty(value = "被引用次数")
-    private Integer referenceCount;
-
-}

src/main/java/cn/meteor/beyondclouds/modules/topic/mapper/TopicMapper.java

 package cn.meteor.beyondclouds.modules.topic.mapper;
 
-import cn.meteor.beyondclouds.modules.topic.bean.TopicResult;
 import cn.meteor.beyondclouds.modules.topic.entity.Topic;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * <p>
  * 话题表 Mapper 接口
@@ -21,5 +22,5 @@ public interface TopicMapper extends BaseMapper<Topic> {
      * @param keywords
      * @return
      */
-    TopicResult searchTopics(String keywords);
+    List<Topic> searchTopics(String keywords);
 }

src/main/java/cn/meteor/beyondclouds/modules/topic/mapper/xml/TopicMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.meteor.beyondclouds.modules.topic.mapper.TopicMapper">
 
-    <select id="searchTopics" resultType="cn.meteor.beyondclouds.modules.topic.bean.TopicResult">
+    <select id="searchTopics" resultType="cn.meteor.beyondclouds.modules.topic.entity.Topic">
          select * from topic where topic_name like CONCAT('%',#{keywords},'%')
     </select>
 </mapper>

src/main/java/cn/meteor/beyondclouds/modules/topic/service/ITopicService.java

 package cn.meteor.beyondclouds.modules.topic.service;
 
-import cn.meteor.beyondclouds.modules.topic.bean.TopicResult;
 import cn.meteor.beyondclouds.modules.topic.entity.Topic;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 话题表 服务类
@@ -25,5 +26,5 @@ public interface ITopicService extends IService<Topic> {
      * 检索话题
      * @param keywords
      */
-    TopicResult searchTopics(String keywords);
+    List<Topic> searchTopics(String keywords);
 }

src/main/java/cn/meteor/beyondclouds/modules/topic/service/impl/TopicServiceImpl.java

 package cn.meteor.beyondclouds.modules.topic.service.impl;
 
-import cn.meteor.beyondclouds.modules.topic.bean.TopicResult;
 import cn.meteor.beyondclouds.modules.topic.entity.Topic;
 import cn.meteor.beyondclouds.modules.topic.mapper.TopicMapper;
 import cn.meteor.beyondclouds.modules.topic.service.ITopicService;
@@ -8,6 +7,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 话题表 服务实现类
@@ -45,7 +46,7 @@ public class TopicServiceImpl extends ServiceImpl<TopicMapper, Topic> implements
     }
 
     @Override
-    public TopicResult searchTopics(String keywords) {
+    public List<Topic> searchTopics(String keywords) {
 
         return topicMapper.searchTopics(keywords);
     }