zero 2 weeks ago
parent
commit
587838d28b

+ 3 - 3
src/main/java/com/cslg/ppa/service/GetWebArticle/GetEcigaretteService.java

@@ -167,14 +167,14 @@ public class GetEcigaretteService {
         }
 
         // 排除关键词
-        String[] excludedKeywords = {"烟店", "零售商", "囚犯","未成年"};
+        String[] excludedKeywords = {"烟店", "零售商", "囚犯","未成年","嫌疑人"};
         for (String keyword : excludedKeywords) {
             if (title.contains(keyword)) {
-                return false;
+                return true;
             }
         }
 
-        return true; // 满足所有条件,跳过
+        return false; // 满足所有条件,不跳过
     }
 
     public Map<String, String> getDigest(String url) throws IOException {

+ 1 - 0
src/main/java/com/cslg/ppa/service/GetWebArticle/GetWeChatArticleService.java

@@ -133,6 +133,7 @@ public class GetWeChatArticleService {
                     case "知识产权界公众号":
                     case "IPRdaily公众号":
                     case "Bayes美国知识产权公众号":
+                    case "知识产权那点事公众号":
                         articleInfoDTO.setCategoryId(this.wxArticleClassify(title));
                         break;
                     default:

File diff suppressed because it is too large
+ 2 - 2
src/main/resources/application-dev.yml


+ 1 - 1
src/main/resources/mapper/ArticleInfoMapper.xml

@@ -100,7 +100,7 @@
                 and ai.public_time &lt;= #{vo.endTime}
             </if>
         </where>
-        order by ai.public_time desc,ai.id desc
+        order by ai.public_time asc,ai.id asc
     </select>
 
 </mapper>

+ 1 - 1
src/main/resources/mapper/ReportMapper.xml

@@ -21,6 +21,6 @@
         left join category ca on ca.id = ai.category_id
         left join source_info si on si.id = ai.source_id
         where ara.report_id = #{reportId} and ara.if_use = 1
-        order by ai.public_time desc
+        order by ai.public_time asc
     </select>
 </mapper>

+ 3 - 1
src/test/java/com/cslg/ppa/PpaApplicationTests.java

@@ -363,6 +363,8 @@ class PpaApplicationTests {
         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");
+        //菲莫
+//        list.add("https://cn.2firsts.com/search?keyword=%E8%8F%B2%E8%8E%AB");
 //        //PMI
 //        list.add("https://cn.2firsts.com/search?keyword=PMI");
 //        //英美烟草
@@ -390,7 +392,7 @@ class PpaApplicationTests {
 //        }
 
         List<SourceInfo> sourceInfos = sourceInfoMapper.selectList(new LambdaQueryWrapper<SourceInfo>()
-                .in(SourceInfo::getCategoryId, Arrays.asList(16, 17, 18, 19, 20, 21, 22)));
+                .in(SourceInfo::getCategoryId, Arrays.asList(22)));
         for (SourceInfo sourceInfo : sourceInfos) {
             String sourceUrl = sourceInfo.getSourceUrl();
             String sourceName = sourceInfo.getSourceName();