Merge branch 'developerB' of http://git.caimei365.com/caimei365/caimei365-www into developerB

src/main/java/com/caimei/www/controller/unlimited/ArticleController.java

@@ -160,9 +160,16 @@ public class ArticleController extends BaseController {
         log.info("文章详情访问来源记录完成========》" + source);
         List<BaseLink> data = articleService.getArticleLabels().getData();
         List<ImageLink> Ads = articleService.getLastestInfoAds().getData();
-        List<Article> articles = articleService.getInfoById(id);
+//        List<Article> articles = articleService.getInfoById(id);
         String relatedLabels = articleService.relatedLabel(id);
-        model.addAttribute("articles", articles);
+        List<ImageLink> infoSelected = articleService.getArticleSelected();
+        List<ImageLink> infoRelated = articleService.getArticleRelatedId(id.toString());
+        List<CmProductArchiveFile> archiveFiles = articleService.findArchiveFileAddTime();
+        List<ProductList> productSellNumbers = productService.getProductSellNumbers();
+        model.addAttribute("infoSelected", infoSelected);//精选文章
+        model.addAttribute("productSellNumbers", productSellNumbers);//销量前三商品
+        model.addAttribute("archiveFiles", archiveFiles);//最新美业资料top3
+        model.addAttribute("articles", infoRelated);//相关文章
         model.addAttribute("ads", Ads);
         model.addAttribute("labels", data);
         model.addAttribute("article", article);

src/main/java/com/caimei/www/mapper/ArticleDao.java

@@ -54,6 +54,14 @@ public interface ArticleDao {
      * @return
      */
     List<ImageLink> getArticleSelected();
+
+    /**
+     * 获取精选文章推荐
+     *
+     * @param
+     * @return
+     */
+    List<ImageLink> getArticleRelatedId(String relatedId);
     /**
      * 获取最新美业资料top3
      *

src/main/java/com/caimei/www/pojo/page/CmProductArchiveFile.java

@@ -27,6 +27,9 @@ public class CmProductArchiveFile implements Serializable
     /** $column.columnComment */
     private String id;
 
+    /** 商品资料库id */
+    private Integer productArchiveId;
+
     /** 资料库内容id */
     private Integer archiveContentId;
 

src/main/java/com/caimei/www/service/page/ArticleService.java

@@ -36,6 +36,10 @@ public interface ArticleService {
      * 获取文章推荐
      */
     List<ImageLink> getArticleSelected();
+    /**
+     * 获取相关文章
+     */
+    List<ImageLink> getArticleRelatedId(String relatedId);
     /**
      * 获取最新美业资料top3
      *

src/main/java/com/caimei/www/service/page/impl/ArticleServiceImpl.java

@@ -108,6 +108,18 @@ public class ArticleServiceImpl implements ArticleService {
      *
      */
     @Override
+    public List<ImageLink> getArticleRelatedId(String relatedId){
+        List<ImageLink> infoRelated = articleDao.getArticleRelatedId(relatedId);
+        infoRelated.forEach(item -> {
+            item.setImage(ImageUtil.getImageURL("", item.getImage(), 0, domain));
+        });
+        return infoRelated;
+    }
+    /**
+     * 获取精选文章推荐
+     *
+     */
+    @Override
     public List<CmProductArchiveFile> findArchiveFileAddTime() {
         List<CmProductArchiveFile> selected = articleDao.findArchiveFileAddTime();
         return selected;

src/main/resources/mapper/ArticleMapper.xml

@@ -55,8 +55,22 @@
 		order by cr.sort asc, a.pubdate desc
 	</select>
 
+    <select id="getArticleRelatedId" resultType="com.caimei.www.pojo.page.ImageLink" parameterType="string">
+		select  a.id,
+				a.title,
+				a.guidanceImage as image
+		from cm_related cr
+		left join info a on a.id=cr.relatedId
+		where cr.type=1
+		and a.enabledStatus = 1
+		and a.auditStatus = 2
+		and a.relatedId = #{relatedId}
+		and NOW() >= a.pubdate
+		order by cr.sort asc, a.pubdate desc
+	</select>
+
 	<select id="findArchiveFileAddTime" resultType="com.caimei.www.pojo.page.CmProductArchiveFile">
-		select cf.id,cf.archiveContentId,fileName, ossName,waterOssName,ossUrl,uploadTime
+		select cf.id,cc.productArchiveId,cf.archiveContentId,fileName, ossName,waterOssName,ossUrl,uploadTime
 		from cm_product_archive_file cf left join cm_product_archive_content cc on cf.archiveContentId = cc.id
 		where cc.type = 3
 		order by addTime desc  limit 0,3