洪城义警-正式版后台
Administrator
2021-06-28 e0aafa1ad7e0d8b217d2b1dd971c7eea8309d73f
资讯查询接口修改
5 files modified
1 files added
46 ■■■■■ changed files
src/main/java/org/springblade/modules/article/controller/ArticleController.java 3 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.java 4 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml 13 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/article/service/ArticleService.java 3 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java 3 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/article/vo/ArticleVo.java 20 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/article/controller/ArticleController.java
@@ -11,6 +11,7 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.article.entity.Article;
import org.springblade.modules.article.service.ArticleService;
import org.springblade.modules.article.vo.ArticleVo;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -37,7 +38,7 @@
     * @return
     */
    @GetMapping("/page")
    public R<IPage<Article>> page(HttpServletResponse response, Article article, Query query){
    public R<IPage<Article>> page(HttpServletResponse response, ArticleVo article, Query query){
        response.setHeader("Access-Control-Allow-Origin", "*");
        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
        response.setHeader("Access-Control-Allow-Credentials","true");
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.article.entity.Article;
import org.springblade.modules.article.vo.ArticleVo;
import java.util.List;
@@ -19,5 +21,5 @@
     * @param article 资讯对象
     * @return
     */
    List<Article> selectArticlePage(IPage<Article> page, Article article);
    List<Article> selectArticlePage(IPage<Article> page, @Param("article") ArticleVo article);
}
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -5,5 +5,18 @@
    <!--查询资讯分页列表信息-->
    <select id="selectArticlePage" resultType="org.springblade.modules.article.entity.Article">
        select * from sys_article
        where 1=1
        <if test="article.title!=null and article.title!=''">
            and title like concat('%',#{article.title},'%')
        </if>
        <if test="article.sourceName!=null and article.sourceName!=''">
            and source_name like concat('%',#{article.sourceName},'%')
        </if>
        <if test="article.startTime!=null and article.startTime!=''">
            and create_time&gt;=#{article.startTime}
        </if>
        <if test="article.endTime!=null and article.endTime!=''">
            and create_time&lt;=#{article.endTime}
        </if>
    </select>
</mapper>
src/main/java/org/springblade/modules/article/service/ArticleService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.article.entity.Article;
import org.springblade.modules.article.vo.ArticleVo;
/**
 * @author zhongrj
@@ -16,5 +17,5 @@
     * @param article 资讯对象
     * @return
     */
    IPage<Article> selectArticlePage(IPage<Article> page,Article article);
    IPage<Article> selectArticlePage(IPage<Article> page, ArticleVo article);
}
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
@@ -6,6 +6,7 @@
import org.springblade.modules.article.entity.Article;
import org.springblade.modules.article.mapper.ArticleMapper;
import org.springblade.modules.article.service.ArticleService;
import org.springblade.modules.article.vo.ArticleVo;
import org.springframework.stereotype.Service;
/**
@@ -23,7 +24,7 @@
     * @return
     */
    @Override
    public IPage<Article> selectArticlePage(IPage<Article> page, Article article) {
    public IPage<Article> selectArticlePage(IPage<Article> page, ArticleVo article) {
        return page.setRecords(baseMapper.selectArticlePage(page,article));
    }
}
src/main/java/org/springblade/modules/article/vo/ArticleVo.java
New file
@@ -0,0 +1,20 @@
package org.springblade.modules.article.vo;
import lombok.Data;
import org.springblade.modules.article.entity.Article;
import java.io.Serializable;
@Data
public class ArticleVo extends Article implements Serializable {
    /**
     * 开始时间
     */
    private String startTime;
    /**
     * 结束时间
     */
    private String endTime;
}