展示页数据过滤

gis_cms/src/main/java/com/gis/cms/controller/WebController.java

@@ -2,6 +2,7 @@ package com.gis.cms.controller;
 
 import com.gis.cms.entity.dto.GoodsPageDto;
 import com.gis.cms.entity.dto.SortPageDto;
+import com.gis.cms.entity.po.GoodsEntity;
 import com.gis.cms.entity.po.VideoEntity;
 import com.gis.cms.service.*;
 import com.gis.common.base.aop.WebControllerLog;
@@ -58,13 +59,22 @@ public class WebController {
     @ApiOperation(value = "文物列表")
     @PostMapping("goodList")
     public Result goodList(@Valid @RequestBody GoodsPageDto param) {
+        param.setDisplay(1);
+        param.setSortType(1);
         return goodsService.search(param);
     }
 
+    @ApiOperation("详情")
+    @GetMapping("goodDetail/{id}")
+    public Result<GoodsEntity> goodDetail(@PathVariable Long id) {
+        return goodsService.detail(id);
+    }
 
     @ApiOperation(value = "学院宣传片列表")
     @PostMapping("videoList")
     public Result videoList(@RequestBody SortPageDto param) {
+        param.setDisplay(1);
+        param.setSortType(1);
         return videoService.search(param);
     }
 
@@ -72,18 +82,24 @@ public class WebController {
     @ApiOperation(value = "美丽校园列表")
     @PostMapping("imgList")
     public Result imgList(@RequestBody SortPageDto param) {
+        param.setDisplay(1);
+        param.setSortType(1);
         return imgService.search(param);
     }
 
     @ApiOperation(value = "军歌列表")
     @PostMapping("musicList")
     public Result musicList(@RequestBody SortPageDto param) {
+        param.setDisplay(1);
+        param.setSortType(1);
         return musicService.search(param);
     }
 
     @ApiOperation(value = "军歌列表")
     @PostMapping("studentList")
     public Result studentList(@RequestBody SortPageDto param) {
+        param.setDisplay(1);
+        param.setSortType(1);
         return studentService.search(param);
     }
 

gis_cms/src/main/java/com/gis/cms/entity/dto/CommentPageDto.java

@@ -13,4 +13,7 @@ public class CommentPageDto extends PageDateDto {
     @ApiModelProperty(value = "状态：0：待审核（默认）， 1：不通过, 2:通过")
     private Integer status;
 
+    @ApiModelProperty(value = "显示：0：不显示，1：显示", notes = "后端使用")
+    private Integer display;
+
 }

gis_cms/src/main/java/com/gis/cms/entity/dto/GoodsPageDto.java

@@ -19,6 +19,9 @@ public class GoodsPageDto extends PageDateDto {
     @ApiModelProperty(value = "类型, model:模型， img:图片， video：视频",required = true)
     private String type;
 
+    @ApiModelProperty(value = "显示：0：不显示，1：显示", notes = "后端使用")
+    private Integer display;
+
 
 
 }

gis_cms/src/main/java/com/gis/cms/entity/dto/SortPageDto.java

@@ -13,4 +13,7 @@ public class SortPageDto extends PageDateDto {
     @ApiModelProperty(value = "排序类型：0：发布时间， 1：序号")
     private Integer sortType;
 
+    @ApiModelProperty(value = "显示：0：不显示，1：显示", notes = "后端使用")
+    private Integer display;
+
 }

gis_cms/src/main/java/com/gis/cms/entity/dto/StudentDto.java

@@ -45,5 +45,8 @@ public class StudentDto {
     @ApiModelProperty(value = "学号", required = true)
     private String num;
 
+    @ApiModelProperty(value = "显示：0：不显示，1：显示", notes = "后端使用")
+    private Integer display;
+
 
 }

gis_cms/src/main/java/com/gis/cms/entity/dto/VideoDto.java

@@ -30,5 +30,8 @@ public class VideoDto {
     @ApiModelProperty(value = "视频名称", required = true)
     private String fileName;
 
+    @ApiModelProperty(value = "显示：0：不显示，1：显示", notes = "后端使用")
+    private Integer display;
+
 
 }

gis_cms/src/main/java/com/gis/cms/mapper/provider/CommentProvider.java

@@ -15,6 +15,13 @@ public class CommentProvider {
         StringBuffer sql = new StringBuffer(
                 "select a.* ,b.real_name as creatorName from tb_comment a left join sys_user b on b.id=a.creator_id where a.is_delete=0 ");
 
+        Integer display = param.getDisplay();
+        if (display != null){
+            sql.append( " and a.display=").append(display);
+        }
+
+
+
         if (StringUtils.isNotBlank(param.getStartTime()) && StringUtils.isNotBlank(param.getEndTime())) {
 
             sql.append(" and a.create_time >= ").append("'").append(param.getStartTime()).append("'");
@@ -34,6 +41,8 @@ public class CommentProvider {
             sql.append( "a.status=").append(status);
         }
 
+
+
         sql.append(" order by a.create_time desc");
 
 

gis_cms/src/main/java/com/gis/cms/mapper/provider/GoodsProvider.java

@@ -17,6 +17,11 @@ public class GoodsProvider {
         StringBuffer sql = new StringBuffer(
                 "select a.* ,b.real_name as creatorName from tb_goods a left join sys_user b on b.id=a.creator_id where a.is_delete=0 ");
 
+        Integer display = param.getDisplay();
+        if (display != null){
+            sql.append( " and a.display=").append(display);
+        }
+
         String type = param.getType();
         if (StringUtils.isNotBlank(type)){
             sql.append(" and a.type='").append(type).append("'");

gis_cms/src/main/java/com/gis/cms/mapper/provider/ImgProvider.java

@@ -14,6 +14,11 @@ public class ImgProvider {
         StringBuffer sql = new StringBuffer(
                 "select a.* ,b.real_name as creatorName from tb_img a left join sys_user b on b.id=a.creator_id where a.is_delete=0 ");
 
+        Integer display = param.getDisplay();
+        if (display != null){
+            sql.append( " and a.display=").append(display);
+        }
+
         if (StringUtils.isNotBlank(param.getStartTime()) && StringUtils.isNotBlank(param.getEndTime())) {
 
             sql.append(" and a.create_time >= ").append("'").append(param.getStartTime()).append("'");

gis_cms/src/main/java/com/gis/cms/mapper/provider/LeaderProvider.java

@@ -14,6 +14,11 @@ public class LeaderProvider {
         StringBuffer sql = new StringBuffer(
                 "select a.* ,b.real_name as creatorName from tb_leader a left join sys_user b on b.id=a.creator_id where a.is_delete=0 ");
 
+        Integer display = param.getDisplay();
+        if (display != null){
+            sql.append( " and a.display=").append(display);
+        }
+
         if (StringUtils.isNotBlank(param.getStartTime()) && StringUtils.isNotBlank(param.getEndTime())) {
 
             sql.append(" and a.create_time >= ").append("'").append(param.getStartTime()).append("'");

gis_cms/src/main/java/com/gis/cms/mapper/provider/MusicProvider.java

@@ -14,6 +14,11 @@ public class MusicProvider {
         StringBuffer sql = new StringBuffer(
                 "select a.* ,b.real_name as creatorName from tb_music a left join sys_user b on b.id=a.creator_id where a.is_delete=0 ");
 
+        Integer display = param.getDisplay();
+        if (display != null){
+            sql.append( " and a.display=").append(display);
+        }
+
         if (StringUtils.isNotBlank(param.getStartTime()) && StringUtils.isNotBlank(param.getEndTime())) {
 
             sql.append(" and a.create_time >= ").append("'").append(param.getStartTime()).append("'");

gis_cms/src/main/java/com/gis/cms/mapper/provider/StudentProvider.java

@@ -14,6 +14,10 @@ public class StudentProvider {
         StringBuffer sql = new StringBuffer(
                 "select a.* ,b.real_name as creatorName from tb_student a left join sys_user b on b.id=a.creator_id where a.is_delete=0 ");
 
+        Integer display = param.getDisplay();
+        if (display != null){
+            sql.append( " and a.display=").append(display);
+        }
         if (StringUtils.isNotBlank(param.getStartTime()) && StringUtils.isNotBlank(param.getEndTime())) {
 
             sql.append(" and a.create_time >= ").append("'").append(param.getStartTime()).append("'");

gis_cms/src/main/java/com/gis/cms/mapper/provider/VideoProvider.java

@@ -14,6 +14,11 @@ public class VideoProvider {
         StringBuffer sql = new StringBuffer(
                 "select a.* ,b.real_name as creatorName from tb_video a left join sys_user b on b.id=a.creator_id where a.is_delete=0 ");
 
+        Integer display = param.getDisplay();
+        if (display != null){
+            sql.append( " and a.display=").append(display);
+        }
+
         if (StringUtils.isNotBlank(param.getStartTime()) && StringUtils.isNotBlank(param.getEndTime())) {
 
             sql.append(" and a.create_time >= ").append("'").append(param.getStartTime()).append("'");

gis_cms/src/main/java/com/gis/cms/service/impl/GoodsServiceImpl.java

@@ -121,7 +121,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, GoodsEntity> impl
                 flag = true;
             }
 
-            if (!param.getIndexId().equals(entity.getIndexId())){
+
+            // 图片类型才判断
+            if ("img".equals(param.getType()) && !param.getIndexId().equals(entity.getIndexId())){
                 isIndex = true;
             }
         }