From 52af918cda00b8ec3a8b9a28e13f224a2d72c9b5 Mon Sep 17 00:00:00 2001
From: "rong.liu" <maureen_liur@163.com>
Date: Tue, 18 Jun 2024 17:40:29 +0800
Subject: [PATCH] commit+1

---
 .../SysProductDetailsController.java          |  4 +-
 .../huoran/iasf/entity/ProductDetails.java    | 40 +++++++++++++++++++
 .../mapper/xml/SysProductDetailsMapper.xml    |  7 ++++
 .../impl/SysProductDetailsServiceImpl.java    |  7 +++-
 .../iasf/vo/resp/PageCourseProductRespVO.java | 19 +++++++++
 5 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/huoran/iasf/controller/SysProductDetailsController.java b/src/main/java/com/huoran/iasf/controller/SysProductDetailsController.java
index a7e6371..9a9ba9d 100644
--- a/src/main/java/com/huoran/iasf/controller/SysProductDetailsController.java
+++ b/src/main/java/com/huoran/iasf/controller/SysProductDetailsController.java
@@ -144,12 +144,12 @@ public class SysProductDetailsController {
         return R.success(productDetails);
     }
 
-    @PostMapping("/articlePreview")
+   /* @PostMapping("/articlePreview")
     @ApiOperation(value = "增加文章浏览量(点击一次算一次)", response = ProductDetails.class)
     public R articlePreview(@ApiParam(name = "contentId", value = "文章id", required = true) @RequestParam Integer contentId) {
         return R.success(service.statisticsOfPageViews(contentId));
     }
-
+*/
 
     @PostMapping("/articleEnableOrDisable")
     @ApiOperation(value = "文章启用禁用", response = ProductDetails.class)
diff --git a/src/main/java/com/huoran/iasf/entity/ProductDetails.java b/src/main/java/com/huoran/iasf/entity/ProductDetails.java
index 39a2c9c..1930c77 100644
--- a/src/main/java/com/huoran/iasf/entity/ProductDetails.java
+++ b/src/main/java/com/huoran/iasf/entity/ProductDetails.java
@@ -113,6 +113,42 @@ public class ProductDetails implements Serializable {
 
     @ApiModelProperty(value = "发布时间")
     private String releaseTime;
+
+
+
+    @ApiModelProperty(value = "链接类型")
+    private Integer connectionType;
+
+    @ApiModelProperty(value = "链接地址")
+    private String linkAddress;
+
+    @ApiModelProperty(value = "站点选择(连接类型为其它站点连接时储存)")
+    private Integer siteSelection;
+
+    @ApiModelProperty(value = "是否在新窗口打开(0:否 1:是)")
+    private Integer isOpen;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     @ApiModelProperty(value = "学科专业类")
     @TableField(exist = false)
@@ -130,5 +166,9 @@ public class ProductDetails implements Serializable {
     @TableField(exist = false)
     private String professionalName;
 
+    @ApiModelProperty(value = "栏目名称")
+    @TableField(exist = false)
+    private String columnName;
+
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/huoran/iasf/mapper/xml/SysProductDetailsMapper.xml b/src/main/java/com/huoran/iasf/mapper/xml/SysProductDetailsMapper.xml
index 1dac205..d035168 100644
--- a/src/main/java/com/huoran/iasf/mapper/xml/SysProductDetailsMapper.xml
+++ b/src/main/java/com/huoran/iasf/mapper/xml/SysProductDetailsMapper.xml
@@ -169,6 +169,13 @@
         d.is_top,
         d.introduction,
         d.detailed_description,
+        d.connection_type,
+        d.link_address,
+        d.is_open,
+        d.site_selection,
+        d.article_template,
+        d.template_status,
+
         c.NAME AS category
         FROM
         sys_product_details d
diff --git a/src/main/java/com/huoran/iasf/service/impl/SysProductDetailsServiceImpl.java b/src/main/java/com/huoran/iasf/service/impl/SysProductDetailsServiceImpl.java
index 8be3372..e5c1271 100644
--- a/src/main/java/com/huoran/iasf/service/impl/SysProductDetailsServiceImpl.java
+++ b/src/main/java/com/huoran/iasf/service/impl/SysProductDetailsServiceImpl.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huoran.iasf.common.utils.R;
 import com.huoran.iasf.entity.ProductDetails;
+import com.huoran.iasf.entity.SysColumn;
 import com.huoran.iasf.mapper.SysColumnMapper;
 import com.huoran.iasf.mapper.SysProductDetailsMapper;
 import com.huoran.iasf.service.SysProductDetailsService;
@@ -105,10 +106,12 @@ public class SysProductDetailsServiceImpl extends ServiceImpl<SysProductDetailsM
         //预览增加次数
         statisticsOfPageViews(id);
 
+
         DisciplineAndSpecialtyVO disciplineAndSpecialtyVO = baseMapper.queryDisciplineAndSpecialty(id);
         ProductDetails productDetails = baseMapper.foregroundPreview(id);
-
-
+        //查看栏目名称
+        SysColumn column = columnMapper.selectById(productDetails.getColumnId());
+        productDetails.setColumnName(column.getColumnName());
         if (ObjectUtil.isNotEmpty(productDetails)) {
             if (ObjectUtil.isNotEmpty(disciplineAndSpecialtyVO)) {
                 productDetails.setDisciplineName(disciplineAndSpecialtyVO.getDisciplineName());
diff --git a/src/main/java/com/huoran/iasf/vo/resp/PageCourseProductRespVO.java b/src/main/java/com/huoran/iasf/vo/resp/PageCourseProductRespVO.java
index df2e234..a6d8c97 100644
--- a/src/main/java/com/huoran/iasf/vo/resp/PageCourseProductRespVO.java
+++ b/src/main/java/com/huoran/iasf/vo/resp/PageCourseProductRespVO.java
@@ -56,4 +56,23 @@ public class PageCourseProductRespVO {
 
     @ApiModelProperty(value = "是否置顶(0否,1是)")
     private Integer isTop;
+
+
+    @ApiModelProperty(value = "链接类型")
+    private Integer connectionType;
+
+    @ApiModelProperty(value = "链接地址")
+    private String linkAddress;
+
+    @ApiModelProperty(value = "站点选择(连接类型为其它站点连接时储存)")
+    private Integer siteSelection;
+
+    @ApiModelProperty(value = "是否在新窗口打开(0:否 1:是)")
+    private Integer isOpen;
+
+    @ApiModelProperty(value = "文章模板(前端自定义)")
+    private Integer articleTemplate;
+
+    @ApiModelProperty(value = "模板状态(0禁用；1启用)")
+    private Integer templateStatus;
 }
\ No newline at end of file