From a14834d27fdf1b35917e243ec15fcfd5e61ebcd4 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 24 Jul 2024 14:09:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content/app/AppShipinquanController.java    | 17 +++++++++++++++++
 .../shipinquan/dao/BlShipinquanPinglunDao.java  |  3 ++-
 .../shipinquan/entity/BlShipinquanPinglun.java  |  4 ++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java b/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java
index 35cd281..44a94a1 100644
--- a/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java
+++ b/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sqx.common.utils.Result;
+import com.sqx.modules.artificer.entity.Artificer;
+import com.sqx.modules.artificer.service.ArtificerService;
 import com.sqx.modules.shipinquan.entity.BlShipinquan;
 import com.sqx.modules.shipinquan.entity.BlShipinquanDianzan;
 import com.sqx.modules.shipinquan.entity.BlShipinquanPinglun;
@@ -30,6 +32,8 @@ public class AppShipinquanController {
     private BlShipinquanPinglunService pinglunservice;
     @Autowired
     private BlShipinquanDianzanService dianzanService;
+    @Autowired
+    private ArtificerService artificerService;
 
     @GetMapping("/list")
     @ApiOperation("获取视频数据列表")
@@ -42,6 +46,19 @@ public class AppShipinquanController {
     }
 
 
+    @GetMapping("/getArticlelist")
+    @ApiOperation("获取视频数据列表")
+    public Result getArticlelist(BlShipinquan entity, Integer page, Integer limit){
+        Artificer artificer=artificerService.getById(entity.getCreateBy());
+        entity.setCreateBy(artificer.getUserId());
+        if(page==null){
+            page=1;
+            limit=10;
+        }
+        return service.findPage(page,limit,entity);
+    }
+
+
     @PostMapping("/add")
     @ApiOperation("添加视频内容")
     public Result add(@RequestBody BlShipinquan BlShipinquan){
diff --git a/src/main/java/com/sqx/modules/shipinquan/dao/BlShipinquanPinglunDao.java b/src/main/java/com/sqx/modules/shipinquan/dao/BlShipinquanPinglunDao.java
index 60d803d..b28153a 100644
--- a/src/main/java/com/sqx/modules/shipinquan/dao/BlShipinquanPinglunDao.java
+++ b/src/main/java/com/sqx/modules/shipinquan/dao/BlShipinquanPinglunDao.java
@@ -5,9 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sqx.modules.shipinquan.entity.BlShipinquanPinglun;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface BlShipinquanPinglunDao extends BaseMapper<BlShipinquanPinglun> {
 
-    IPage<BlShipinquanPinglun> contentlist(Page<Object> objectPage, BlShipinquanPinglun entity);
+    IPage<BlShipinquanPinglun> contentlist(Page<Object> objectPage,@Param("params") BlShipinquanPinglun entity);
 }
\ No newline at end of file
diff --git a/src/main/java/com/sqx/modules/shipinquan/entity/BlShipinquanPinglun.java b/src/main/java/com/sqx/modules/shipinquan/entity/BlShipinquanPinglun.java
index 93b4fd7..423a7e2 100644
--- a/src/main/java/com/sqx/modules/shipinquan/entity/BlShipinquanPinglun.java
+++ b/src/main/java/com/sqx/modules/shipinquan/entity/BlShipinquanPinglun.java
@@ -27,8 +27,8 @@ public class BlShipinquanPinglun implements Serializable {
     @TableId(type = IdType.AUTO)
     private Long id;
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;//创建实践
     private Long createBy;//创建人
     private String content;//发布内容