Merge remote-tracking branch 'origin/master' into master_dev

src/main/java/com/cslg/ppa/service/GetWebArticle/GetEcigaretteService.java

@@ -85,7 +85,7 @@ public class GetEcigaretteService {
                 Elements timeElement = item.select("span.time");
                 String dateStr = timeElement.text().trim();
                 String yesterdayDateStr = DateUtil.getYesterdayDateStr();
-                if (!StringUtils.equals(dateStr, "一天前")) {
+                if (!StringUtils.equals(dateStr, "1天前")) {
                     break;
                 }
                 Date date = new Date();

src/main/java/com/cslg/ppa/service/ReportService.java

@@ -352,7 +352,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
                         for (SelectAssoReportArticleVO reportArticleVO : reportArticleVOS) {
                             ExportReportDetailVO detailVO = new ExportReportDetailVO();
                             detailVO.setTitle(i + "、" + reportArticleVO.getTitle());
-                            detailVO.setDigest(reportArticleVO.getDigest());
+                            detailVO.setDigest(reportArticleVO.getOldContent());
                             String htmlLink = "<a href='" + reportArticleVO.getArticleUrl() + "'>" + reportArticleVO.getArticleUrl() + "</a>";
                             detailVO.setArticle_url(htmlLink);
                             detailVOS.add(detailVO);
@@ -554,7 +554,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
                         for (OneClickExportVO reportArticleVO : reportArticleVOS) {
                             ExportReportDetailVO detailVO = new ExportReportDetailVO();
                             detailVO.setTitle(i + "、" + reportArticleVO.getTitle());
-                            detailVO.setDigest(reportArticleVO.getDigest());
+                            detailVO.setDigest(reportArticleVO.getOldContent());
                             String htmlLink = "<a href='" + reportArticleVO.getArticleUrl() + "'>" + reportArticleVO.getArticleUrl() + "</a>";
                             detailVO.setArticle_url(htmlLink);
                             detailVOS.add(detailVO);

src/main/java/com/cslg/ppa/vo/OneClickExportVO.java

@@ -33,4 +33,5 @@ public class OneClickExportVO {
 
     private Integer ifExportFromLocal;
 
+    private String oldContent;
 }

src/main/java/com/cslg/ppa/vo/SelectAssoReportArticleVO.java

@@ -34,4 +34,6 @@ public class SelectAssoReportArticleVO {
     private Integer sourceType;
 
     private String sourceName;
+
+    private String oldContent;
 }

src/main/resources/application.yml

@@ -28,7 +28,7 @@ logging:
   level:
     cn.cslg.ppa.mapper: debug
 mybatis-plus:
-  typeAliasesPackage: cn.cslg.ppa.entity
+  typeAliasesPackage: com.cslg.ppa.entity
   global-config:
     db-config:
       id-type: AUTO

src/main/resources/mapper/ArticleInfoMapper.xml

@@ -5,7 +5,10 @@
     <select id="selectArticleInfoList" resultType="com.cslg.ppa.vo.SelectArticleInfoVO">
         select ai.id as articleId,
                ai.title,
-               ai.digest,
+               CASE
+                  WHEN ai.old_content IS NOT NULL AND ai.old_content != '' THEN ai.old_content
+                  ELSE ai.digest
+               END AS digest,
                ai.category_id,
                ai.source_id,
                ai.public_time,
@@ -71,6 +74,7 @@
         select ai.id as articleId,
         ai.title,
         ai.digest,
+        ai.old_content,
         ai.category_id,
         ai.public_time,
         ai.article_url,

src/main/resources/mapper/ReportMapper.xml

@@ -7,7 +7,10 @@
                ara.report_id,
                ara.article_id,
                ai.title,
-               ai.digest,
+               CASE
+                   WHEN ai.old_content IS NOT NULL AND ai.old_content != '' THEN ai.old_content
+                   ELSE ai.digest
+                END AS digest,
                ai.category_id,
                ca.name as categoryName,
                ai.public_time,

src/test/java/com/cslg/ppa/PpaApplicationTests.java

@@ -377,10 +377,8 @@ class PpaApplicationTests {
     @Test
     void crawlEcigaretteArticles() throws IOException {
 //        String url = "https://cn.2firsts.com/";
-//        String url = "https://cn.2firsts.com/search?keyword=%E8%8F%B2%E8%8E%AB%E5%9B%BD%E9%99%85";
-//        getEcigaretteService.crawlEcigaretteArticles(url,1,1);
-//        String url = "https://cn.2firsts.com/news/detail?id=15323";
-//        getEcigaretteService.getDigest(url);
+//        getEcigaretteService.execute();
+
         List<String> list = new ArrayList<>();
         //菲莫国际
 //        list.add("https://cn.2firsts.com/search?keyword=%E8%8F%B2%E8%8E%AB%E5%9B%BD%E9%99%85");