From c7e6667f8f8e0079dc7776c631b16bdb5b22621e Mon Sep 17 00:00:00 2001
From: linfeng <2445465217@qq.com>
Date: Wed, 11 May 2022 17:17:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=96=E5=AD=90=E7=AE=A1=E7=90=86=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2&=E5=89=8D=E7=AB=AF=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/linfeng/common/utils/WechatUtil.java   | 11 ++++
 .../admin/service/impl/PostServiceImpl.java   | 36 ++++++----
 .../src/views/modules/admin/post.vue          | 65 +++++++++++--------
 3 files changed, 73 insertions(+), 39 deletions(-)

diff --git a/src/main/java/io/linfeng/common/utils/WechatUtil.java b/src/main/java/io/linfeng/common/utils/WechatUtil.java
index f08bd93..df5cab5 100644
--- a/src/main/java/io/linfeng/common/utils/WechatUtil.java
+++ b/src/main/java/io/linfeng/common/utils/WechatUtil.java
@@ -73,4 +73,15 @@ public class WechatUtil {
         }
         return null;
     }
+
+    /**
+     * @Title: isEmpty
+     * @Description: 判断对象是否为空
+     * @param obj
+     * @return
+     * @return Integer
+     */
+    public static boolean isEmpty(Object obj) {
+        return null == obj || "".equals(obj);
+    }
 }
diff --git a/src/main/java/io/linfeng/modules/admin/service/impl/PostServiceImpl.java b/src/main/java/io/linfeng/modules/admin/service/impl/PostServiceImpl.java
index 3bd7eb2..4ccfe1e 100644
--- a/src/main/java/io/linfeng/modules/admin/service/impl/PostServiceImpl.java
+++ b/src/main/java/io/linfeng/modules/admin/service/impl/PostServiceImpl.java
@@ -1,5 +1,6 @@
 package io.linfeng.modules.admin.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -53,30 +54,43 @@ public class PostServiceImpl extends ServiceImpl<PostDao, PostEntity> implements
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
+        QueryWrapper<PostEntity> queryWrapper=new QueryWrapper<>();
+        //条件查询
+        String key = (String)params.get("key");
+        String status = (String)params.get("status");
+        if(!WechatUtil.isEmpty(key)){
+            params.put("page","1");//如果是查询分页重置为第一页
+            queryWrapper.like("content", key).or().like("title",key);
+        }
+        if(!WechatUtil.isEmpty(status)){
+            params.put("page","1");//如果是查询分页重置为第一页
+            queryWrapper.eq("status", Integer.parseInt(status));
+        }
+        queryWrapper.lambda().orderByDesc(PostEntity::getId);
         IPage<PostEntity> page = this.page(
                 new Query<PostEntity>().getPage(params),
-                new QueryWrapper<>()
+                queryWrapper
         );
         List<PostEntity> data = page.getRecords();
 
