Selaa lähdekoodia

文章匹配小程序优化

xueyiming 5 kuukautta sitten
vanhempi
commit
40996338f8
80 muutettua tiedostoa jossa 3454 lisäystä ja 251 poistoa
  1. 50 0
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/config/AigcDataSourceConfig.java
  2. 2 2
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/config/DataSourceConfig.java
  3. 31 0
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/generator/AigcMybatisGeneratorMain.java
  4. 30 0
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/aigc/ProducePlanExeRecordMapper.java
  5. 3 3
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/AccountSpecialSettingsMapper.java
  6. 3 3
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/CrawlerVideoMapper.java
  7. 3 3
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/LongArticlesTextMapper.java
  8. 3 3
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/MatchVideoMapper.java
  9. 3 3
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/OffVideoMapper.java
  10. 3 3
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/PlanAccountMapper.java
  11. 3 3
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/PlanMapper.java
  12. 30 0
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/PromotionSourceMapper.java
  13. 3 3
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/PublishContentMapper.java
  14. 3 3
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/PublishMatchContentMapper.java
  15. 3 3
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/PublishMiniprogramMapper.java
  16. 3 3
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/RootSourceMapper.java
  17. 3 3
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/SingleVideoSourceMapper.java
  18. 145 0
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/aigc/ProducePlanExeRecord.java
  19. 981 0
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/aigc/ProducePlanExeRecordExample.java
  20. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/AccountSpecialSettings.java
  21. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/AccountSpecialSettingsExample.java
  22. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/CrawlerVideo.java
  23. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/CrawlerVideoExample.java
  24. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/LongArticlesText.java
  25. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/LongArticlesTextExample.java
  26. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/MatchVideo.java
  27. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/MatchVideoExample.java
  28. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/OffVideo.java
  29. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/OffVideoExample.java
  30. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/Plan.java
  31. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PlanAccount.java
  32. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PlanAccountExample.java
  33. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PlanExample.java
  34. 145 0
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PromotionSource.java
  35. 1011 0
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PromotionSourceExample.java
  36. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PublishContent.java
  37. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PublishContentExample.java
  38. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PublishMatchContent.java
  39. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PublishMatchContentExample.java
  40. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PublishMiniprogram.java
  41. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PublishMiniprogramExample.java
  42. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/RootSource.java
  43. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/RootSourceExample.java
  44. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/SingleVideoSource.java
  45. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/SingleVideoSourceExample.java
  46. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/AccountService.java
  47. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/KimiService.java
  48. 2 2
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/PlanAccountService.java
  49. 3 7
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/AccountServiceImpl.java
  50. 3 3
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CardServiceImpl.java
  51. 5 5
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/ContentServiceImpl.java
  52. 4 4
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CoreServiceImpl.java
  53. 29 9
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CrawlerVideoServiceImpl.java
  54. 3 3
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/KimiServiceImpl.java
  55. 35 12
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/MatchVideoServiceImpl.java
  56. 6 6
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/PlanAccountServiceImpl.java
  57. 3 4
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/PublicContentServiceImpl.java
  58. 5 5
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/RootSourceServiceImpl.java
  59. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/remote/VideoService.java
  60. 3 3
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/remote/impl/VideoServiceImpl.java
  61. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/utils/other/DouyinSearch.java
  62. 1 1
      long-article-server/src/main/java/com/tzld/piaoquan/longarticle/utils/other/HkspSearch.java
  63. 72 0
      long-article-server/src/main/resources/aigc-mybatis-generator-config.xml
  64. 4 0
      long-article-server/src/main/resources/application-dev.properties
  65. 13 0
      long-article-server/src/main/resources/application.properties
  66. 327 0
      long-article-server/src/main/resources/mapper/aigc/ProducePlanExeRecordMapper.xml
  67. 9 9
      long-article-server/src/main/resources/mapper/longarticle/AccountSpecialSettingsMapper.xml
  68. 12 12
      long-article-server/src/main/resources/mapper/longarticle/CrawlerVideoMapper.xml
  69. 12 12
      long-article-server/src/main/resources/mapper/longarticle/LongArticlesTextMapper.xml
  70. 12 12
      long-article-server/src/main/resources/mapper/longarticle/MatchVideoMapper.xml
  71. 9 9
      long-article-server/src/main/resources/mapper/longarticle/OffVideoMapper.xml
  72. 9 9
      long-article-server/src/main/resources/mapper/longarticle/PlanAccountMapper.xml
  73. 9 9
      long-article-server/src/main/resources/mapper/longarticle/PlanMapper.xml
  74. 326 0
      long-article-server/src/main/resources/mapper/longarticle/PromotionSourceMapper.xml
  75. 9 9
      long-article-server/src/main/resources/mapper/longarticle/PublishContentMapper.xml
  76. 9 9
      long-article-server/src/main/resources/mapper/longarticle/PublishMatchContentMapper.xml
  77. 9 9
      long-article-server/src/main/resources/mapper/longarticle/PublishMiniprogramMapper.xml
  78. 9 9
      long-article-server/src/main/resources/mapper/longarticle/RootSourceMapper.xml
  79. 9 9
      long-article-server/src/main/resources/mapper/longarticle/SingleVideoSourceMapper.xml
  80. 4 4
      long-article-server/src/main/resources/mybatis-generator-config.xml

+ 50 - 0
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/config/AigcDataSourceConfig.java

@@ -0,0 +1,50 @@
+package com.tzld.piaoquan.longarticle.config;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.PlatformTransactionManager;
+
+import javax.sql.DataSource;
+
+@MapperScan(basePackages = AigcDataSourceConfig.AIGC_PACKAGE_MASTER, sqlSessionFactoryRef = "aigcSqlSessionFactory")
+@Configuration
+public class AigcDataSourceConfig {
+
+
+
+    // 数据源
+    static final String AIGC_PACKAGE_MASTER = "com.tzld.piaoquan.longarticle.dao.mapper.aigc";
+    static final String AIGC_MAPPER_LOCATION_MASTER = "classpath:mapper/aigc/*.xml";
+
+    @Bean(name = "aigcDataSource")
+    @ConfigurationProperties("aigc.datasource")
+    public DataSource getAigcDataSource(){
+        return new DruidDataSource();
+    }
+
+    @Primary
+    @Bean(name = "aigcTransactionManager")
+    public PlatformTransactionManager aigcTransactionManager(@Qualifier("aigcDataSource") DataSource dataSource) {
+        return new DataSourceTransactionManager(dataSource);
+    }
+
+    @Primary
+    @Bean(name = "aigcSqlSessionFactory")
+    public SqlSessionFactory aigcSqlSessionFactory(@Qualifier("aigcDataSource") DataSource dataSource) throws Exception {
+        final SqlSessionFactoryBean sessionFactoryBean = new SqlSessionFactoryBean();
+        sessionFactoryBean.setDataSource(dataSource);
+        sessionFactoryBean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(AigcDataSourceConfig.AIGC_MAPPER_LOCATION_MASTER));
+        return sessionFactoryBean.getObject();
+    }
+
+
+}

+ 2 - 2
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/config/DataSourceConfig.java

