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

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

@@ -61,14 +61,18 @@ public class ArticleController extends BaseController {
         List<BaseLink> typeList = articleService.getArticleTypes();
         List<CmBrandLandingVO> cmBrandLandingList = cmBrandLandingService.getCmBrandLandingList(new CmBrandLanding()
                 .setType("4").setAuthorId(id.toString()));
+        List<ImageLink> infoSelected = articleService.getArticleSelected();
+        List<CmProductArchiveFile> archiveFiles = articleService.findArchiveFileAddTime();
         List<ProductList> productSellNumbers = productService.getProductSellNumbers();
         List<BaseLink> data = articleService.getArticleLabels().getData();
         List<ImageLink> Ads = articleService.getLastestInfoAds().getData();
         model.addAttribute("ads", Ads);
         model.addAttribute("labels", data);
-        model.addAttribute("articleType", typeList);
-        model.addAttribute("articleImages", cmBrandLandingList);
-        model.addAttribute("productSellNumbers", productSellNumbers);
+        model.addAttribute("articleType", typeList);//导航栏
+        model.addAttribute("articleImages", cmBrandLandingList);//导航栏图片
+        model.addAttribute("infoSelected", infoSelected);//精选文章
+        model.addAttribute("productSellNumbers", productSellNumbers);//销量前三商品
+        model.addAttribute("archiveFiles", archiveFiles);//最新美业资料top3
         model.addAttribute("typeId", id);
         model.addAttribute("labelId", 0);
         model.addAttribute("pageNum", pageNum);

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

@@ -3,6 +3,7 @@ package com.caimei.www.mapper;
 import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.pojo.page.Article;
 import com.caimei.www.pojo.page.BaseLink;
+import com.caimei.www.pojo.page.CmProductArchiveFile;
 import com.caimei.www.pojo.page.ImageLink;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -46,6 +47,21 @@ public interface ArticleDao {
      */
     List<ImageLink> getArticleRecommended(@Param("typeId") Integer typeId);
 
+    /**
+     * 获取精选文章推荐
+     *
+     * @param
+     * @return
+     */
+    List<ImageLink> getArticleSelected();
+    /**
+     * 获取最新美业资料top3
+     *
+     * @param
+     * @return
+     */
+    List<CmProductArchiveFile> findArchiveFileAddTime();
+
     /**
      * 获取文章广告
      *

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

@@ -0,0 +1,56 @@
+package com.caimei.www.pojo.page;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.apache.ibatis.type.Alias;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+
+/**
+ * 商品资料文件对象 cm_product_archive_file
+ *
+ * @author Kaick
+ * @date 2023-08-08
+ */
+@Accessors(chain  = true )
+@Data
+@Alias("CmProductArchiveFile")
+public class CmProductArchiveFile implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 资料库内容id */
+    private Integer archiveContentId;
+
+    /** 文件名 */
+    private String fileName;
+
+    /** oss名称 */
+    private String ossName;
+
+    /** 水印oss名称 */
+    private String waterOssName;
+
+    /** oss链接 */
+    private String ossUrl;
+
+    /** 水印oss链接 */
+    private String waterOssUrl;
+
+    /** html链接\n */
+    private String htmlUrl;
+
+    /** 上传时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date uploadTime;
+
+}
+

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

@@ -3,6 +3,7 @@ package com.caimei.www.service.page;
 import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.pojo.page.Article;
 import com.caimei.www.pojo.page.BaseLink;
+import com.caimei.www.pojo.page.CmProductArchiveFile;
 import com.caimei.www.pojo.page.ImageLink;
 import com.github.pagehelper.PageInfo;
 import org.springframework.web.server.ServerWebExchange;
@@ -31,6 +32,17 @@ public interface ArticleService {
      */
     JsonModel<PageInfo<ImageLink>> getArticleRecommended(Integer typeId, int pageNum, int pageSize);
 
+    /**
+     * 获取文章推荐
+     */
+    List<ImageLink> getArticleSelected();
+    /**
+     * 获取最新美业资料top3
+     *
+     * @param
+     * @return
+     */
+    List<CmProductArchiveFile> findArchiveFileAddTime();
     /**
      * 获取相关文章
      */

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

@@ -4,6 +4,7 @@ import com.caimei.www.mapper.ArticleDao;
 import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.pojo.page.Article;
 import com.caimei.www.pojo.page.BaseLink;
+import com.caimei.www.pojo.page.CmProductArchiveFile;
 import com.caimei.www.pojo.page.ImageLink;
 import com.caimei.www.service.page.ArticleService;
 import com.caimei.www.service.redis.RedisService;
@@ -90,6 +91,27 @@ public class ArticleServiceImpl implements ArticleService {
         PageInfo<ImageLink> pageInfo = new PageInfo(recommended);
         return JsonModel.success(pageInfo);
     }
+    /**
+     * 获取精选文章推荐
+     *
+     */
+    @Override
+    public List<ImageLink> getArticleSelected() {
+        List<ImageLink> selected = articleDao.getArticleSelected();
+        selected.forEach(item -> {
+            item.setImage(ImageUtil.getImageURL("", item.getImage(), 0, domain));
+        });
+        return selected;
+    }
+    /**
+     * 获取精选文章推荐
+     *
+     */
+    @Override
+    public List<CmProductArchiveFile> findArchiveFileAddTime() {
+        List<CmProductArchiveFile> selected = articleDao.findArchiveFileAddTime();
+        return selected;
+    }
 
     /**
      * 获取相关文章

src/main/resources/mapper/ArticleMapper.xml

@@ -42,6 +42,25 @@
 		order by a.pubdate desc
 	</select>
 
+    <select id="getArticleSelected" resultType="com.caimei.www.pojo.page.ImageLink">
+		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=2
+		and a.enabledStatus = 1
+		and a.auditStatus = 2
+		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
+		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
+	</select>
     <select id="getArticleRelated" resultType="com.caimei.www.pojo.page.Article">
         select
 			a.id as id,