-        List<PostListResponse> responseList = new ArrayList<>();
-        data.forEach(l -> {
-            PostListResponse response = new PostListResponse();
-            BeanUtils.copyProperties(l, response);
-            if (response.getDiscussId() > 0) {
+        List<PostListResponse> responseList=new ArrayList<>();
+        data.forEach(l->{
+            PostListResponse response=new PostListResponse();
+            BeanUtils.copyProperties(l,response);
+            if(ObjectUtil.isNotNull(response.getDiscussId())&&response.getDiscussId()>0){
                 DiscussEntity discussEntity = discussService.getById(response.getDiscussId());
-                response.setDiscussTitle(discussEntity.getTitle());
+                if(ObjectUtil.isNotNull(discussEntity)){
+                    response.setDiscussTitle(discussEntity.getTitle());
+                }
             }
             response.setTopicName(topicService.getById(response.getTopicId()).getTopicName());
             response.setCollectionCount(postCollectionService.collectCount(response.getId()));
             response.setCommentCount(commentService.getCountByTopicId(response.getId()));
             response.setUserInfo(appUserService.getById(response.getUid()));
-            String jsonString = l.getMedia();
-            List<String> list = JsonUtils.JsonToList(jsonString);
-            response.setMedia(list);
+            response.setMedia(JsonUtils.JsonToList(l.getMedia()));
             responseList.add(response);
         });
-        PageUtils pageUtils = new PageUtils(page);
+        PageUtils pageUtils=new PageUtils(page);
         pageUtils.setList(responseList);
         return pageUtils;
     }
diff --git a/src/main/resources/static/linfeng-community-vue/src/views/modules/admin/post.vue b/src/main/resources/static/linfeng-community-vue/src/views/modules/admin/post.vue
index 90e9e69..5f27ed0 100644
--- a/src/main/resources/static/linfeng-community-vue/src/views/modules/admin/post.vue
+++ b/src/main/resources/static/linfeng-community-vue/src/views/modules/admin/post.vue
@@ -5,21 +5,26 @@
       :model="dataForm"
       @keyup.enter.native="getDataList()"
     >
-      <!-- <el-form-item>
+      <el-form-item>
         <el-input
           v-model="dataForm.key"
-          placeholder="请输入帖子内容搜索"
+          placeholder="帖子内容或标题搜索"
           clearable
         ></el-input>
-      </el-form-item> -->
-      <el-form-item>
-        <!-- <el-button @click="getDataList()">查询</el-button> -->
-      <!-- <el-form-item>
-        <el-radio v-model="dataForm.status" label="0">正常</el-radio>
-        <el-radio v-model="dataForm.status" label="1">待审核</el-radio>
-        <el-radio v-model="dataForm.status" label="2">已下架</el-radio>
       </el-form-item>
-      <el-button @click="getDataList()">查询</el-button> -->
+      <el-form-item>
+      <!-- 选择框 -->
+      <el-select v-model="dataForm.status" clearable placeholder="请选择状态">
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+     </el-select>
+
+      <el-button @click="getDataList()">查询</el-button>
+      <el-button @click="refresh()">重置</el-button>
       
         <!-- <el-button
           v-if="isAuth('admin:post:delete')"
@@ -123,20 +128,6 @@
         label="文件"
       >
         <template slot-scope="scope">
-          <!-- <img
-            v-if="scope.row.type == 1 && scope.row.media[0]"
-            style="width: 80px; height: 50px"
-            :src="scope.row.media[0]"
-          /> -->
-          <!-- <video
-            v-if="scope.row.type == 2"
-            class="myVideo"
-            id="myVideo"
-            :src="scope.row.media[0]"
-            enable-danmu
-            danmu-btn
-            controls
-          ></video> -->
           <el-button v-if="scope.row.type == 2" type="text" @click="openVideo(scope.row.media[0])">点击预览</el-button>
           <el-button v-if="scope.row.type == 1 && scope.row.media[0]" type="text" @click="openPic(scope.row.media)">点击查看</el-button>
         </template>
@@ -162,13 +153,13 @@
         label="点赞数"
       >
       </el-table-column>
-      <!-- <el-table-column
+      <el-table-column
         prop="discussTitle"
         header-align="center"
         align="center"
         label="话题"
       >
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column
         prop="postTop"
         header-align="center"
@@ -334,6 +325,17 @@ export default {
       dialogVisible2: false,
       videoUrl:"",
       media: [],
+       options: [{
+          value: 0,
+          label: '正常'
+        }, {
+          value: 1,
+          label: '待审核'
+        }, {
+          value: 2,
+          label: '已下架'
+        }],
+        // value: ''
     };
   },
   components: {
@@ -343,6 +345,13 @@ export default {
     this.getDataList();
   },
   methods: {
+    refresh(){
+        this.dataForm.key='';
+        this.dataForm.status='';
+        this.pageIndex=1;
+        this.pageSize=10;
+        this.getDataList();
+    },
     // 获取数据列表
     getDataList() {
       this.dataListLoading = true;
@@ -352,8 +361,8 @@ export default {
         params: this.$http.adornParams({
           page: this.pageIndex,
           limit: this.pageSize,
-          // key: this.dataForm.key,
-          // status:this.dataForm.status
+          key: this.dataForm.key,
+          status:this.dataForm.status
         }),
       }).then(({ data }) => {
         if (data && data.code === 0) {