@@ -20,8 +20,8 @@ import javax.sql.DataSource;
 @MapperScan(basePackages = DataSourceConfig.PACKAGE_MASTER, sqlSessionFactoryRef = "masterSqlSessionFactory")
 public class DataSourceConfig {
     // 数据源
-    static final String PACKAGE_MASTER = "com.tzld.piaoquan.longarticle.dao";
-    static final String MAPPER_LOCATION_MASTER = "classpath:mapper/*.xml";
+    static final String PACKAGE_MASTER = "com.tzld.piaoquan.longarticle.dao.mapper.longarticle";
+    static final String MAPPER_LOCATION_MASTER = "classpath:mapper/longarticle/*.xml";
 
     @Bean(name = "dataSource")
     @ConfigurationProperties("spring.datasource")

+ 31 - 0
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/generator/AigcMybatisGeneratorMain.java

@@ -0,0 +1,31 @@
+package com.tzld.piaoquan.longarticle.dao.generator;
+
+import org.mybatis.generator.api.MyBatisGenerator;
+import org.mybatis.generator.config.Configuration;
+import org.mybatis.generator.config.xml.ConfigurationParser;
+import org.mybatis.generator.exception.InvalidConfigurationException;
+import org.mybatis.generator.exception.XMLParserException;
+import org.mybatis.generator.internal.DefaultShellCallback;
+
+import java.io.File;
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class AigcMybatisGeneratorMain {
+
+    public static void main(String[] args)
+            throws SQLException, IOException, InterruptedException, InvalidConfigurationException, XMLParserException {
+        List<String> warnings = new ArrayList<>();
+
+        File configFile = new File(AigcMybatisGeneratorMain.class.getResource("/aigc-mybatis-generator-config.xml").getFile());
+        ConfigurationParser cp = new ConfigurationParser(warnings);
+        Configuration config = cp.parseConfiguration(configFile);
+        DefaultShellCallback callback = new DefaultShellCallback(true);
+        MyBatisGenerator myBatisGenerator = new MyBatisGenerator(config, callback, warnings);
+        myBatisGenerator.generate(null);
+        System.out.println("genreate finish");
+    }
+}

+ 30 - 0
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/aigc/ProducePlanExeRecordMapper.java

@@ -0,0 +1,30 @@
+package com.tzld.piaoquan.longarticle.dao.mapper.aigc;
+
+import com.tzld.piaoquan.longarticle.model.po.aigc.ProducePlanExeRecord;
+import com.tzld.piaoquan.longarticle.model.po.aigc.ProducePlanExeRecordExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface ProducePlanExeRecordMapper {
+    long countByExample(ProducePlanExeRecordExample example);
+
+    int deleteByExample(ProducePlanExeRecordExample example);
+
+    int deleteByPrimaryKey(String planExeId);
+
+    int insert(ProducePlanExeRecord record);
+
+    int insertSelective(ProducePlanExeRecord record);
+
+    List<ProducePlanExeRecord> selectByExample(ProducePlanExeRecordExample example);
+
+    ProducePlanExeRecord selectByPrimaryKey(String planExeId);
+
+    int updateByExampleSelective(@Param("record") ProducePlanExeRecord record, @Param("example") ProducePlanExeRecordExample example);
+
+    int updateByExample(@Param("record") ProducePlanExeRecord record, @Param("example") ProducePlanExeRecordExample example);
+
+    int updateByPrimaryKeySelective(ProducePlanExeRecord record);
+
+    int updateByPrimaryKey(ProducePlanExeRecord record);
+}

+ 3 - 3
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/AccountSpecialSettingsMapper.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/AccountSpecialSettingsMapper.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.longarticle.dao.mapper;
+package com.tzld.piaoquan.longarticle.dao.mapper.longarticle;
 
-import com.tzld.piaoquan.longarticle.model.po.AccountSpecialSettings;
-import com.tzld.piaoquan.longarticle.model.po.AccountSpecialSettingsExample;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.AccountSpecialSettings;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.AccountSpecialSettingsExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

+ 3 - 3
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/CrawlerVideoMapper.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/CrawlerVideoMapper.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.longarticle.dao.mapper;
+package com.tzld.piaoquan.longarticle.dao.mapper.longarticle;
 
-import com.tzld.piaoquan.longarticle.model.po.CrawlerVideo;
-import com.tzld.piaoquan.longarticle.model.po.CrawlerVideoExample;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.CrawlerVideo;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.CrawlerVideoExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

+ 3 - 3
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/LongArticlesTextMapper.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/LongArticlesTextMapper.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.longarticle.dao.mapper;
+package com.tzld.piaoquan.longarticle.dao.mapper.longarticle;
 
-import com.tzld.piaoquan.longarticle.model.po.LongArticlesText;
-import com.tzld.piaoquan.longarticle.model.po.LongArticlesTextExample;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.LongArticlesText;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.LongArticlesTextExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

+ 3 - 3
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/MatchVideoMapper.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/MatchVideoMapper.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.longarticle.dao.mapper;
+package com.tzld.piaoquan.longarticle.dao.mapper.longarticle;
 
-import com.tzld.piaoquan.longarticle.model.po.MatchVideo;
-import com.tzld.piaoquan.longarticle.model.po.MatchVideoExample;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.MatchVideo;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.MatchVideoExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

+ 3 - 3
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/OffVideoMapper.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/OffVideoMapper.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.longarticle.dao.mapper;
+package com.tzld.piaoquan.longarticle.dao.mapper.longarticle;
 
-import com.tzld.piaoquan.longarticle.model.po.OffVideo;
-import com.tzld.piaoquan.longarticle.model.po.OffVideoExample;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.OffVideo;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.OffVideoExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

+ 3 - 3
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/PlanAccountMapper.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/PlanAccountMapper.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.longarticle.dao.mapper;
+package com.tzld.piaoquan.longarticle.dao.mapper.longarticle;
 
-import com.tzld.piaoquan.longarticle.model.po.PlanAccount;
-import com.tzld.piaoquan.longarticle.model.po.PlanAccountExample;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PlanAccount;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PlanAccountExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

+ 3 - 3
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/PlanMapper.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/PlanMapper.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.longarticle.dao.mapper;
+package com.tzld.piaoquan.longarticle.dao.mapper.longarticle;
 
-import com.tzld.piaoquan.longarticle.model.po.Plan;
-import com.tzld.piaoquan.longarticle.model.po.PlanExample;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.Plan;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PlanExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

+ 30 - 0
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/PromotionSourceMapper.java

@@ -0,0 +1,30 @@
+package com.tzld.piaoquan.longarticle.dao.mapper.longarticle;
+
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PromotionSource;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PromotionSourceExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PromotionSourceMapper {
+    long countByExample(PromotionSourceExample example);
+
+    int deleteByExample(PromotionSourceExample example);
+
+    int deleteByPrimaryKey(String channelContentId);
+
+    int insert(PromotionSource record);
+
+    int insertSelective(PromotionSource record);
+
+    List<PromotionSource> selectByExample(PromotionSourceExample example);
+
+    PromotionSource selectByPrimaryKey(String channelContentId);
+
+    int updateByExampleSelective(@Param("record") PromotionSource record, @Param("example") PromotionSourceExample example);
+
+    int updateByExample(@Param("record") PromotionSource record, @Param("example") PromotionSourceExample example);
+
+    int updateByPrimaryKeySelective(PromotionSource record);
+
+    int updateByPrimaryKey(PromotionSource record);
+}

+ 3 - 3
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/PublishContentMapper.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/PublishContentMapper.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.longarticle.dao.mapper;
+package com.tzld.piaoquan.longarticle.dao.mapper.longarticle;
 
-import com.tzld.piaoquan.longarticle.model.po.PublishContent;
-import com.tzld.piaoquan.longarticle.model.po.PublishContentExample;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PublishContent;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PublishContentExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

+ 3 - 3
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/PublishMatchContentMapper.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/PublishMatchContentMapper.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.longarticle.dao.mapper;
+package com.tzld.piaoquan.longarticle.dao.mapper.longarticle;
 
-import com.tzld.piaoquan.longarticle.model.po.PublishMatchContent;
-import com.tzld.piaoquan.longarticle.model.po.PublishMatchContentExample;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMatchContent;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMatchContentExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

+ 3 - 3
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/PublishMiniprogramMapper.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/PublishMiniprogramMapper.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.longarticle.dao.mapper;
+package com.tzld.piaoquan.longarticle.dao.mapper.longarticle;
 
-import com.tzld.piaoquan.longarticle.model.po.PublishMiniprogram;
-import com.tzld.piaoquan.longarticle.model.po.PublishMiniprogramExample;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMiniprogram;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMiniprogramExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

+ 3 - 3
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/RootSourceMapper.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/RootSourceMapper.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.longarticle.dao.mapper;
+package com.tzld.piaoquan.longarticle.dao.mapper.longarticle;
 
-import com.tzld.piaoquan.longarticle.model.po.RootSource;
-import com.tzld.piaoquan.longarticle.model.po.RootSourceExample;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.RootSource;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.RootSourceExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

+ 3 - 3
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/SingleVideoSourceMapper.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/longarticle/SingleVideoSourceMapper.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.longarticle.dao.mapper;
+package com.tzld.piaoquan.longarticle.dao.mapper.longarticle;
 
-import com.tzld.piaoquan.longarticle.model.po.SingleVideoSource;
-import com.tzld.piaoquan.longarticle.model.po.SingleVideoSourceExample;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.SingleVideoSource;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.SingleVideoSourceExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

+ 145 - 0
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/aigc/ProducePlanExeRecord.java

@@ -0,0 +1,145 @@
+package com.tzld.piaoquan.longarticle.model.po.aigc;
+
+public class ProducePlanExeRecord {
+    private String planExeId;
+
+    private String planId;
+
+    private String channelContentId;
+
+    private Integer status;
+
+    private String errorMsg;
+
+    private Long createTimestamp;
+
+    private Long updateTimestamp;
+
+    private Long produceTimestamp;
+
+    private Integer auditStatus;
+
+    private String auditAccount;
+
+    private Long auditTimestamp;
+
+    private Integer auditCount;
+
+    public String getPlanExeId() {
+        return planExeId;
+    }
+
+    public void setPlanExeId(String planExeId) {
+        this.planExeId = planExeId;
+    }
+
+    public String getPlanId() {
+        return planId;
+    }
+
+    public void setPlanId(String planId) {
+        this.planId = planId;
+    }
+
+    public String getChannelContentId() {
+        return channelContentId;
+    }
+
+    public void setChannelContentId(String channelContentId) {
+        this.channelContentId = channelContentId;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getErrorMsg() {
+        return errorMsg;
+    }
+
+    public void setErrorMsg(String errorMsg) {
+        this.errorMsg = errorMsg;
+    }
+
+    public Long getCreateTimestamp() {
+        return createTimestamp;
+    }
+
+    public void setCreateTimestamp(Long createTimestamp) {
+        this.createTimestamp = createTimestamp;
+    }
+
+    public Long getUpdateTimestamp() {
+        return updateTimestamp;
+    }
+
+    public void setUpdateTimestamp(Long updateTimestamp) {
+        this.updateTimestamp = updateTimestamp;
+    }
+
+    public Long getProduceTimestamp() {
+        return produceTimestamp;
+    }
+
+    public void setProduceTimestamp(Long produceTimestamp) {
+        this.produceTimestamp = produceTimestamp;
+    }
+
+    public Integer getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(Integer auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public String getAuditAccount() {
+        return auditAccount;
+    }
+
+    public void setAuditAccount(String auditAccount) {
+        this.auditAccount = auditAccount;
+    }
+
+    public Long getAuditTimestamp() {
+        return auditTimestamp;
+    }
+
+    public void setAuditTimestamp(Long auditTimestamp) {
+        this.auditTimestamp = auditTimestamp;
+    }
+
+    public Integer getAuditCount() {
+        return auditCount;
+    }
+
+    public void setAuditCount(Integer auditCount) {
+        this.auditCount = auditCount;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", planExeId=").append(planExeId);
+        sb.append(", planId=").append(planId);
+        sb.append(", channelContentId=").append(channelContentId);
+        sb.append(", status=").append(status);
+        sb.append(", errorMsg=").append(errorMsg);
+        sb.append(", createTimestamp=").append(createTimestamp);
+        sb.append(", updateTimestamp=").append(updateTimestamp);
+        sb.append(", produceTimestamp=").append(produceTimestamp);
+        sb.append(", auditStatus=").append(auditStatus);
+        sb.append(", auditAccount=").append(auditAccount);
+        sb.append(", auditTimestamp=").append(auditTimestamp);
+        sb.append(", auditCount=").append(auditCount);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 981 - 0
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/aigc/ProducePlanExeRecordExample.java

@@ -0,0 +1,981 @@
+package com.tzld.piaoquan.longarticle.model.po.aigc;
+
+import com.tzld.piaoquan.longarticle.utils.page.Page;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ProducePlanExeRecordExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    protected Page page;
+
+    public ProducePlanExeRecordExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    public void setPage(Page page) {
+        this.page=page;
+    }
+
+    public Page getPage() {
+        return page;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andPlanExeIdIsNull() {
+            addCriterion("plan_exe_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanExeIdIsNotNull() {
+            addCriterion("plan_exe_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanExeIdEqualTo(String value) {
+            addCriterion("plan_exe_id =", value, "planExeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanExeIdNotEqualTo(String value) {
+            addCriterion("plan_exe_id <>", value, "planExeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanExeIdGreaterThan(String value) {
+            addCriterion("plan_exe_id >", value, "planExeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanExeIdGreaterThanOrEqualTo(String value) {
+            addCriterion("plan_exe_id >=", value, "planExeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanExeIdLessThan(String value) {
+            addCriterion("plan_exe_id <", value, "planExeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanExeIdLessThanOrEqualTo(String value) {
+            addCriterion("plan_exe_id <=", value, "planExeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanExeIdLike(String value) {
+            addCriterion("plan_exe_id like", value, "planExeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanExeIdNotLike(String value) {
+            addCriterion("plan_exe_id not like", value, "planExeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanExeIdIn(List<String> values) {
+            addCriterion("plan_exe_id in", values, "planExeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanExeIdNotIn(List<String> values) {
+            addCriterion("plan_exe_id not in", values, "planExeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanExeIdBetween(String value1, String value2) {
+            addCriterion("plan_exe_id between", value1, value2, "planExeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanExeIdNotBetween(String value1, String value2) {
+            addCriterion("plan_exe_id not between", value1, value2, "planExeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdIsNull() {
+            addCriterion("plan_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdIsNotNull() {
+            addCriterion("plan_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdEqualTo(String value) {
+            addCriterion("plan_id =", value, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdNotEqualTo(String value) {
+            addCriterion("plan_id <>", value, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdGreaterThan(String value) {
+            addCriterion("plan_id >", value, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdGreaterThanOrEqualTo(String value) {
+            addCriterion("plan_id >=", value, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdLessThan(String value) {
+            addCriterion("plan_id <", value, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdLessThanOrEqualTo(String value) {
+            addCriterion("plan_id <=", value, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdLike(String value) {
+            addCriterion("plan_id like", value, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdNotLike(String value) {
+            addCriterion("plan_id not like", value, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdIn(List<String> values) {
+            addCriterion("plan_id in", values, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdNotIn(List<String> values) {
+            addCriterion("plan_id not in", values, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdBetween(String value1, String value2) {
+            addCriterion("plan_id between", value1, value2, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdNotBetween(String value1, String value2) {
+            addCriterion("plan_id not between", value1, value2, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdIsNull() {
+            addCriterion("channel_content_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdIsNotNull() {
+            addCriterion("channel_content_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdEqualTo(String value) {
+            addCriterion("channel_content_id =", value, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdNotEqualTo(String value) {
+            addCriterion("channel_content_id <>", value, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdGreaterThan(String value) {
+            addCriterion("channel_content_id >", value, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdGreaterThanOrEqualTo(String value) {
+            addCriterion("channel_content_id >=", value, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdLessThan(String value) {
+            addCriterion("channel_content_id <", value, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdLessThanOrEqualTo(String value) {
+            addCriterion("channel_content_id <=", value, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdLike(String value) {
+            addCriterion("channel_content_id like", value, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdNotLike(String value) {
+            addCriterion("channel_content_id not like", value, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdIn(List<String> values) {
+            addCriterion("channel_content_id in", values, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdNotIn(List<String> values) {
+            addCriterion("channel_content_id not in", values, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdBetween(String value1, String value2) {
+            addCriterion("channel_content_id between", value1, value2, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdNotBetween(String value1, String value2) {
+            addCriterion("channel_content_id not between", value1, value2, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("`status` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("`status` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(Integer value) {
+            addCriterion("`status` =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(Integer value) {
+            addCriterion("`status` <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(Integer value) {
+            addCriterion("`status` >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("`status` >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(Integer value) {
+            addCriterion("`status` <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("`status` <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<Integer> values) {
+            addCriterion("`status` in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<Integer> values) {
+            addCriterion("`status` not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
+            addCriterion("`status` between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("`status` not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgIsNull() {
+            addCriterion("error_msg is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgIsNotNull() {
+            addCriterion("error_msg is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgEqualTo(String value) {
+            addCriterion("error_msg =", value, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgNotEqualTo(String value) {
+            addCriterion("error_msg <>", value, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgGreaterThan(String value) {
+            addCriterion("error_msg >", value, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgGreaterThanOrEqualTo(String value) {
+            addCriterion("error_msg >=", value, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgLessThan(String value) {
+            addCriterion("error_msg <", value, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgLessThanOrEqualTo(String value) {
+            addCriterion("error_msg <=", value, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgLike(String value) {
+            addCriterion("error_msg like", value, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgNotLike(String value) {
+            addCriterion("error_msg not like", value, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgIn(List<String> values) {
+            addCriterion("error_msg in", values, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgNotIn(List<String> values) {
+            addCriterion("error_msg not in", values, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgBetween(String value1, String value2) {
+            addCriterion("error_msg between", value1, value2, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgNotBetween(String value1, String value2) {
+            addCriterion("error_msg not between", value1, value2, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampIsNull() {
+            addCriterion("create_timestamp is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampIsNotNull() {
+            addCriterion("create_timestamp is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampEqualTo(Long value) {
+            addCriterion("create_timestamp =", value, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampNotEqualTo(Long value) {
+            addCriterion("create_timestamp <>", value, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampGreaterThan(Long value) {
+            addCriterion("create_timestamp >", value, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampGreaterThanOrEqualTo(Long value) {
+            addCriterion("create_timestamp >=", value, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampLessThan(Long value) {
+            addCriterion("create_timestamp <", value, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampLessThanOrEqualTo(Long value) {
+            addCriterion("create_timestamp <=", value, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampIn(List<Long> values) {
+            addCriterion("create_timestamp in", values, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampNotIn(List<Long> values) {
+            addCriterion("create_timestamp not in", values, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampBetween(Long value1, Long value2) {
+            addCriterion("create_timestamp between", value1, value2, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampNotBetween(Long value1, Long value2) {
+            addCriterion("create_timestamp not between", value1, value2, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampIsNull() {
+            addCriterion("update_timestamp is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampIsNotNull() {
+            addCriterion("update_timestamp is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampEqualTo(Long value) {
+            addCriterion("update_timestamp =", value, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampNotEqualTo(Long value) {
+            addCriterion("update_timestamp <>", value, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampGreaterThan(Long value) {
+            addCriterion("update_timestamp >", value, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampGreaterThanOrEqualTo(Long value) {
+            addCriterion("update_timestamp >=", value, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampLessThan(Long value) {
+            addCriterion("update_timestamp <", value, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampLessThanOrEqualTo(Long value) {
+            addCriterion("update_timestamp <=", value, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampIn(List<Long> values) {
+            addCriterion("update_timestamp in", values, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampNotIn(List<Long> values) {
+            addCriterion("update_timestamp not in", values, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampBetween(Long value1, Long value2) {
+            addCriterion("update_timestamp between", value1, value2, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampNotBetween(Long value1, Long value2) {
+            addCriterion("update_timestamp not between", value1, value2, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andProduceTimestampIsNull() {
+            addCriterion("produce_timestamp is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProduceTimestampIsNotNull() {
+            addCriterion("produce_timestamp is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProduceTimestampEqualTo(Long value) {
+            addCriterion("produce_timestamp =", value, "produceTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andProduceTimestampNotEqualTo(Long value) {
+            addCriterion("produce_timestamp <>", value, "produceTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andProduceTimestampGreaterThan(Long value) {
+            addCriterion("produce_timestamp >", value, "produceTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andProduceTimestampGreaterThanOrEqualTo(Long value) {
+            addCriterion("produce_timestamp >=", value, "produceTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andProduceTimestampLessThan(Long value) {
+            addCriterion("produce_timestamp <", value, "produceTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andProduceTimestampLessThanOrEqualTo(Long value) {
+            addCriterion("produce_timestamp <=", value, "produceTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andProduceTimestampIn(List<Long> values) {
+            addCriterion("produce_timestamp in", values, "produceTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andProduceTimestampNotIn(List<Long> values) {
+            addCriterion("produce_timestamp not in", values, "produceTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andProduceTimestampBetween(Long value1, Long value2) {
+            addCriterion("produce_timestamp between", value1, value2, "produceTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andProduceTimestampNotBetween(Long value1, Long value2) {
+            addCriterion("produce_timestamp not between", value1, value2, "produceTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusIsNull() {
+            addCriterion("audit_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusIsNotNull() {
+            addCriterion("audit_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusEqualTo(Integer value) {
+            addCriterion("audit_status =", value, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusNotEqualTo(Integer value) {
+            addCriterion("audit_status <>", value, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusGreaterThan(Integer value) {
+            addCriterion("audit_status >", value, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("audit_status >=", value, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusLessThan(Integer value) {
+            addCriterion("audit_status <", value, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("audit_status <=", value, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusIn(List<Integer> values) {
+            addCriterion("audit_status in", values, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusNotIn(List<Integer> values) {
+            addCriterion("audit_status not in", values, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusBetween(Integer value1, Integer value2) {
+            addCriterion("audit_status between", value1, value2, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("audit_status not between", value1, value2, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountIsNull() {
+            addCriterion("audit_account is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountIsNotNull() {
+            addCriterion("audit_account is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountEqualTo(String value) {
+            addCriterion("audit_account =", value, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountNotEqualTo(String value) {
+            addCriterion("audit_account <>", value, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountGreaterThan(String value) {
+            addCriterion("audit_account >", value, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountGreaterThanOrEqualTo(String value) {
+            addCriterion("audit_account >=", value, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountLessThan(String value) {
+            addCriterion("audit_account <", value, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountLessThanOrEqualTo(String value) {
+            addCriterion("audit_account <=", value, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountLike(String value) {
+            addCriterion("audit_account like", value, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountNotLike(String value) {
+            addCriterion("audit_account not like", value, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountIn(List<String> values) {
+            addCriterion("audit_account in", values, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountNotIn(List<String> values) {
+            addCriterion("audit_account not in", values, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountBetween(String value1, String value2) {
+            addCriterion("audit_account between", value1, value2, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountNotBetween(String value1, String value2) {
+            addCriterion("audit_account not between", value1, value2, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampIsNull() {
+            addCriterion("audit_timestamp is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampIsNotNull() {
+            addCriterion("audit_timestamp is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampEqualTo(Long value) {
+            addCriterion("audit_timestamp =", value, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampNotEqualTo(Long value) {
+            addCriterion("audit_timestamp <>", value, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampGreaterThan(Long value) {
+            addCriterion("audit_timestamp >", value, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampGreaterThanOrEqualTo(Long value) {
+            addCriterion("audit_timestamp >=", value, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampLessThan(Long value) {
+            addCriterion("audit_timestamp <", value, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampLessThanOrEqualTo(Long value) {
+            addCriterion("audit_timestamp <=", value, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampIn(List<Long> values) {
+            addCriterion("audit_timestamp in", values, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampNotIn(List<Long> values) {
+            addCriterion("audit_timestamp not in", values, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampBetween(Long value1, Long value2) {
+            addCriterion("audit_timestamp between", value1, value2, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampNotBetween(Long value1, Long value2) {
+            addCriterion("audit_timestamp not between", value1, value2, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditCountIsNull() {
+            addCriterion("audit_count is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditCountIsNotNull() {
+            addCriterion("audit_count is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditCountEqualTo(Integer value) {
+            addCriterion("audit_count =", value, "auditCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditCountNotEqualTo(Integer value) {
+            addCriterion("audit_count <>", value, "auditCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditCountGreaterThan(Integer value) {
+            addCriterion("audit_count >", value, "auditCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditCountGreaterThanOrEqualTo(Integer value) {
+            addCriterion("audit_count >=", value, "auditCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditCountLessThan(Integer value) {
+            addCriterion("audit_count <", value, "auditCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditCountLessThanOrEqualTo(Integer value) {
+            addCriterion("audit_count <=", value, "auditCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditCountIn(List<Integer> values) {
+            addCriterion("audit_count in", values, "auditCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditCountNotIn(List<Integer> values) {
+            addCriterion("audit_count not in", values, "auditCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditCountBetween(Integer value1, Integer value2) {
+            addCriterion("audit_count between", value1, value2, "auditCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditCountNotBetween(Integer value1, Integer value2) {
+            addCriterion("audit_count not between", value1, value2, "auditCount");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/AccountSpecialSettings.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/AccountSpecialSettings.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import java.util.Date;
 

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/AccountSpecialSettingsExample.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/AccountSpecialSettingsExample.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import com.tzld.piaoquan.longarticle.utils.page.Page;
 import java.util.ArrayList;

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/CrawlerVideo.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/CrawlerVideo.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import java.util.Date;
 

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/CrawlerVideoExample.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/CrawlerVideoExample.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import com.tzld.piaoquan.longarticle.utils.page.Page;
 import java.util.ArrayList;

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/LongArticlesText.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/LongArticlesText.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 public class LongArticlesText {
     private String contentId;

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/LongArticlesTextExample.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/LongArticlesTextExample.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import com.tzld.piaoquan.longarticle.utils.page.Page;
 import java.util.ArrayList;

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/MatchVideo.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/MatchVideo.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import java.util.Date;
 

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/MatchVideoExample.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/MatchVideoExample.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import com.tzld.piaoquan.longarticle.utils.page.Page;
 import java.util.ArrayList;

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/OffVideo.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/OffVideo.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 public class OffVideo {
     private Long videoId;

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/OffVideoExample.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/OffVideoExample.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import com.tzld.piaoquan.longarticle.utils.page.Page;
 import java.util.ArrayList;

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/Plan.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/Plan.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import java.util.Date;
 

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/PlanAccount.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PlanAccount.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import java.util.Date;
 

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/PlanAccountExample.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PlanAccountExample.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import com.tzld.piaoquan.longarticle.utils.page.Page;
 import java.util.ArrayList;

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/PlanExample.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PlanExample.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import com.tzld.piaoquan.longarticle.utils.page.Page;
 import java.util.ArrayList;

+ 145 - 0
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PromotionSource.java

@@ -0,0 +1,145 @@
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
+
+public class PromotionSource {
+    private String channelContentId;
+
+    private String sourcePublishContentId;
+
+    private String rootPublishContentId;
+
+    private String rootProduceContentId;
+
+    private String wxSn;
+
+    private String title;
+
+    private String titleMd5;
+
+    private String level;
+
+    private Integer status;
+
+    private Integer deleted;
+
+    private Long createTimestamp;
+
+    private Long updateTimestamp;
+
+    public String getChannelContentId() {
+        return channelContentId;
+    }
+
+    public void setChannelContentId(String channelContentId) {
+        this.channelContentId = channelContentId;
+    }
+
+    public String getSourcePublishContentId() {
+        return sourcePublishContentId;
+    }
+
+    public void setSourcePublishContentId(String sourcePublishContentId) {
+        this.sourcePublishContentId = sourcePublishContentId;
+    }
+
+    public String getRootPublishContentId() {
+        return rootPublishContentId;
+    }
+
+    public void setRootPublishContentId(String rootPublishContentId) {
+        this.rootPublishContentId = rootPublishContentId;
+    }
+
+    public String getRootProduceContentId() {
+        return rootProduceContentId;
+    }
+
+    public void setRootProduceContentId(String rootProduceContentId) {
+        this.rootProduceContentId = rootProduceContentId;
+    }
+
+    public String getWxSn() {
+        return wxSn;
+    }
+
+    public void setWxSn(String wxSn) {
+        this.wxSn = wxSn;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getTitleMd5() {
+        return titleMd5;
+    }
+
+    public void setTitleMd5(String titleMd5) {
+        this.titleMd5 = titleMd5;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Integer deleted) {
+        this.deleted = deleted;
+    }
+
+    public Long getCreateTimestamp() {
+        return createTimestamp;
+    }
+
+    public void setCreateTimestamp(Long createTimestamp) {
+        this.createTimestamp = createTimestamp;
+    }
+
+    public Long getUpdateTimestamp() {
+        return updateTimestamp;
+    }
+
+    public void setUpdateTimestamp(Long updateTimestamp) {
+        this.updateTimestamp = updateTimestamp;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", channelContentId=").append(channelContentId);
+        sb.append(", sourcePublishContentId=").append(sourcePublishContentId);
+        sb.append(", rootPublishContentId=").append(rootPublishContentId);
+        sb.append(", rootProduceContentId=").append(rootProduceContentId);
+        sb.append(", wxSn=").append(wxSn);
+        sb.append(", title=").append(title);
+        sb.append(", titleMd5=").append(titleMd5);
+        sb.append(", level=").append(level);
+        sb.append(", status=").append(status);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", createTimestamp=").append(createTimestamp);
+        sb.append(", updateTimestamp=").append(updateTimestamp);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 1011 - 0
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PromotionSourceExample.java

@@ -0,0 +1,1011 @@
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
+
+import com.tzld.piaoquan.longarticle.utils.page.Page;
+import java.util.ArrayList;
+import java.util.List;
+
+public class PromotionSourceExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    protected Page page;
+
+    public PromotionSourceExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    public void setPage(Page page) {
+        this.page=page;
+    }
+
+    public Page getPage() {
+        return page;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andChannelContentIdIsNull() {
+            addCriterion("channel_content_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdIsNotNull() {
+            addCriterion("channel_content_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdEqualTo(String value) {
+            addCriterion("channel_content_id =", value, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdNotEqualTo(String value) {
+            addCriterion("channel_content_id <>", value, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdGreaterThan(String value) {
+            addCriterion("channel_content_id >", value, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdGreaterThanOrEqualTo(String value) {
+            addCriterion("channel_content_id >=", value, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdLessThan(String value) {
+            addCriterion("channel_content_id <", value, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdLessThanOrEqualTo(String value) {
+            addCriterion("channel_content_id <=", value, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdLike(String value) {
+            addCriterion("channel_content_id like", value, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdNotLike(String value) {
+            addCriterion("channel_content_id not like", value, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdIn(List<String> values) {
+            addCriterion("channel_content_id in", values, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdNotIn(List<String> values) {
+            addCriterion("channel_content_id not in", values, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdBetween(String value1, String value2) {
+            addCriterion("channel_content_id between", value1, value2, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelContentIdNotBetween(String value1, String value2) {
+            addCriterion("channel_content_id not between", value1, value2, "channelContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePublishContentIdIsNull() {
+            addCriterion("source_publish_content_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePublishContentIdIsNotNull() {
+            addCriterion("source_publish_content_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePublishContentIdEqualTo(String value) {
+            addCriterion("source_publish_content_id =", value, "sourcePublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePublishContentIdNotEqualTo(String value) {
+            addCriterion("source_publish_content_id <>", value, "sourcePublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePublishContentIdGreaterThan(String value) {
+            addCriterion("source_publish_content_id >", value, "sourcePublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePublishContentIdGreaterThanOrEqualTo(String value) {
+            addCriterion("source_publish_content_id >=", value, "sourcePublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePublishContentIdLessThan(String value) {
+            addCriterion("source_publish_content_id <", value, "sourcePublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePublishContentIdLessThanOrEqualTo(String value) {
+            addCriterion("source_publish_content_id <=", value, "sourcePublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePublishContentIdLike(String value) {
+            addCriterion("source_publish_content_id like", value, "sourcePublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePublishContentIdNotLike(String value) {
+            addCriterion("source_publish_content_id not like", value, "sourcePublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePublishContentIdIn(List<String> values) {
+            addCriterion("source_publish_content_id in", values, "sourcePublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePublishContentIdNotIn(List<String> values) {
+            addCriterion("source_publish_content_id not in", values, "sourcePublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePublishContentIdBetween(String value1, String value2) {
+            addCriterion("source_publish_content_id between", value1, value2, "sourcePublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePublishContentIdNotBetween(String value1, String value2) {
+            addCriterion("source_publish_content_id not between", value1, value2, "sourcePublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootPublishContentIdIsNull() {
+            addCriterion("root_publish_content_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootPublishContentIdIsNotNull() {
+            addCriterion("root_publish_content_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootPublishContentIdEqualTo(String value) {
+            addCriterion("root_publish_content_id =", value, "rootPublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootPublishContentIdNotEqualTo(String value) {
+            addCriterion("root_publish_content_id <>", value, "rootPublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootPublishContentIdGreaterThan(String value) {
+            addCriterion("root_publish_content_id >", value, "rootPublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootPublishContentIdGreaterThanOrEqualTo(String value) {
+            addCriterion("root_publish_content_id >=", value, "rootPublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootPublishContentIdLessThan(String value) {
+            addCriterion("root_publish_content_id <", value, "rootPublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootPublishContentIdLessThanOrEqualTo(String value) {
+            addCriterion("root_publish_content_id <=", value, "rootPublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootPublishContentIdLike(String value) {
+            addCriterion("root_publish_content_id like", value, "rootPublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootPublishContentIdNotLike(String value) {
+            addCriterion("root_publish_content_id not like", value, "rootPublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootPublishContentIdIn(List<String> values) {
+            addCriterion("root_publish_content_id in", values, "rootPublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootPublishContentIdNotIn(List<String> values) {
+            addCriterion("root_publish_content_id not in", values, "rootPublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootPublishContentIdBetween(String value1, String value2) {
+            addCriterion("root_publish_content_id between", value1, value2, "rootPublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootPublishContentIdNotBetween(String value1, String value2) {
+            addCriterion("root_publish_content_id not between", value1, value2, "rootPublishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootProduceContentIdIsNull() {
+            addCriterion("root_produce_content_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootProduceContentIdIsNotNull() {
+            addCriterion("root_produce_content_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootProduceContentIdEqualTo(String value) {
+            addCriterion("root_produce_content_id =", value, "rootProduceContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootProduceContentIdNotEqualTo(String value) {
+            addCriterion("root_produce_content_id <>", value, "rootProduceContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootProduceContentIdGreaterThan(String value) {
+            addCriterion("root_produce_content_id >", value, "rootProduceContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootProduceContentIdGreaterThanOrEqualTo(String value) {
+            addCriterion("root_produce_content_id >=", value, "rootProduceContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootProduceContentIdLessThan(String value) {
+            addCriterion("root_produce_content_id <", value, "rootProduceContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootProduceContentIdLessThanOrEqualTo(String value) {
+            addCriterion("root_produce_content_id <=", value, "rootProduceContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootProduceContentIdLike(String value) {
+            addCriterion("root_produce_content_id like", value, "rootProduceContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootProduceContentIdNotLike(String value) {
+            addCriterion("root_produce_content_id not like", value, "rootProduceContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootProduceContentIdIn(List<String> values) {
+            addCriterion("root_produce_content_id in", values, "rootProduceContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootProduceContentIdNotIn(List<String> values) {
+            addCriterion("root_produce_content_id not in", values, "rootProduceContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootProduceContentIdBetween(String value1, String value2) {
+            addCriterion("root_produce_content_id between", value1, value2, "rootProduceContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRootProduceContentIdNotBetween(String value1, String value2) {
+            addCriterion("root_produce_content_id not between", value1, value2, "rootProduceContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWxSnIsNull() {
+            addCriterion("wx_sn is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWxSnIsNotNull() {
+            addCriterion("wx_sn is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWxSnEqualTo(String value) {
+            addCriterion("wx_sn =", value, "wxSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andWxSnNotEqualTo(String value) {
+            addCriterion("wx_sn <>", value, "wxSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andWxSnGreaterThan(String value) {
+            addCriterion("wx_sn >", value, "wxSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andWxSnGreaterThanOrEqualTo(String value) {
+            addCriterion("wx_sn >=", value, "wxSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andWxSnLessThan(String value) {
+            addCriterion("wx_sn <", value, "wxSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andWxSnLessThanOrEqualTo(String value) {
+            addCriterion("wx_sn <=", value, "wxSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andWxSnLike(String value) {
+            addCriterion("wx_sn like", value, "wxSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andWxSnNotLike(String value) {
+            addCriterion("wx_sn not like", value, "wxSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andWxSnIn(List<String> values) {
+            addCriterion("wx_sn in", values, "wxSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andWxSnNotIn(List<String> values) {
+            addCriterion("wx_sn not in", values, "wxSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andWxSnBetween(String value1, String value2) {
+            addCriterion("wx_sn between", value1, value2, "wxSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andWxSnNotBetween(String value1, String value2) {
+            addCriterion("wx_sn not between", value1, value2, "wxSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleIsNull() {
+            addCriterion("title is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleIsNotNull() {
+            addCriterion("title is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleEqualTo(String value) {
+            addCriterion("title =", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotEqualTo(String value) {
+            addCriterion("title <>", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleGreaterThan(String value) {
+            addCriterion("title >", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("title >=", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLessThan(String value) {
+            addCriterion("title <", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLessThanOrEqualTo(String value) {
+            addCriterion("title <=", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLike(String value) {
+            addCriterion("title like", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotLike(String value) {
+            addCriterion("title not like", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleIn(List<String> values) {
+            addCriterion("title in", values, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotIn(List<String> values) {
+            addCriterion("title not in", values, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleBetween(String value1, String value2) {
+            addCriterion("title between", value1, value2, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotBetween(String value1, String value2) {
+            addCriterion("title not between", value1, value2, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleMd5IsNull() {
+            addCriterion("title_md5 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleMd5IsNotNull() {
+            addCriterion("title_md5 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleMd5EqualTo(String value) {
+            addCriterion("title_md5 =", value, "titleMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleMd5NotEqualTo(String value) {
+            addCriterion("title_md5 <>", value, "titleMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleMd5GreaterThan(String value) {
+            addCriterion("title_md5 >", value, "titleMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleMd5GreaterThanOrEqualTo(String value) {
+            addCriterion("title_md5 >=", value, "titleMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleMd5LessThan(String value) {
+            addCriterion("title_md5 <", value, "titleMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleMd5LessThanOrEqualTo(String value) {
+            addCriterion("title_md5 <=", value, "titleMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleMd5Like(String value) {
+            addCriterion("title_md5 like", value, "titleMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleMd5NotLike(String value) {
+            addCriterion("title_md5 not like", value, "titleMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleMd5In(List<String> values) {
+            addCriterion("title_md5 in", values, "titleMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleMd5NotIn(List<String> values) {
+            addCriterion("title_md5 not in", values, "titleMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleMd5Between(String value1, String value2) {
+            addCriterion("title_md5 between", value1, value2, "titleMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleMd5NotBetween(String value1, String value2) {
+            addCriterion("title_md5 not between", value1, value2, "titleMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelIsNull() {
+            addCriterion("`level` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelIsNotNull() {
+            addCriterion("`level` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelEqualTo(String value) {
+            addCriterion("`level` =", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelNotEqualTo(String value) {
+            addCriterion("`level` <>", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelGreaterThan(String value) {
+            addCriterion("`level` >", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelGreaterThanOrEqualTo(String value) {
+            addCriterion("`level` >=", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelLessThan(String value) {
+            addCriterion("`level` <", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelLessThanOrEqualTo(String value) {
+            addCriterion("`level` <=", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelLike(String value) {
+            addCriterion("`level` like", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelNotLike(String value) {
+            addCriterion("`level` not like", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelIn(List<String> values) {
+            addCriterion("`level` in", values, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelNotIn(List<String> values) {
+            addCriterion("`level` not in", values, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelBetween(String value1, String value2) {
+            addCriterion("`level` between", value1, value2, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelNotBetween(String value1, String value2) {
+            addCriterion("`level` not between", value1, value2, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("`status` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("`status` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(Integer value) {
+            addCriterion("`status` =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(Integer value) {
+            addCriterion("`status` <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(Integer value) {
+            addCriterion("`status` >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("`status` >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(Integer value) {
+            addCriterion("`status` <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("`status` <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<Integer> values) {
+            addCriterion("`status` in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<Integer> values) {
+            addCriterion("`status` not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
+            addCriterion("`status` between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("`status` not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIsNull() {
+            addCriterion("deleted is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIsNotNull() {
+            addCriterion("deleted is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedEqualTo(Integer value) {
+            addCriterion("deleted =", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotEqualTo(Integer value) {
+            addCriterion("deleted <>", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedGreaterThan(Integer value) {
+            addCriterion("deleted >", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedGreaterThanOrEqualTo(Integer value) {
+            addCriterion("deleted >=", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedLessThan(Integer value) {
+            addCriterion("deleted <", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedLessThanOrEqualTo(Integer value) {
+            addCriterion("deleted <=", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIn(List<Integer> values) {
+            addCriterion("deleted in", values, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotIn(List<Integer> values) {
+            addCriterion("deleted not in", values, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedBetween(Integer value1, Integer value2) {
+            addCriterion("deleted between", value1, value2, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotBetween(Integer value1, Integer value2) {
+            addCriterion("deleted not between", value1, value2, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampIsNull() {
+            addCriterion("create_timestamp is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampIsNotNull() {
+            addCriterion("create_timestamp is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampEqualTo(Long value) {
+            addCriterion("create_timestamp =", value, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampNotEqualTo(Long value) {
+            addCriterion("create_timestamp <>", value, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampGreaterThan(Long value) {
+            addCriterion("create_timestamp >", value, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampGreaterThanOrEqualTo(Long value) {
+            addCriterion("create_timestamp >=", value, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampLessThan(Long value) {
+            addCriterion("create_timestamp <", value, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampLessThanOrEqualTo(Long value) {
+            addCriterion("create_timestamp <=", value, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampIn(List<Long> values) {
+            addCriterion("create_timestamp in", values, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampNotIn(List<Long> values) {
+            addCriterion("create_timestamp not in", values, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampBetween(Long value1, Long value2) {
+            addCriterion("create_timestamp between", value1, value2, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampNotBetween(Long value1, Long value2) {
+            addCriterion("create_timestamp not between", value1, value2, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampIsNull() {
+            addCriterion("update_timestamp is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampIsNotNull() {
+            addCriterion("update_timestamp is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampEqualTo(Long value) {
+            addCriterion("update_timestamp =", value, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampNotEqualTo(Long value) {
+            addCriterion("update_timestamp <>", value, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampGreaterThan(Long value) {
+            addCriterion("update_timestamp >", value, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampGreaterThanOrEqualTo(Long value) {
+            addCriterion("update_timestamp >=", value, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampLessThan(Long value) {
+            addCriterion("update_timestamp <", value, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampLessThanOrEqualTo(Long value) {
+            addCriterion("update_timestamp <=", value, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampIn(List<Long> values) {
+            addCriterion("update_timestamp in", values, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampNotIn(List<Long> values) {
+            addCriterion("update_timestamp not in", values, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampBetween(Long value1, Long value2) {
+            addCriterion("update_timestamp between", value1, value2, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampNotBetween(Long value1, Long value2) {
+            addCriterion("update_timestamp not between", value1, value2, "updateTimestamp");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/PublishContent.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PublishContent.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import java.util.Date;
 

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/PublishContentExample.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PublishContentExample.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import com.tzld.piaoquan.longarticle.utils.page.Page;
 import java.util.ArrayList;

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/PublishMatchContent.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PublishMatchContent.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import java.util.Date;
 

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/PublishMatchContentExample.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PublishMatchContentExample.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import com.tzld.piaoquan.longarticle.utils.page.Page;
 import java.util.ArrayList;

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/PublishMiniprogram.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PublishMiniprogram.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import java.util.Date;
 

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/PublishMiniprogramExample.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/PublishMiniprogramExample.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import com.tzld.piaoquan.longarticle.utils.page.Page;
 import java.util.ArrayList;

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/RootSource.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/RootSource.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 public class RootSource {
     private String rootSourceId;

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/RootSourceExample.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/RootSourceExample.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import com.tzld.piaoquan.longarticle.utils.page.Page;
 import java.util.ArrayList;

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/SingleVideoSource.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/SingleVideoSource.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 public class SingleVideoSource {
     private Integer id;

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/SingleVideoSourceExample.java → long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/SingleVideoSourceExample.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.longarticle.model.po;
+package com.tzld.piaoquan.longarticle.model.po.longarticle;
 
 import com.tzld.piaoquan.longarticle.utils.page.Page;
 import java.util.ArrayList;

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/AccountService.java

@@ -1,6 +1,6 @@
 package com.tzld.piaoquan.longarticle.service.local;
 
-import com.tzld.piaoquan.longarticle.model.po.AccountSpecialSettings;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.AccountSpecialSettings;
 
 import java.util.List;
 

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/KimiService.java

@@ -1,6 +1,6 @@
 package com.tzld.piaoquan.longarticle.service.local;
 
-import com.tzld.piaoquan.longarticle.model.po.LongArticlesText;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.LongArticlesText;
 
 public interface KimiService {
 

+ 2 - 2
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/PlanAccountService.java

@@ -1,7 +1,7 @@
 package com.tzld.piaoquan.longarticle.service.local;
 
-import com.tzld.piaoquan.longarticle.model.po.Plan;
-import com.tzld.piaoquan.longarticle.model.po.PlanAccount;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.Plan;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PlanAccount;
 
 import java.util.List;
 

+ 3 - 7
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/AccountServiceImpl.java

@@ -1,19 +1,15 @@
 package com.tzld.piaoquan.longarticle.service.local.impl;
 
-import com.tzld.piaoquan.longarticle.dao.mapper.AccountSpecialSettingsMapper;
-import com.tzld.piaoquan.longarticle.model.po.AccountSpecialSettings;
-import com.tzld.piaoquan.longarticle.model.po.AccountSpecialSettingsExample;
-import com.tzld.piaoquan.longarticle.model.po.PlanAccount;
-import com.tzld.piaoquan.longarticle.model.po.PlanAccountExample;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.AccountSpecialSettingsMapper;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.AccountSpecialSettings;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.AccountSpecialSettingsExample;
 import com.tzld.piaoquan.longarticle.service.local.AccountService;
 import com.tzld.piaoquan.longarticle.utils.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @Service
 public class AccountServiceImpl implements AccountService {

+ 3 - 3
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CardServiceImpl.java

@@ -3,9 +3,9 @@ package com.tzld.piaoquan.longarticle.service.local.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.tzld.piaoquan.longarticle.model.bo.VideoDetail;
-import com.tzld.piaoquan.longarticle.model.po.PlanAccount;
-import com.tzld.piaoquan.longarticle.model.po.PublishContent;
-import com.tzld.piaoquan.longarticle.model.po.PublishMiniprogram;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PlanAccount;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PublishContent;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMiniprogram;
 import com.tzld.piaoquan.longarticle.service.local.CardService;
 import com.tzld.piaoquan.longarticle.service.remote.AigcService;
 import lombok.extern.slf4j.Slf4j;

+ 5 - 5
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/ContentServiceImpl.java

@@ -4,16 +4,16 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.tzld.piaoquan.longarticle.common.enums.PublishGzhPushTypeEnum;
-import com.tzld.piaoquan.longarticle.dao.mapper.CrawlerVideoMapper;
-import com.tzld.piaoquan.longarticle.dao.mapper.MatchVideoMapper;
-import com.tzld.piaoquan.longarticle.dao.mapper.PublishMatchContentMapper;
-import com.tzld.piaoquan.longarticle.dao.mapper.SingleVideoSourceMapper;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.CrawlerVideoMapper;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.MatchVideoMapper;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.PublishMatchContentMapper;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.SingleVideoSourceMapper;
 import com.tzld.piaoquan.longarticle.model.bo.VideoDetail;
 import com.tzld.piaoquan.longarticle.model.dto.ArticleSortRequest;
 import com.tzld.piaoquan.longarticle.model.dto.ArticleSortResponse;
 import com.tzld.piaoquan.longarticle.model.dto.ArticleSortResponseData;
 import com.tzld.piaoquan.longarticle.model.dto.PublishArticleData;
-import com.tzld.piaoquan.longarticle.model.po.*;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.*;
 import com.tzld.piaoquan.longarticle.model.vo.*;
 import com.tzld.piaoquan.longarticle.service.local.ContentService;
 import com.tzld.piaoquan.longarticle.service.local.KimiService;

+ 4 - 4
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CoreServiceImpl.java

@@ -6,14 +6,14 @@ import com.tzld.piaoquan.longarticle.common.constants.TimeConstant;
 import com.tzld.piaoquan.longarticle.common.enums.ContentStatusEnum;
 import com.tzld.piaoquan.longarticle.common.enums.PublishGzhPushTypeEnum;
 import com.tzld.piaoquan.longarticle.common.enums.SourceTypesEnum;
-import com.tzld.piaoquan.longarticle.dao.mapper.PlanAccountMapper;
-import com.tzld.piaoquan.longarticle.dao.mapper.PublishContentMapper;
-import com.tzld.piaoquan.longarticle.dao.mapper.PublishMiniprogramMapper;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.PlanAccountMapper;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.PublishContentMapper;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.PublishMiniprogramMapper;
 import com.tzld.piaoquan.longarticle.model.bo.MatchContent;
 import com.tzld.piaoquan.longarticle.model.bo.VideoDetail;
 import com.tzld.piaoquan.longarticle.model.dto.MiniprogramCardRequest;
 import com.tzld.piaoquan.longarticle.model.dto.PublishArticleData;
-import com.tzld.piaoquan.longarticle.model.po.*;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.*;
 import com.tzld.piaoquan.longarticle.model.vo.*;
 import com.tzld.piaoquan.longarticle.service.local.AccountService;
 import com.tzld.piaoquan.longarticle.service.local.CoreService;

+ 29 - 9
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CrawlerVideoServiceImpl.java

@@ -1,13 +1,11 @@
 package com.tzld.piaoquan.longarticle.service.local.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.tzld.piaoquan.longarticle.dao.mapper.CrawlerVideoMapper;
-import com.tzld.piaoquan.longarticle.model.po.CrawlerVideo;
-import com.tzld.piaoquan.longarticle.model.po.CrawlerVideoExample;
-import com.tzld.piaoquan.longarticle.model.po.LongArticlesText;
-import com.tzld.piaoquan.longarticle.service.local.KimiService;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.CrawlerVideoMapper;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.CrawlerVideo;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.CrawlerVideoExample;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.LongArticlesText;
 import com.tzld.piaoquan.longarticle.utils.other.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -48,20 +46,42 @@ public class CrawlerVideoServiceImpl {
         add("习");
     }};
 
-    public void addCrawlerVideo(String contentId, LongArticlesText kimiText) {
+    public void addCrawlerVideo(String contentId, String rootContentId, LongArticlesText kimiText) {
         boolean b = existCrawlerVideo(contentId);
         if (b) {
             return;
         }
+        if (rootContentId != null) {
+            CrawlerVideoExample example = new CrawlerVideoExample();
+            example.createCriteria().andContentIdEqualTo(rootContentId);
+            List<CrawlerVideo> crawlerVideos = crawlerVideoMapper.selectByExample(example);
+            for (CrawlerVideo crawlerVideo : crawlerVideos) {
+                crawlerVideo.setContentId(contentId);
+                crawlerVideoMapper.insertSelective(crawlerVideo);
+            }
+            return;
+        }
         List<CrawlerVideo> crawlerVideoList = searchVideosFromWeb(kimiText);
         if (!CollectionUtils.isEmpty(crawlerVideoList)) {
-            for (CrawlerVideo crawlerVideo : crawlerVideoList) {
+            CrawlerVideoExample example = new CrawlerVideoExample();
+            example.createCriteria().andContentIdEqualTo(contentId);
+            List<CrawlerVideo> crawlerVideos = crawlerVideoMapper.selectByExample(example);
+            // 使用 Lambda 表达式过滤 crawlerVideoList
+            List<CrawlerVideo> filteredList = crawlerVideoList.stream()
+                    .filter(video -> crawlerVideos.stream()
+                            .noneMatch(existingVideo ->
+                                    existingVideo.getOutVideoId().equals(video.getOutVideoId()) &&
+                                            existingVideo.getPlatform().equals(video.getPlatform())
+                            )
+                    )
+                    .collect(Collectors.toList());
+            for (CrawlerVideo crawlerVideo : filteredList) {
                 crawlerVideo.setContentId(contentId);
                 crawlerVideo.setDownloadStatus(0);
                 crawlerVideoMapper.insertSelective(crawlerVideo);
             }
-            pushOss(contentId);
         }
+        pushOss(contentId);
     }
 
     public boolean existCrawlerVideo(String contentId) {

+ 3 - 3
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/KimiServiceImpl.java

@@ -1,9 +1,9 @@
 package com.tzld.piaoquan.longarticle.service.local.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.tzld.piaoquan.longarticle.dao.mapper.LongArticlesTextMapper;
-import com.tzld.piaoquan.longarticle.model.po.LongArticlesText;
-import com.tzld.piaoquan.longarticle.model.po.LongArticlesTextExample;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.LongArticlesTextMapper;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.LongArticlesText;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.LongArticlesTextExample;
 import com.tzld.piaoquan.longarticle.service.local.KimiService;
 import com.tzld.piaoquan.longarticle.utils.other.OpenAIUtils;
 import org.apache.commons.lang3.StringUtils;

+ 35 - 12
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/MatchVideoServiceImpl.java

@@ -1,17 +1,14 @@
 package com.tzld.piaoquan.longarticle.service.local.impl;
 
-import com.tzld.piaoquan.longarticle.common.enums.ContentStatusEnum;
-import com.tzld.piaoquan.longarticle.common.enums.SourceTypesEnum;
 import com.tzld.piaoquan.longarticle.component.RedisLock;
-import com.tzld.piaoquan.longarticle.dao.mapper.LongArticlesTextMapper;
-import com.tzld.piaoquan.longarticle.dao.mapper.MatchVideoMapper;
+import com.tzld.piaoquan.longarticle.dao.mapper.aigc.ProducePlanExeRecordMapper;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.LongArticlesTextMapper;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.MatchVideoMapper;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.PromotionSourceMapper;
 import com.tzld.piaoquan.longarticle.model.bo.MatchContent;
-import com.tzld.piaoquan.longarticle.model.dto.MiniprogramCardRequest;
-import com.tzld.piaoquan.longarticle.model.po.LongArticlesText;
-import com.tzld.piaoquan.longarticle.model.po.LongArticlesTextExample;
-import com.tzld.piaoquan.longarticle.model.po.MatchVideo;
-import com.tzld.piaoquan.longarticle.model.po.MatchVideoExample;
-import com.tzld.piaoquan.longarticle.model.vo.MatchMiniprogramStatusParam;
+import com.tzld.piaoquan.longarticle.model.po.aigc.ProducePlanExeRecord;
+import com.tzld.piaoquan.longarticle.model.po.aigc.ProducePlanExeRecordExample;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.*;
 import com.tzld.piaoquan.longarticle.service.local.KimiService;
 import com.tzld.piaoquan.longarticle.utils.page.Page;
 import lombok.extern.slf4j.Slf4j;
@@ -23,7 +20,6 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.*;
 
@@ -55,6 +51,12 @@ public class MatchVideoServiceImpl {
     @Autowired
     private RedisTemplate<String, Object> redisTemplate;
 
+    @Autowired
+    private ProducePlanExeRecordMapper producePlanExeRecordMapper;
+
+    @Autowired
+    private PromotionSourceMapper promotionSourceMapper;
+
 
     // 定义一个阻塞队列
     private static final ArrayBlockingQueue<MatchVideo> matchVideoQueue = new ArrayBlockingQueue<>(100000);
@@ -216,7 +218,8 @@ public class MatchVideoServiceImpl {
             boolean lock = redisLock.tryLock(lockKey, lockValue, 600, TimeUnit.SECONDS);
             if (lock) {
                 LongArticlesText kimiText = kimiService.getKimiText(matchVideo.getContentId());
-                crawlerVideoService.addCrawlerVideo(matchVideo.getContentId(), kimiText);
+                String rootContentId = getRootContentId(matchVideo.getContentId());
+                crawlerVideoService.addCrawlerVideo(matchVideo.getContentId(), rootContentId, kimiText);
                 redisLock.unlock(lockKey, lockValue);
             }
         } else {
@@ -225,6 +228,26 @@ public class MatchVideoServiceImpl {
         }
     }
 
+    private String getRootContentId(String contentId) {
+        ProducePlanExeRecordExample example = new ProducePlanExeRecordExample();
+        example.createCriteria().andPlanExeIdEqualTo(contentId);
+        List<ProducePlanExeRecord> producePlanExeRecords = producePlanExeRecordMapper.selectByExample(example);
+        if (!CollectionUtils.isEmpty(producePlanExeRecords)) {
+            String channelContentId = producePlanExeRecords.get(0).getChannelContentId();
+            if (channelContentId == null) {
+                return null;
+            }
+            PromotionSourceExample promotionSourceExample = new PromotionSourceExample();
+            promotionSourceExample.createCriteria().andChannelContentIdEqualTo(channelContentId);
+            List<PromotionSource> promotionSources = promotionSourceMapper.selectByExample(promotionSourceExample);
+            if (CollectionUtils.isEmpty(promotionSources)) {
+                return null;
+            }
+            return promotionSources.get(0).getRootProduceContentId();
+        }
+        return null;
+    }
+
     private void updateStatus(Integer id, Integer status) {
         MatchVideo matchVideo = new MatchVideo();
         matchVideo.setId(id);

+ 6 - 6
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/PlanAccountServiceImpl.java

@@ -1,11 +1,11 @@
 package com.tzld.piaoquan.longarticle.service.local.impl;
 
-import com.tzld.piaoquan.longarticle.dao.mapper.PlanAccountMapper;
-import com.tzld.piaoquan.longarticle.dao.mapper.PlanMapper;
-import com.tzld.piaoquan.longarticle.model.po.Plan;
-import com.tzld.piaoquan.longarticle.model.po.PlanAccount;
-import com.tzld.piaoquan.longarticle.model.po.PlanAccountExample;
-import com.tzld.piaoquan.longarticle.model.po.PlanExample;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.PlanAccountMapper;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.PlanMapper;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.Plan;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PlanAccount;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PlanAccountExample;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PlanExample;
 import com.tzld.piaoquan.longarticle.service.local.PlanAccountService;
 import com.tzld.piaoquan.longarticle.utils.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;

+ 3 - 4
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/PublicContentServiceImpl.java

@@ -1,10 +1,9 @@
 package com.tzld.piaoquan.longarticle.service.local.impl;
 
-import com.tzld.piaoquan.longarticle.dao.mapper.PublishContentMapper;
-import com.tzld.piaoquan.longarticle.dao.mapper.PublishMiniprogramMapper;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.PublishContentMapper;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.PublishMiniprogramMapper;
 import com.tzld.piaoquan.longarticle.model.dto.PublishArticleData;
-import com.tzld.piaoquan.longarticle.model.po.*;
-import com.tzld.piaoquan.longarticle.model.vo.MatchMiniprogramStatusParam;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.*;
 import com.tzld.piaoquan.longarticle.service.remote.AigcService;
 import com.tzld.piaoquan.longarticle.utils.DateUtil;
 import lombok.extern.slf4j.Slf4j;

+ 5 - 5
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/RootSourceServiceImpl.java

@@ -1,10 +1,10 @@
 package com.tzld.piaoquan.longarticle.service.local.impl;
 
-import com.tzld.piaoquan.longarticle.dao.mapper.RootSourceMapper;
-import com.tzld.piaoquan.longarticle.model.po.PlanAccount;
-import com.tzld.piaoquan.longarticle.model.po.PublishContent;
-import com.tzld.piaoquan.longarticle.model.po.PublishMiniprogram;
-import com.tzld.piaoquan.longarticle.model.po.RootSource;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.RootSourceMapper;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PlanAccount;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PublishContent;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMiniprogram;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.RootSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/remote/VideoService.java

@@ -1,7 +1,7 @@
 package com.tzld.piaoquan.longarticle.service.remote;
 
 import com.tzld.piaoquan.longarticle.model.bo.VideoDetail;
-import com.tzld.piaoquan.longarticle.model.po.PublishMiniprogram;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMiniprogram;
 
 public interface VideoService {
 

+ 3 - 3
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/remote/impl/VideoServiceImpl.java

@@ -4,10 +4,10 @@ import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.tzld.piaoquan.longarticle.dao.mapper.OffVideoMapper;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.OffVideoMapper;
 import com.tzld.piaoquan.longarticle.model.bo.VideoDetail;
-import com.tzld.piaoquan.longarticle.model.po.OffVideo;
-import com.tzld.piaoquan.longarticle.model.po.PublishMiniprogram;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.OffVideo;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMiniprogram;
 import com.tzld.piaoquan.longarticle.service.remote.VideoService;
 import com.tzld.piaoquan.longarticle.utils.HttpClientUtil;
 import com.tzld.piaoquan.longarticle.utils.HttpPoolClientUtil;

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/utils/other/DouyinSearch.java

@@ -4,7 +4,7 @@ import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.tzld.piaoquan.longarticle.model.po.CrawlerVideo;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.CrawlerVideo;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/utils/other/HkspSearch.java

@@ -4,7 +4,7 @@ import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.tzld.piaoquan.longarticle.model.po.CrawlerVideo;
+import com.tzld.piaoquan.longarticle.model.po.longarticle.CrawlerVideo;
 
 
 import java.io.IOException;

+ 72 - 0
long-article-server/src/main/resources/aigc-mybatis-generator-config.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE generatorConfiguration
+        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+<!-- 配置生成器 -->
+<generatorConfiguration>
+    <context id="mysql" defaultModelType="flat">
+        <property name="autoDelimitKeywords" value="true"/>
+        <!-- 生成的Java文件的编码 -->
+        <property name="javaFileEncoding" value="UTF-8"/>
+        <!-- 格式化java代码 -->
+        <property name="javaFormatter" value="org.mybatis.generator.api.dom.DefaultJavaFormatter"/>
+        <!-- 格式化XML代码 -->
+        <property name="xmlFormatter" value="org.mybatis.generator.api.dom.DefaultXmlFormatter"/>
+        <!-- beginningDelimiter和endingDelimiter:指明数据库的用于标记数据库对象名的符号,比如ORACLE就是双引号,MYSQL默认是`反引号; -->
+        <property name="beginningDelimiter" value="`"/>
+        <property name="endingDelimiter" value="`"/>
+
+        <plugin type="org.mybatis.generator.plugins.ToStringPlugin"/>
+        <plugin type="org.mybatis.generator.plugins.UnmergeableXmlMappersPlugin"/>
+        <plugin type="com.tzld.piaoquan.longarticle.dao.generator.PaginationPlugin"/>
+
+        <commentGenerator>
+<!--            <property name="addRemarkComments" value="true"/>-->
+            <property name="suppressDate" value="true"/>
+            <property name="suppressAllComments" value="true"/>
+        </commentGenerator>
+
+        <jdbcConnection driverClass="com.mysql.jdbc.Driver"
+                        connectionURL="jdbc:mysql://rm-t4na9qj85v7790tf84o.mysql.singapore.rds.aliyuncs.com:3306/aigc-admin-prod?useUnicode=true&amp;characterEncoding=utf-8&amp;zeroDateTimeBehavior=convertToNull&amp;useSSL=false"
+                        userId="crawler_admin" password="cyber#crawler_2023">
+        </jdbcConnection>
+
+        <javaTypeResolver type="org.mybatis.generator.internal.types.JavaTypeResolverDefaultImpl">
+            <property name="forceBigDecimals" value="false"/>
+        </javaTypeResolver>
+
+        <javaModelGenerator targetPackage="com.tzld.piaoquan.longarticle.model.po.aigc" targetProject="/Users/shimeng/Desktop/project/long-article-manage/long-article-server/src/main/java">
+            <property name="constructorBased" value="false"/>
+            <property name="enableSubPackages" value="true"/>
+            <property name="immutable" value="false"/>
+        </javaModelGenerator>
+
+        <sqlMapGenerator targetPackage="mapper/aigc" targetProject="/Users/shimeng/Desktop/project/long-article-manage/long-article-server/src/main/resources">
+            <property name="enableSubPackages" value="true"/>
+        </sqlMapGenerator>
+
+        <javaClientGenerator targetPackage="com.tzld.piaoquan.longarticle.dao.mapper.aigc" type="XMLMAPPER"
+                             targetProject="/Users/shimeng/Desktop/project/long-article-manage/long-article-server/src/main/java">
+            <property name="enableSubPackages" value="true"/>
+        </javaClientGenerator>
+<!--        <table tableName="long_articles_match_videos" domainObjectName="MatchVideo" alias="" />-->
+<!--            <columnOverride column="response" javaType="java.lang.String" jdbcType="LONGVARCHAR" />-->
+<!--        </table>-->
+<!--        <table tableName="long_articles_text" domainObjectName="LongArticlesText" alias="">-->
+<!--            <columnOverride column="article_text" javaType="java.lang.String" jdbcType="LONGVARCHAR" />-->
+<!--        </table>-->
+<!--        <table tableName="long_articles_crawler_videos" domainObjectName="CrawlerVideo" alias="">-->
+<!--            <columnOverride column="video_url" javaType="java.lang.String" jdbcType="LONGVARCHAR" />-->
+<!--            <columnOverride column="cover_url" javaType="java.lang.String" jdbcType="LONGVARCHAR" />-->
+<!--        </table>-->
+<!--        <table tableName="long_articles_root_source_id" domainObjectName="RootSource" alias=""/>-->
+        <table tableName="produce_plan_exe_record" domainObjectName="ProducePlanExeRecord" alias=""/>
+<!--            <table tableName="long_articles_plan" domainObjectName="Plan" alias=""/>-->
+
+<!--                <table tableName="long_articles_publish_content" domainObjectName="PublishContent" alias=""/>-->
+<!--                <table tableName="long_articles_publish_miniprogram" domainObjectName="PublishMiniprogram" alias=""/>-->
+<!--        <table tableName="get_off_videos" domainObjectName="OffVideo" alias=""/>-->
+
+    </context>
+
+</generatorConfiguration>

+ 4 - 0
long-article-server/src/main/resources/application-dev.properties

@@ -4,6 +4,10 @@ spring.datasource.username=crawler
 spring.datasource.password=crawler123456@
 spring.datasource.url=jdbc:mysql://rm-bp1k5853td1r25g3n690.mysql.rds.aliyuncs.com:3306/long_articles?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true
 
+aigc.datasource.username=crawler_admin
+aigc.datasource.password=cyber#crawler_2023
+aigc.datasource.url=jdbc:mysql://rm-t4na9qj85v7790tf84o.mysql.singapore.rds.aliyuncs.com:3306/aigc-admin-prod?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true
+
 spring.redis.database=2
 spring.redis.host=r-bp154bpw97gptefiqkpd.redis.rds.aliyuncs.com
 spring.redis.port=6379

+ 13 - 0
long-article-server/src/main/resources/application.properties

@@ -14,6 +14,19 @@ spring.datasource.testOnBorrow=false
 spring.datasource.testOnReturn=false
 spring.datasource.poolPreparedStatements=true
 
+
+aigc.datasource.initialSize=5
+aigc.datasource.maxActive=20
+aigc.datasource.maxWait=60000
+aigc.datasource.timeBetweenEvictionRunsMillis=60000
+aigc.datasource.minEvictableIdleTimeMillis=300000
+aigc.datasource.validationQuery=SELECT 1 FROM DUAL
+aigc.datasource.testWhileIdle=true
+aigc.datasource.testOnBorrow=false
+aigc.datasource.testOnReturn=false
+aigc.datasource.poolPreparedStatements=true
+
+
 spring.redis.lettuce.pool.max-active=8
 spring.redis.lettuce.pool.max-wait=-1
 spring.redis.lettuce.pool.max-idle=8

+ 327 - 0
long-article-server/src/main/resources/mapper/aigc/ProducePlanExeRecordMapper.xml

@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.aigc.ProducePlanExeRecordMapper">
+  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.aigc.ProducePlanExeRecord">
+    <id column="plan_exe_id" jdbcType="VARCHAR" property="planExeId" />
+    <result column="plan_id" jdbcType="VARCHAR" property="planId" />
+    <result column="channel_content_id" jdbcType="VARCHAR" property="channelContentId" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="error_msg" jdbcType="VARCHAR" property="errorMsg" />
+    <result column="create_timestamp" jdbcType="BIGINT" property="createTimestamp" />
+    <result column="update_timestamp" jdbcType="BIGINT" property="updateTimestamp" />
+    <result column="produce_timestamp" jdbcType="BIGINT" property="produceTimestamp" />
+    <result column="audit_status" jdbcType="INTEGER" property="auditStatus" />
+    <result column="audit_account" jdbcType="VARCHAR" property="auditAccount" />
+    <result column="audit_timestamp" jdbcType="BIGINT" property="auditTimestamp" />
+    <result column="audit_count" jdbcType="INTEGER" property="auditCount" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    plan_exe_id, plan_id, channel_content_id, `status`, error_msg, create_timestamp, 
+    update_timestamp, produce_timestamp, audit_status, audit_account, audit_timestamp, 
+    audit_count
+  </sql>
+  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.aigc.ProducePlanExeRecordExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from produce_plan_exe_record
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+    <if test="page != null">
+      limit #{page.offset} , #{page.pageSize}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from produce_plan_exe_record
+    where plan_exe_id = #{planExeId,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from produce_plan_exe_record
+    where plan_exe_id = #{planExeId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.aigc.ProducePlanExeRecordExample">
+    delete from produce_plan_exe_record
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.aigc.ProducePlanExeRecord">
+    insert into produce_plan_exe_record (plan_exe_id, plan_id, channel_content_id, 
+      `status`, error_msg, create_timestamp, 
+      update_timestamp, produce_timestamp, audit_status, 
+      audit_account, audit_timestamp, audit_count
+      )
+    values (#{planExeId,jdbcType=VARCHAR}, #{planId,jdbcType=VARCHAR}, #{channelContentId,jdbcType=VARCHAR}, 
+      #{status,jdbcType=INTEGER}, #{errorMsg,jdbcType=VARCHAR}, #{createTimestamp,jdbcType=BIGINT}, 
+      #{updateTimestamp,jdbcType=BIGINT}, #{produceTimestamp,jdbcType=BIGINT}, #{auditStatus,jdbcType=INTEGER}, 
+      #{auditAccount,jdbcType=VARCHAR}, #{auditTimestamp,jdbcType=BIGINT}, #{auditCount,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.aigc.ProducePlanExeRecord">
+    insert into produce_plan_exe_record
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="planExeId != null">
+        plan_exe_id,
+      </if>
+      <if test="planId != null">
+        plan_id,
+      </if>
+      <if test="channelContentId != null">
+        channel_content_id,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="errorMsg != null">
+        error_msg,
+      </if>
+      <if test="createTimestamp != null">
+        create_timestamp,
+      </if>
+      <if test="updateTimestamp != null">
+        update_timestamp,
+      </if>
+      <if test="produceTimestamp != null">
+        produce_timestamp,
+      </if>
+      <if test="auditStatus != null">
+        audit_status,
+      </if>
+      <if test="auditAccount != null">
+        audit_account,
+      </if>
+      <if test="auditTimestamp != null">
+        audit_timestamp,
+      </if>
+      <if test="auditCount != null">
+        audit_count,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="planExeId != null">
+        #{planExeId,jdbcType=VARCHAR},
+      </if>
+      <if test="planId != null">
+        #{planId,jdbcType=VARCHAR},
+      </if>
+      <if test="channelContentId != null">
+        #{channelContentId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="errorMsg != null">
+        #{errorMsg,jdbcType=VARCHAR},
+      </if>
+      <if test="createTimestamp != null">
+        #{createTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="updateTimestamp != null">
+        #{updateTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="produceTimestamp != null">
+        #{produceTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="auditStatus != null">
+        #{auditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="auditAccount != null">
+        #{auditAccount,jdbcType=VARCHAR},
+      </if>
+      <if test="auditTimestamp != null">
+        #{auditTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="auditCount != null">
+        #{auditCount,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.aigc.ProducePlanExeRecordExample" resultType="java.lang.Long">
+    select count(*) from produce_plan_exe_record
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update produce_plan_exe_record
+    <set>
+      <if test="record.planExeId != null">
+        plan_exe_id = #{record.planExeId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.planId != null">
+        plan_id = #{record.planId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.channelContentId != null">
+        channel_content_id = #{record.channelContentId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        `status` = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.errorMsg != null">
+        error_msg = #{record.errorMsg,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTimestamp != null">
+        create_timestamp = #{record.createTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="record.updateTimestamp != null">
+        update_timestamp = #{record.updateTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="record.produceTimestamp != null">
+        produce_timestamp = #{record.produceTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="record.auditStatus != null">
+        audit_status = #{record.auditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.auditAccount != null">
+        audit_account = #{record.auditAccount,jdbcType=VARCHAR},
+      </if>
+      <if test="record.auditTimestamp != null">
+        audit_timestamp = #{record.auditTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="record.auditCount != null">
+        audit_count = #{record.auditCount,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update produce_plan_exe_record
+    set plan_exe_id = #{record.planExeId,jdbcType=VARCHAR},
+      plan_id = #{record.planId,jdbcType=VARCHAR},
+      channel_content_id = #{record.channelContentId,jdbcType=VARCHAR},
+      `status` = #{record.status,jdbcType=INTEGER},
+      error_msg = #{record.errorMsg,jdbcType=VARCHAR},
+      create_timestamp = #{record.createTimestamp,jdbcType=BIGINT},
+      update_timestamp = #{record.updateTimestamp,jdbcType=BIGINT},
+      produce_timestamp = #{record.produceTimestamp,jdbcType=BIGINT},
+      audit_status = #{record.auditStatus,jdbcType=INTEGER},
+      audit_account = #{record.auditAccount,jdbcType=VARCHAR},
+      audit_timestamp = #{record.auditTimestamp,jdbcType=BIGINT},
+      audit_count = #{record.auditCount,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.aigc.ProducePlanExeRecord">
+    update produce_plan_exe_record
+    <set>
+      <if test="planId != null">
+        plan_id = #{planId,jdbcType=VARCHAR},
+      </if>
+      <if test="channelContentId != null">
+        channel_content_id = #{channelContentId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="errorMsg != null">
+        error_msg = #{errorMsg,jdbcType=VARCHAR},
+      </if>
+      <if test="createTimestamp != null">
+        create_timestamp = #{createTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="updateTimestamp != null">
+        update_timestamp = #{updateTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="produceTimestamp != null">
+        produce_timestamp = #{produceTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="auditStatus != null">
+        audit_status = #{auditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="auditAccount != null">
+        audit_account = #{auditAccount,jdbcType=VARCHAR},
+      </if>
+      <if test="auditTimestamp != null">
+        audit_timestamp = #{auditTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="auditCount != null">
+        audit_count = #{auditCount,jdbcType=INTEGER},
+      </if>
+    </set>
+    where plan_exe_id = #{planExeId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.aigc.ProducePlanExeRecord">
+    update produce_plan_exe_record
+    set plan_id = #{planId,jdbcType=VARCHAR},
+      channel_content_id = #{channelContentId,jdbcType=VARCHAR},
+      `status` = #{status,jdbcType=INTEGER},
+      error_msg = #{errorMsg,jdbcType=VARCHAR},
+      create_timestamp = #{createTimestamp,jdbcType=BIGINT},
+      update_timestamp = #{updateTimestamp,jdbcType=BIGINT},
+      produce_timestamp = #{produceTimestamp,jdbcType=BIGINT},
+      audit_status = #{auditStatus,jdbcType=INTEGER},
+      audit_account = #{auditAccount,jdbcType=VARCHAR},
+      audit_timestamp = #{auditTimestamp,jdbcType=BIGINT},
+      audit_count = #{auditCount,jdbcType=INTEGER}
+    where plan_exe_id = #{planExeId,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 9 - 9
long-article-server/src/main/resources/mapper/AccountSpecialSettingsMapper.xml → long-article-server/src/main/resources/mapper/longarticle/AccountSpecialSettingsMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.AccountSpecialSettingsMapper">
-  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.AccountSpecialSettings">
+<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.longarticle.AccountSpecialSettingsMapper">
+  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.longarticle.AccountSpecialSettings">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="special_setting_id" jdbcType="VARCHAR" property="specialSettingId" />
     <result column="effective_date" jdbcType="VARCHAR" property="effectiveDate" />
@@ -76,7 +76,7 @@
     id, special_setting_id, effective_date, account_id, publish_push_time, push_type, 
     publish_num, exclude_content_index, is_delete, create_time, update_time
   </sql>
-  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.AccountSpecialSettingsExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.AccountSpecialSettingsExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
@@ -103,13 +103,13 @@
     delete from long_articles_account_special_settings
     where id = #{id,jdbcType=BIGINT}
   </delete>
-  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.AccountSpecialSettingsExample">
+  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.AccountSpecialSettingsExample">
     delete from long_articles_account_special_settings
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.AccountSpecialSettings">
+  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.AccountSpecialSettings">
     insert into long_articles_account_special_settings (id, special_setting_id, effective_date, 
       account_id, publish_push_time, push_type, 
       publish_num, exclude_content_index, is_delete, 
@@ -119,7 +119,7 @@
       #{publishNum,jdbcType=INTEGER}, #{excludeContentIndex,jdbcType=VARCHAR}, #{isDelete,jdbcType=INTEGER}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.AccountSpecialSettings">
+  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.AccountSpecialSettings">
     insert into long_articles_account_special_settings
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -192,7 +192,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.AccountSpecialSettingsExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.AccountSpecialSettingsExample" resultType="java.lang.Long">
     select count(*) from long_articles_account_special_settings
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
@@ -256,7 +256,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.AccountSpecialSettings">
+  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.AccountSpecialSettings">
     update long_articles_account_special_settings
     <set>
       <if test="specialSettingId != null">
@@ -292,7 +292,7 @@
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.AccountSpecialSettings">
+  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.AccountSpecialSettings">
     update long_articles_account_special_settings
     set special_setting_id = #{specialSettingId,jdbcType=VARCHAR},
       effective_date = #{effectiveDate,jdbcType=VARCHAR},

+ 12 - 12
long-article-server/src/main/resources/mapper/CrawlerVideoMapper.xml → long-article-server/src/main/resources/mapper/longarticle/CrawlerVideoMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.CrawlerVideoMapper">
-  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.CrawlerVideo">
+<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.longarticle.CrawlerVideoMapper">
+  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.longarticle.CrawlerVideo">
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="content_id" jdbcType="VARCHAR" property="contentId" />
     <result column="out_video_id" jdbcType="VARCHAR" property="outVideoId" />
@@ -25,7 +25,7 @@
     <result column="audit_timestamp" jdbcType="BIGINT" property="auditTimestamp" />
     <result column="score_version" jdbcType="TINYINT" property="scoreVersion" />
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.tzld.piaoquan.longarticle.model.po.CrawlerVideo">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.tzld.piaoquan.longarticle.model.po.longarticle.CrawlerVideo">
     <result column="video_url" jdbcType="LONGVARCHAR" property="videoUrl" />
     <result column="cover_url" jdbcType="LONGVARCHAR" property="coverUrl" />
   </resultMap>
@@ -95,7 +95,7 @@
   <sql id="Blob_Column_List">
     video_url, cover_url
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.tzld.piaoquan.longarticle.model.po.CrawlerVideoExample" resultMap="ResultMapWithBLOBs">
+  <select id="selectByExampleWithBLOBs" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.CrawlerVideoExample" resultMap="ResultMapWithBLOBs">
     select
     <if test="distinct">
       distinct
@@ -114,7 +114,7 @@
       limit #{page.offset} , #{page.pageSize}
     </if>
   </select>
-  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.CrawlerVideoExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.CrawlerVideoExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
@@ -143,13 +143,13 @@
     delete from long_articles_crawler_videos
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.CrawlerVideoExample">
+  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.CrawlerVideoExample">
     delete from long_articles_crawler_videos
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.CrawlerVideo">
+  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.CrawlerVideo">
     insert into long_articles_crawler_videos (id, content_id, out_video_id, 
       platform, video_title, play_count, 
       like_count, share_count, publish_time, 
@@ -169,7 +169,7 @@
       #{scoreVersion,jdbcType=TINYINT}, #{videoUrl,jdbcType=LONGVARCHAR}, #{coverUrl,jdbcType=LONGVARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.CrawlerVideo">
+  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.CrawlerVideo">
     insert into long_articles_crawler_videos
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -320,7 +320,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.CrawlerVideoExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.CrawlerVideoExample" resultType="java.lang.Long">
     select count(*) from long_articles_crawler_videos
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
@@ -464,7 +464,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.CrawlerVideo">
+  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.CrawlerVideo">
     update long_articles_crawler_videos
     <set>
       <if test="contentId != null">
@@ -539,7 +539,7 @@
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.tzld.piaoquan.longarticle.model.po.CrawlerVideo">
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.CrawlerVideo">
     update long_articles_crawler_videos
     set content_id = #{contentId,jdbcType=VARCHAR},
       out_video_id = #{outVideoId,jdbcType=VARCHAR},
@@ -566,7 +566,7 @@
       cover_url = #{coverUrl,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.CrawlerVideo">
+  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.CrawlerVideo">
     update long_articles_crawler_videos
     set content_id = #{contentId,jdbcType=VARCHAR},
       out_video_id = #{outVideoId,jdbcType=VARCHAR},

+ 12 - 12
long-article-server/src/main/resources/mapper/LongArticlesTextMapper.xml → long-article-server/src/main/resources/mapper/longarticle/LongArticlesTextMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.LongArticlesTextMapper">
-  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.LongArticlesText">
+<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.longarticle.LongArticlesTextMapper">
+  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.longarticle.LongArticlesText">
     <id column="content_id" jdbcType="VARCHAR" property="contentId" />
     <result column="article_title" jdbcType="VARCHAR" property="articleTitle" />
     <result column="kimi_title" jdbcType="VARCHAR" property="kimiTitle" />
@@ -9,7 +9,7 @@
     <result column="kimi_keys" jdbcType="VARCHAR" property="kimiKeys" />
     <result column="kimi_status" jdbcType="INTEGER" property="kimiStatus" />
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.tzld.piaoquan.longarticle.model.po.LongArticlesText">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.tzld.piaoquan.longarticle.model.po.longarticle.LongArticlesText">
     <result column="article_text" jdbcType="LONGVARCHAR" property="articleText" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -76,7 +76,7 @@
   <sql id="Blob_Column_List">
     article_text
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.tzld.piaoquan.longarticle.model.po.LongArticlesTextExample" resultMap="ResultMapWithBLOBs">
+  <select id="selectByExampleWithBLOBs" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.LongArticlesTextExample" resultMap="ResultMapWithBLOBs">
     select
     <if test="distinct">
       distinct
@@ -95,7 +95,7 @@
       limit #{page.offset} , #{page.pageSize}
     </if>
   </select>
-  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.LongArticlesTextExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.LongArticlesTextExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
@@ -124,13 +124,13 @@
     delete from long_articles_text
     where content_id = #{contentId,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.LongArticlesTextExample">
+  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.LongArticlesTextExample">
     delete from long_articles_text
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.LongArticlesText">
+  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.LongArticlesText">
     insert into long_articles_text (content_id, article_title, kimi_title,
                                     kimi_summary, kimi_keys, kimi_status,
                                     article_text)
@@ -138,7 +138,7 @@
             #{kimiSummary,jdbcType=VARCHAR}, #{kimiKeys,jdbcType=VARCHAR}, #{kimiStatus,jdbcType=INTEGER},
             #{articleText,jdbcType=LONGVARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.LongArticlesText">
+  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.LongArticlesText">
     insert into long_articles_text
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="contentId != null">
@@ -187,7 +187,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.LongArticlesTextExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.LongArticlesTextExample" resultType="java.lang.Long">
     select count(*) from long_articles_text
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
@@ -247,7 +247,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.LongArticlesText">
+  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.LongArticlesText">
     update long_articles_text
     <set>
       <if test="articleTitle != null">
@@ -271,7 +271,7 @@
     </set>
     where content_id = #{contentId,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.tzld.piaoquan.longarticle.model.po.LongArticlesText">
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.LongArticlesText">
     update long_articles_text
     set article_title = #{articleTitle,jdbcType=VARCHAR},
         kimi_title = #{kimiTitle,jdbcType=VARCHAR},
@@ -281,7 +281,7 @@
         article_text = #{articleText,jdbcType=LONGVARCHAR}
     where content_id = #{contentId,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.LongArticlesText">
+  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.LongArticlesText">
     update long_articles_text
     set article_title = #{articleTitle,jdbcType=VARCHAR},
         kimi_title = #{kimiTitle,jdbcType=VARCHAR},

+ 12 - 12
long-article-server/src/main/resources/mapper/MatchVideoMapper.xml → long-article-server/src/main/resources/mapper/longarticle/MatchVideoMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.MatchVideoMapper">
-  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.MatchVideo">
+<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.longarticle.MatchVideoMapper">
+  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.longarticle.MatchVideo">
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="trace_id" jdbcType="VARCHAR" property="traceId" />
     <result column="content_id" jdbcType="VARCHAR" property="contentId" />
@@ -16,7 +16,7 @@
     <result column="process_times" jdbcType="INTEGER" property="processTimes" />
     <result column="publish_flag" jdbcType="INTEGER" property="publishFlag" />
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.tzld.piaoquan.longarticle.model.po.MatchVideo">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.tzld.piaoquan.longarticle.model.po.longarticle.MatchVideo">
     <result column="response" jdbcType="LONGVARCHAR" property="response" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -84,7 +84,7 @@
   <sql id="Blob_Column_List">
     response
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.tzld.piaoquan.longarticle.model.po.MatchVideoExample" resultMap="ResultMapWithBLOBs">
+  <select id="selectByExampleWithBLOBs" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.MatchVideoExample" resultMap="ResultMapWithBLOBs">
     select
     <if test="distinct">
       distinct
@@ -103,7 +103,7 @@
       limit #{page.offset} , #{page.pageSize}
     </if>
   </select>
-  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.MatchVideoExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.MatchVideoExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
@@ -132,13 +132,13 @@
     delete from long_articles_match_videos
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.MatchVideoExample">
+  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.MatchVideoExample">
     delete from long_articles_match_videos
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.MatchVideo">
+  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.MatchVideo">
     insert into long_articles_match_videos (id, trace_id, content_id, 
       flow_pool_level, gh_id, account_name, 
       content_status, content_status_update_time, 
@@ -152,7 +152,7 @@
       #{processTimes,jdbcType=INTEGER}, #{publishFlag,jdbcType=INTEGER}, #{response,jdbcType=LONGVARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.MatchVideo">
+  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.MatchVideo">
     insert into long_articles_match_videos
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -243,7 +243,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.MatchVideoExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.MatchVideoExample" resultType="java.lang.Long">
     select count(*) from long_articles_match_videos
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
@@ -338,7 +338,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.MatchVideo">
+  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.MatchVideo">
     update long_articles_match_videos
     <set>
       <if test="traceId != null">
@@ -383,7 +383,7 @@
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.tzld.piaoquan.longarticle.model.po.MatchVideo">
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.MatchVideo">
     update long_articles_match_videos
     set trace_id = #{traceId,jdbcType=VARCHAR},
       content_id = #{contentId,jdbcType=VARCHAR},
@@ -400,7 +400,7 @@
       response = #{response,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.MatchVideo">
+  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.MatchVideo">
     update long_articles_match_videos
     set trace_id = #{traceId,jdbcType=VARCHAR},
       content_id = #{contentId,jdbcType=VARCHAR},

+ 9 - 9
long-article-server/src/main/resources/mapper/OffVideoMapper.xml → long-article-server/src/main/resources/mapper/longarticle/OffVideoMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.OffVideoMapper">
-  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.OffVideo">
+<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.longarticle.OffVideoMapper">
+  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.longarticle.OffVideo">
     <id column="video_id" jdbcType="BIGINT" property="videoId" />
     <result column="publish_time" jdbcType="BIGINT" property="publishTime" />
     <result column="video_status" jdbcType="INTEGER" property="videoStatus" />
@@ -70,7 +70,7 @@
   <sql id="Base_Column_List">
     video_id, publish_time, video_status, trace_id, get_off_time, check_status
   </sql>
-  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.OffVideoExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.OffVideoExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
@@ -97,13 +97,13 @@
     delete from get_off_videos
     where video_id = #{videoId,jdbcType=BIGINT}
   </delete>
-  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.OffVideoExample">
+  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.OffVideoExample">
     delete from get_off_videos
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.OffVideo">
+  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.OffVideo">
     insert into get_off_videos (video_id, publish_time, video_status, 
       trace_id, get_off_time, check_status
       )
@@ -111,7 +111,7 @@
       #{traceId,jdbcType=VARCHAR}, #{getOffTime,jdbcType=BIGINT}, #{checkStatus,jdbcType=INTEGER}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.OffVideo">
+  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.OffVideo">
     insert into get_off_videos
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="videoId != null">
@@ -154,7 +154,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.OffVideoExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.OffVideoExample" resultType="java.lang.Long">
     select count(*) from get_off_videos
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
@@ -198,7 +198,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.OffVideo">
+  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.OffVideo">
     update get_off_videos
     <set>
       <if test="publishTime != null">
@@ -219,7 +219,7 @@
     </set>
     where video_id = #{videoId,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.OffVideo">
+  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.OffVideo">
     update get_off_videos
     set publish_time = #{publishTime,jdbcType=BIGINT},
       video_status = #{videoStatus,jdbcType=INTEGER},

+ 9 - 9
long-article-server/src/main/resources/mapper/PlanAccountMapper.xml → long-article-server/src/main/resources/mapper/longarticle/PlanAccountMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.PlanAccountMapper">
-  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.PlanAccount">
+<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.longarticle.PlanAccountMapper">
+  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.longarticle.PlanAccount">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="plan_id" jdbcType="VARCHAR" property="planId" />
     <result column="plan_name" jdbcType="VARCHAR" property="planName" />
@@ -97,7 +97,7 @@
     miniprogram_use_type, sort_strategy, exclude_content_index, `status`, match_status, 
     retry_count, send_count, publish_open_flag, is_delete, create_time, update_time
   </sql>
-  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PlanAccountExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PlanAccountExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
@@ -124,13 +124,13 @@
     delete from long_articles_plan_account
     where id = #{id,jdbcType=BIGINT}
   </delete>
-  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PlanAccountExample">
+  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PlanAccountExample">
     delete from long_articles_plan_account
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.PlanAccount">
+  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PlanAccount">
     insert into long_articles_plan_account (id, plan_id, plan_name, 
       account_id, account_name, gh_id, 
       publish_rate, publish_date, publish_window_start, 
@@ -154,7 +154,7 @@
       #{isDelete,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.PlanAccount">
+  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PlanAccount">
     insert into long_articles_plan_account
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -335,7 +335,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PlanAccountExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PlanAccountExample" resultType="java.lang.Long">
     select count(*) from long_articles_plan_account
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
@@ -471,7 +471,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.PlanAccount">
+  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PlanAccount">
     update long_articles_plan_account
     <set>
       <if test="planId != null">
@@ -561,7 +561,7 @@
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.PlanAccount">
+  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PlanAccount">
     update long_articles_plan_account
     set plan_id = #{planId,jdbcType=VARCHAR},
       plan_name = #{planName,jdbcType=VARCHAR},

+ 9 - 9
long-article-server/src/main/resources/mapper/PlanMapper.xml → long-article-server/src/main/resources/mapper/longarticle/PlanMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.PlanMapper">
-  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.Plan">
+<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.longarticle.PlanMapper">
+  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.longarticle.Plan">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="plan_id" jdbcType="VARCHAR" property="planId" />
     <result column="plan_name" jdbcType="VARCHAR" property="planName" />
@@ -83,7 +83,7 @@
     publish_time_interval, publish_num, publish_pre_num, publish_pre_min_num, publish_push_time, 
     push_type, miniprogram_insert_flag, is_delete, create_time, update_time
   </sql>
-  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PlanExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PlanExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
@@ -110,13 +110,13 @@
     delete from long_articles_plan
     where id = #{id,jdbcType=BIGINT}
   </delete>
-  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PlanExample">
+  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PlanExample">
     delete from long_articles_plan
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.Plan">
+  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.Plan">
     insert into long_articles_plan (id, plan_id, plan_name, 
       publish_rate, publish_date, publish_window_start, 
       publish_window_end, publish_time_interval, 
@@ -132,7 +132,7 @@
       #{isDelete,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.Plan">
+  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.Plan">
     insert into long_articles_plan
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -241,7 +241,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PlanExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PlanExample" resultType="java.lang.Long">
     select count(*) from long_articles_plan
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
@@ -329,7 +329,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.Plan">
+  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.Plan">
     update long_articles_plan
     <set>
       <if test="planId != null">
@@ -383,7 +383,7 @@
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.Plan">
+  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.Plan">
     update long_articles_plan
     set plan_id = #{planId,jdbcType=VARCHAR},
       plan_name = #{planName,jdbcType=VARCHAR},

+ 326 - 0
long-article-server/src/main/resources/mapper/longarticle/PromotionSourceMapper.xml

@@ -0,0 +1,326 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.longarticle.PromotionSourceMapper">
+  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.longarticle.PromotionSource">
+    <id column="channel_content_id" jdbcType="VARCHAR" property="channelContentId" />
+    <result column="source_publish_content_id" jdbcType="VARCHAR" property="sourcePublishContentId" />
+    <result column="root_publish_content_id" jdbcType="VARCHAR" property="rootPublishContentId" />
+    <result column="root_produce_content_id" jdbcType="VARCHAR" property="rootProduceContentId" />
+    <result column="wx_sn" jdbcType="VARCHAR" property="wxSn" />
+    <result column="title" jdbcType="VARCHAR" property="title" />
+    <result column="title_md5" jdbcType="VARCHAR" property="titleMd5" />
+    <result column="level" jdbcType="VARCHAR" property="level" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="deleted" jdbcType="INTEGER" property="deleted" />
+    <result column="create_timestamp" jdbcType="BIGINT" property="createTimestamp" />
+    <result column="update_timestamp" jdbcType="BIGINT" property="updateTimestamp" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    channel_content_id, source_publish_content_id, root_publish_content_id, root_produce_content_id, 
+    wx_sn, title, title_md5, `level`, `status`, deleted, create_timestamp, update_timestamp
+  </sql>
+  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PromotionSourceExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from article_pool_promotion_source
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+    <if test="page != null">
+      limit #{page.offset} , #{page.pageSize}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from article_pool_promotion_source
+    where channel_content_id = #{channelContentId,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from article_pool_promotion_source
+    where channel_content_id = #{channelContentId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PromotionSourceExample">
+    delete from article_pool_promotion_source
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PromotionSource">
+    insert into article_pool_promotion_source (channel_content_id, source_publish_content_id, 
+      root_publish_content_id, root_produce_content_id, 
+      wx_sn, title, title_md5, 
+      `level`, `status`, deleted, 
+      create_timestamp, update_timestamp)
+    values (#{channelContentId,jdbcType=VARCHAR}, #{sourcePublishContentId,jdbcType=VARCHAR}, 
+      #{rootPublishContentId,jdbcType=VARCHAR}, #{rootProduceContentId,jdbcType=VARCHAR}, 
+      #{wxSn,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{titleMd5,jdbcType=VARCHAR}, 
+      #{level,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{deleted,jdbcType=INTEGER}, 
+      #{createTimestamp,jdbcType=BIGINT}, #{updateTimestamp,jdbcType=BIGINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PromotionSource">
+    insert into article_pool_promotion_source
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="channelContentId != null">
+        channel_content_id,
+      </if>
+      <if test="sourcePublishContentId != null">
+        source_publish_content_id,
+      </if>
+      <if test="rootPublishContentId != null">
+        root_publish_content_id,
+      </if>
+      <if test="rootProduceContentId != null">
+        root_produce_content_id,
+      </if>
+      <if test="wxSn != null">
+        wx_sn,
+      </if>
+      <if test="title != null">
+        title,
+      </if>
+      <if test="titleMd5 != null">
+        title_md5,
+      </if>
+      <if test="level != null">
+        `level`,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="deleted != null">
+        deleted,
+      </if>
+      <if test="createTimestamp != null">
+        create_timestamp,
+      </if>
+      <if test="updateTimestamp != null">
+        update_timestamp,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="channelContentId != null">
+        #{channelContentId,jdbcType=VARCHAR},
+      </if>
+      <if test="sourcePublishContentId != null">
+        #{sourcePublishContentId,jdbcType=VARCHAR},
+      </if>
+      <if test="rootPublishContentId != null">
+        #{rootPublishContentId,jdbcType=VARCHAR},
+      </if>
+      <if test="rootProduceContentId != null">
+        #{rootProduceContentId,jdbcType=VARCHAR},
+      </if>
+      <if test="wxSn != null">
+        #{wxSn,jdbcType=VARCHAR},
+      </if>
+      <if test="title != null">
+        #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="titleMd5 != null">
+        #{titleMd5,jdbcType=VARCHAR},
+      </if>
+      <if test="level != null">
+        #{level,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=INTEGER},
+      </if>
+      <if test="createTimestamp != null">
+        #{createTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="updateTimestamp != null">
+        #{updateTimestamp,jdbcType=BIGINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PromotionSourceExample" resultType="java.lang.Long">
+    select count(*) from article_pool_promotion_source
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update article_pool_promotion_source
+    <set>
+      <if test="record.channelContentId != null">
+        channel_content_id = #{record.channelContentId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sourcePublishContentId != null">
+        source_publish_content_id = #{record.sourcePublishContentId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.rootPublishContentId != null">
+        root_publish_content_id = #{record.rootPublishContentId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.rootProduceContentId != null">
+        root_produce_content_id = #{record.rootProduceContentId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wxSn != null">
+        wx_sn = #{record.wxSn,jdbcType=VARCHAR},
+      </if>
+      <if test="record.title != null">
+        title = #{record.title,jdbcType=VARCHAR},
+      </if>
+      <if test="record.titleMd5 != null">
+        title_md5 = #{record.titleMd5,jdbcType=VARCHAR},
+      </if>
+      <if test="record.level != null">
+        `level` = #{record.level,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        `status` = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.deleted != null">
+        deleted = #{record.deleted,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTimestamp != null">
+        create_timestamp = #{record.createTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="record.updateTimestamp != null">
+        update_timestamp = #{record.updateTimestamp,jdbcType=BIGINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update article_pool_promotion_source
+    set channel_content_id = #{record.channelContentId,jdbcType=VARCHAR},
+      source_publish_content_id = #{record.sourcePublishContentId,jdbcType=VARCHAR},
+      root_publish_content_id = #{record.rootPublishContentId,jdbcType=VARCHAR},
+      root_produce_content_id = #{record.rootProduceContentId,jdbcType=VARCHAR},
+      wx_sn = #{record.wxSn,jdbcType=VARCHAR},
+      title = #{record.title,jdbcType=VARCHAR},
+      title_md5 = #{record.titleMd5,jdbcType=VARCHAR},
+      `level` = #{record.level,jdbcType=VARCHAR},
+      `status` = #{record.status,jdbcType=INTEGER},
+      deleted = #{record.deleted,jdbcType=INTEGER},
+      create_timestamp = #{record.createTimestamp,jdbcType=BIGINT},
+      update_timestamp = #{record.updateTimestamp,jdbcType=BIGINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PromotionSource">
+    update article_pool_promotion_source
+    <set>
+      <if test="sourcePublishContentId != null">
+        source_publish_content_id = #{sourcePublishContentId,jdbcType=VARCHAR},
+      </if>
+      <if test="rootPublishContentId != null">
+        root_publish_content_id = #{rootPublishContentId,jdbcType=VARCHAR},
+      </if>
+      <if test="rootProduceContentId != null">
+        root_produce_content_id = #{rootProduceContentId,jdbcType=VARCHAR},
+      </if>
+      <if test="wxSn != null">
+        wx_sn = #{wxSn,jdbcType=VARCHAR},
+      </if>
+      <if test="title != null">
+        title = #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="titleMd5 != null">
+        title_md5 = #{titleMd5,jdbcType=VARCHAR},
+      </if>
+      <if test="level != null">
+        `level` = #{level,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="deleted != null">
+        deleted = #{deleted,jdbcType=INTEGER},
+      </if>
+      <if test="createTimestamp != null">
+        create_timestamp = #{createTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="updateTimestamp != null">
+        update_timestamp = #{updateTimestamp,jdbcType=BIGINT},
+      </if>
+    </set>
+    where channel_content_id = #{channelContentId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PromotionSource">
+    update article_pool_promotion_source
+    set source_publish_content_id = #{sourcePublishContentId,jdbcType=VARCHAR},
+      root_publish_content_id = #{rootPublishContentId,jdbcType=VARCHAR},
+      root_produce_content_id = #{rootProduceContentId,jdbcType=VARCHAR},
+      wx_sn = #{wxSn,jdbcType=VARCHAR},
+      title = #{title,jdbcType=VARCHAR},
+      title_md5 = #{titleMd5,jdbcType=VARCHAR},
+      `level` = #{level,jdbcType=VARCHAR},
+      `status` = #{status,jdbcType=INTEGER},
+      deleted = #{deleted,jdbcType=INTEGER},
+      create_timestamp = #{createTimestamp,jdbcType=BIGINT},
+      update_timestamp = #{updateTimestamp,jdbcType=BIGINT}
+    where channel_content_id = #{channelContentId,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 9 - 9
long-article-server/src/main/resources/mapper/PublishContentMapper.xml → long-article-server/src/main/resources/mapper/longarticle/PublishContentMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.PublishContentMapper">
-  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.PublishContent">
+<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.longarticle.PublishContentMapper">
+  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishContent">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="plan_account_id" jdbcType="BIGINT" property="planAccountId" />
     <result column="publish_content_id" jdbcType="VARCHAR" property="publishContentId" />
@@ -78,7 +78,7 @@
     id, plan_account_id, publish_content_id, source_id, score, content_pool_type, source_type, 
     `status`, push_id, reason, trace_id, create_time, update_time
   </sql>
-  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishContentExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishContentExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
@@ -105,13 +105,13 @@
     delete from long_articles_publish_content
     where id = #{id,jdbcType=BIGINT}
   </delete>
-  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishContentExample">
+  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishContentExample">
     delete from long_articles_publish_content
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishContent">
+  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishContent">
     insert into long_articles_publish_content (id, plan_account_id, publish_content_id, 
       source_id, score, content_pool_type, 
       source_type, `status`, push_id, 
@@ -123,7 +123,7 @@
       #{reason,jdbcType=VARCHAR}, #{traceId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishContent" useGeneratedKeys="true" keyProperty="id">
+  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishContent" useGeneratedKeys="true" keyProperty="id">
     insert into long_articles_publish_content
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -211,7 +211,7 @@
           select LAST_INSERT_ID()
       </selectKey>
   </insert>
-  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishContentExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishContentExample" resultType="java.lang.Long">
     select count(*) from long_articles_publish_content
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
@@ -283,7 +283,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishContent">
+  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishContent">
     update long_articles_publish_content
     <set>
       <if test="planAccountId != null">
@@ -325,7 +325,7 @@
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishContent">
+  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishContent">
     update long_articles_publish_content
     set plan_account_id = #{planAccountId,jdbcType=BIGINT},
       publish_content_id = #{publishContentId,jdbcType=VARCHAR},

+ 9 - 9
long-article-server/src/main/resources/mapper/PublishMatchContentMapper.xml → long-article-server/src/main/resources/mapper/longarticle/PublishMatchContentMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.PublishMatchContentMapper">
-  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.PublishMatchContent">
+<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.longarticle.PublishMatchContentMapper">
+  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMatchContent">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="trace_id" jdbcType="VARCHAR" property="traceId" />
     <result column="gh_id" jdbcType="VARCHAR" property="ghId" />
@@ -72,7 +72,7 @@
   <sql id="Base_Column_List">
     id, trace_id, gh_id, content_id, publish_content_id, `status`, create_time, update_time
   </sql>
-  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishMatchContentExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMatchContentExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
@@ -99,13 +99,13 @@
     delete from long_articles_publish_match_content
     where id = #{id,jdbcType=BIGINT}
   </delete>
-  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishMatchContentExample">
+  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMatchContentExample">
     delete from long_articles_publish_match_content
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishMatchContent">
+  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMatchContent">
     insert into long_articles_publish_match_content (id, trace_id, gh_id, 
       content_id, publish_content_id, `status`, 
       create_time, update_time)
@@ -113,7 +113,7 @@
       #{contentId,jdbcType=VARCHAR}, #{publishContentId,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishMatchContent">
+  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMatchContent">
     insert into long_articles_publish_match_content
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -168,7 +168,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishMatchContentExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMatchContentExample" resultType="java.lang.Long">
     select count(*) from long_articles_publish_match_content
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
@@ -220,7 +220,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishMatchContent">
+  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMatchContent">
     update long_articles_publish_match_content
     <set>
       <if test="traceId != null">
@@ -247,7 +247,7 @@
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishMatchContent">
+  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMatchContent">
     update long_articles_publish_match_content
     set trace_id = #{traceId,jdbcType=VARCHAR},
       gh_id = #{ghId,jdbcType=VARCHAR},

+ 9 - 9
long-article-server/src/main/resources/mapper/PublishMiniprogramMapper.xml → long-article-server/src/main/resources/mapper/longarticle/PublishMiniprogramMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.PublishMiniprogramMapper">
-  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.PublishMiniprogram">
+<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.longarticle.PublishMiniprogramMapper">
+  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMiniprogram">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="content_id" jdbcType="BIGINT" property="contentId" />
     <result column="plan_account_id" jdbcType="BIGINT" property="planAccountId" />
@@ -93,7 +93,7 @@
     root_source_id, root_share_id, `index`, trace_id, wx_url, crawler_video_id, video_oss_path, 
     user_id, is_delete, create_time, update_time
   </sql>
-  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishMiniprogramExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMiniprogramExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
@@ -120,13 +120,13 @@
     delete from long_articles_publish_miniprogram
     where id = #{id,jdbcType=BIGINT}
   </delete>
-  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishMiniprogramExample">
+  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMiniprogramExample">
     delete from long_articles_publish_miniprogram
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishMiniprogram">
+  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMiniprogram">
     insert into long_articles_publish_miniprogram (id, content_id, plan_account_id, 
       publish_content_id, app_id, app_name, 
       avatar, mini_id, mini_program_type, 
@@ -146,7 +146,7 @@
       #{videoOssPath,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{isDelete,jdbcType=INTEGER}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishMiniprogram">
+  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMiniprogram">
     insert into long_articles_publish_miniprogram
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -309,7 +309,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishMiniprogramExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMiniprogramExample" resultType="java.lang.Long">
     select count(*) from long_articles_publish_miniprogram
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
@@ -433,7 +433,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishMiniprogram">
+  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMiniprogram">
     update long_articles_publish_miniprogram
     <set>
       <if test="contentId != null">
@@ -514,7 +514,7 @@
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishMiniprogram">
+  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.PublishMiniprogram">
     update long_articles_publish_miniprogram
     set content_id = #{contentId,jdbcType=BIGINT},
       plan_account_id = #{planAccountId,jdbcType=BIGINT},

+ 9 - 9
long-article-server/src/main/resources/mapper/RootSourceMapper.xml → long-article-server/src/main/resources/mapper/longarticle/RootSourceMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.RootSourceMapper">
-  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.RootSource">
+<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.longarticle.RootSourceMapper">
+  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.longarticle.RootSource">
     <id column="root_source_id" jdbcType="VARCHAR" property="rootSourceId" />
     <result column="account_name" jdbcType="VARCHAR" property="accountName" />
     <result column="gh_id" jdbcType="VARCHAR" property="ghId" />
@@ -75,7 +75,7 @@
     root_source_id, account_name, gh_id, article_title, request_time, trace_id, push_type, 
     video_id, content_id, oss_name
   </sql>
-  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.RootSourceExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.RootSourceExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
@@ -102,13 +102,13 @@
     delete from long_articles_root_source_id
     where root_source_id = #{rootSourceId,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.RootSourceExample">
+  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.RootSourceExample">
     delete from long_articles_root_source_id
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.RootSource">
+  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.RootSource">
     insert into long_articles_root_source_id (root_source_id, account_name, gh_id, 
       article_title, request_time, trace_id, 
       push_type, video_id, content_id, 
@@ -118,7 +118,7 @@
       #{pushType,jdbcType=INTEGER}, #{videoId,jdbcType=BIGINT}, #{contentId,jdbcType=VARCHAR}, 
       #{ossName,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.RootSource">
+  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.RootSource">
     insert into long_articles_root_source_id
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="rootSourceId != null">
@@ -185,7 +185,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.RootSourceExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.RootSourceExample" resultType="java.lang.Long">
     select count(*) from long_articles_root_source_id
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
@@ -245,7 +245,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.RootSource">
+  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.RootSource">
     update long_articles_root_source_id
     <set>
       <if test="accountName != null">
@@ -278,7 +278,7 @@
     </set>
     where root_source_id = #{rootSourceId,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.RootSource">
+  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.RootSource">
     update long_articles_root_source_id
     set account_name = #{accountName,jdbcType=VARCHAR},
       gh_id = #{ghId,jdbcType=VARCHAR},

+ 9 - 9
long-article-server/src/main/resources/mapper/SingleVideoSourceMapper.xml → long-article-server/src/main/resources/mapper/longarticle/SingleVideoSourceMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.SingleVideoSourceMapper">
-  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.SingleVideoSource">
+<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.longarticle.SingleVideoSourceMapper">
+  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.longarticle.SingleVideoSource">
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="content_trace_id" jdbcType="VARCHAR" property="contentTraceId" />
     <result column="article_title" jdbcType="VARCHAR" property="articleTitle" />
@@ -92,7 +92,7 @@
     up_level_timestamp, exit_timestamp, source_account, audit_status, audit_video_id, 
     audit_timestamp, mini_program_title
   </sql>
-  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.SingleVideoSourceExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.SingleVideoSourceExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
@@ -119,13 +119,13 @@
     delete from publish_single_video_source
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.SingleVideoSourceExample">
+  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.SingleVideoSourceExample">
     delete from publish_single_video_source
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.SingleVideoSource">
+  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.SingleVideoSource">
     insert into publish_single_video_source (id, content_trace_id, article_title, 
       out_account_id, out_account_name, read_cnt, 
       like_cnt, article_index, article_publish_type, 
@@ -145,7 +145,7 @@
       #{auditVideoId,jdbcType=BIGINT}, #{auditTimestamp,jdbcType=BIGINT}, #{miniProgramTitle,jdbcType=VARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.SingleVideoSource">
+  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.SingleVideoSource">
     insert into publish_single_video_source
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -296,7 +296,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.SingleVideoSourceExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.SingleVideoSourceExample" resultType="java.lang.Long">
     select count(*) from publish_single_video_source
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
@@ -412,7 +412,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.SingleVideoSource">
+  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.SingleVideoSource">
     update publish_single_video_source
     <set>
       <if test="contentTraceId != null">
@@ -487,7 +487,7 @@
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.SingleVideoSource">
+  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.SingleVideoSource">
     update publish_single_video_source
     set content_trace_id = #{contentTraceId,jdbcType=VARCHAR},
       article_title = #{articleTitle,jdbcType=VARCHAR},

+ 4 - 4
long-article-server/src/main/resources/mybatis-generator-config.xml

@@ -35,17 +35,17 @@
             <property name="forceBigDecimals" value="false"/>
         </javaTypeResolver>
 
-        <javaModelGenerator targetPackage="com.tzld.piaoquan.longarticle.model.po" targetProject="/Users/shimeng/Desktop/project/long-article-manage/long-article-server/src/main/java">
+        <javaModelGenerator targetPackage="com.tzld.piaoquan.longarticle.model.po.longarticle" targetProject="/Users/shimeng/Desktop/project/long-article-manage/long-article-server/src/main/java">
             <property name="constructorBased" value="false"/>
             <property name="enableSubPackages" value="true"/>
             <property name="immutable" value="false"/>
         </javaModelGenerator>
 
-        <sqlMapGenerator targetPackage="mapper" targetProject="/Users/shimeng/Desktop/project/long-article-manage/long-article-server/src/main/resources">
+        <sqlMapGenerator targetPackage="mapper/longarticle" targetProject="/Users/shimeng/Desktop/project/long-article-manage/long-article-server/src/main/resources">
             <property name="enableSubPackages" value="true"/>
         </sqlMapGenerator>
 
-        <javaClientGenerator targetPackage="com.tzld.piaoquan.longarticle.dao.mapper" type="XMLMAPPER"
+        <javaClientGenerator targetPackage="com.tzld.piaoquan.longarticle.dao.mapper.longarticle" type="XMLMAPPER"
                              targetProject="/Users/shimeng/Desktop/project/long-article-manage/long-article-server/src/main/java">
             <property name="enableSubPackages" value="true"/>
         </javaClientGenerator>
@@ -60,7 +60,7 @@
 <!--            <columnOverride column="cover_url" javaType="java.lang.String" jdbcType="LONGVARCHAR" />-->
 <!--        </table>-->
 <!--        <table tableName="long_articles_root_source_id" domainObjectName="RootSource" alias=""/>-->
-        <table tableName="long_articles_crawler_videos" domainObjectName="CrawlerVideo" alias=""/>
+        <table tableName="article_pool_promotion_source" domainObjectName="PromotionSource" alias=""/>
 <!--            <table tableName="long_articles_plan" domainObjectName="Plan" alias=""/>-->
 
 <!--                <table tableName="long_articles_publish_content" domainObjectName="PublishContent" alias=""/>-->