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