删除subscribe_id和plan_id字段

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/controller/SeoKeywordsController.java

@@ -254,7 +254,7 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
         String buttonSort = req.getParameter("buttonSort");
         Page<SeoKeywords> page = new Page<SeoKeywords>(pageNo, pageSize);
         List<String> dateList =
-                seoKeywordsService.getKeywordsLastSevenDays(siteCode, keywordType, subscriptionId);
+                seoKeywordsService.getKeywordsLastSevenDays(siteCode, keywordType);
         pageList =
                 seoKeywordsService.getKeywordList(
                         page,
@@ -265,7 +265,6 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
                         keywordType,
                         avesApiSearchKeywordsDTO.getReachStandard() != null
                                 && avesApiSearchKeywordsDTO.getReachStandard() == 1,
-                        subscriptionId,
                         column,
                         order,
                         buttonColumn,
@@ -470,7 +469,6 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
                     }
                     seoKeywords.setLastRank(0);
                     seoKeywords.setSearchStatus(0);
-                    seoKeywords.setSubscriptionId(currentSeoAndSiteSubscription.getId());
                     list.add(seoKeywords);
                 }
 
@@ -481,8 +479,7 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
                 LambdaQueryWrapper<SeoKeywords> queryWrapper = new LambdaQueryWrapper<>();
                 queryWrapper.eq(SeoKeywords::getSiteCode, site.getCode());
                 queryWrapper.ne(SeoKeywords::getStatus, 0);
-                queryWrapper.eq(
-                        SeoKeywords::getSubscriptionId, currentSeoAndSiteSubscription.getId());
+
                 List<SeoKeywords> existingKeywordList = seoKeywordsService.list(queryWrapper);
                 if (CollectionUtil.isNotEmpty(existingKeywordList)) {
                     List<String> existingKeywords = new ArrayList<>();
@@ -538,7 +535,6 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
         queryWrapper.eq(SeoKeywords::getKeywords, seoKeywords.getKeywords());
         queryWrapper.eq(SeoKeywords::getSiteCode, seoKeywords.getSiteCode());
         queryWrapper.ne(SeoKeywords::getStatus, 0);
-        queryWrapper.eq(SeoKeywords::getSubscriptionId, seoKeywords.getSubscriptionId());
         List<SeoKeywords> seoKeywordsList = seoKeywordsService.list(queryWrapper);
         if (!seoKeywordsList.isEmpty()) {
             return Result.OK(false);
@@ -563,7 +559,6 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
         if (type == 2) {
             LambdaQueryWrapper<SeoKeywords> queryWrapper2 = new LambdaQueryWrapper<>();
             queryWrapper2.ne(SeoKeywords::getStatus, 0);
-            queryWrapper2.eq(SeoKeywords::getSubscriptionId, temp.getSubscriptionId());
             queryWrapper2.eq(SeoKeywords::getRelatedKeywordId, id);
             if (seoKeywordsService.count(queryWrapper2) > 0) {
                 return Result.error("此关键词已经关联长尾词！");

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/entity/SeoKeywords.java

@@ -161,18 +161,6 @@ public class SeoKeywords implements Serializable {
     @Schema(description = "相关关键词关联的关键词的id")
     private Integer relatedKeywordId;
     /**
-     * 关键词对应套餐的ID
-     */
-    @Excel(name = "关键词对应套餐的ID", width = 15)
-    @Schema(description = "关键词对应套餐的ID")
-    private String planId;
-    /**
-     * 订购表ID
-     */
-    @Excel(name = "订购表ID", width = 15)
-    @Schema(description = "订购表ID")
-    private java.lang.String subscriptionId;
-    /**
      * 网站表ID
      */
     @Excel(name = "网站表ID", width = 15)

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/mapper/SeoKeywordsMapper.java

@@ -23,11 +23,10 @@ public interface SeoKeywordsMapper extends BaseMapper<SeoKeywords> {
      * 根据站点和套餐id
      *
      * @param siteCode
-     * @param subscriptionId
      * @return
      */
     List<String> getKeywordsLastSevenDays(
-            String siteCode, String subscriptionId, Integer keywordType);
+            String siteCode, Integer keywordType);
 
     /**
      * 查询关键词排名数据
@@ -37,7 +36,6 @@ public interface SeoKeywordsMapper extends BaseMapper<SeoKeywords> {
      */
     RankInfoVO queryKeywordNumByRankRange(
             @Param("siteCode") String siteCode,
-            @Param("subscriptionId") String subscriptionId,
             @Param("rankStart") Integer rankStart,
             @Param("rankEnd") Integer rankEnd,
             @Param("dateStr") String dateStr,
@@ -65,7 +63,6 @@ public interface SeoKeywordsMapper extends BaseMapper<SeoKeywords> {
             String siteCode,
             Integer keywordType,
             String datesStr,
-            String subscriptionId,
             String column,
             String order,
             String buttonColumn,
@@ -84,7 +81,6 @@ public interface SeoKeywordsMapper extends BaseMapper<SeoKeywords> {
      * @param page
      * @param siteCode
      * @param keywords
-     * @param subscriptionId
      * @param lastSearchTime
      * @param createTime
      * @param keywordType
@@ -97,7 +93,6 @@ public interface SeoKeywordsMapper extends BaseMapper<SeoKeywords> {
             Page<SeoKeywords> page,
             String siteCode,
             String keywords,
-            String subscriptionId,
             String lastSearchTime,
             String createTime,
             Integer keywordType,
@@ -111,7 +106,6 @@ public interface SeoKeywordsMapper extends BaseMapper<SeoKeywords> {
      * @param page
      * @param siteCode
      * @param keywords
-     * @param subscriptionId
      * @param lastSearchTime
      * @param createTime
      * @param keywordType
@@ -124,7 +118,6 @@ public interface SeoKeywordsMapper extends BaseMapper<SeoKeywords> {
             Page<SeoKeywords> page,
             String siteCode,
             String keywords,
-            String subscriptionId,
             String lastSearchTime,
             String createTime,
             Integer keywordType,

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/mapper/xml/SeoKeywordsMapper.xml

@@ -10,7 +10,6 @@
         AND t2.app_key = 'adweb'
         AND t2.site_code = #{siteCode}
         AND t2.keyword_type = #{keywordType}
-        AND t2.subscription_id = #{subscriptionId}
         GROUP BY t1.se_date
         ORDER BY t1.se_date DESC
         LIMIT 7
@@ -30,7 +29,6 @@
         t1.site_code = #{siteCode}
         AND `status` = 1
         AND keyword_type = #{keywordType}
-        AND subscription_id = #{subscriptionId}
         <if test="rankStart != null">
             AND t1.last_rank >= #{rankStart}
         </if>
@@ -61,9 +59,6 @@
         <if test="keywordType != null">
             AND t2.keyword_type = #{keywordType}
         </if>
-        <if test="!subscriptionId">
-            AND t2.subscription_id = #{subscriptionId}
-        </if>
         AND se_date IN ${dateStr}
         GROUP BY keywords_id
         ) t3
@@ -111,9 +106,6 @@
             </if>
             AND t1.app_key = 'adweb'
             AND t1.`status` = 1
-            <if test="!subscriptionId">
-                AND t1.subscription_id = #{subscriptionId}
-            </if>
             AND
             (
             id IN
@@ -137,9 +129,6 @@
             <if test="keywordType != null">
                 AND t2.keyword_type = #{keywordType}
             </if>
-            <if test="!subscriptionId">
-                AND t2.subscription_id = #{subscriptionId}
-            </if>
             AND se_date IN ${datesStr}
             GROUP BY keywords_id
             ) t3
@@ -203,9 +192,6 @@
         <if test="createTime != null and createTime != ''">
             AND t1.create_time LIKE CONCAT(#{createTime}, '%')
         </if>
-        <if test="subscriptionId != null and subscriptionId != ''">
-            AND t1.subscription_id = #{subscriptionId}
-        </if>
         <if test="lastSearchTime != null and lastSearchTime != ''">
             AND t1.last_search_time LIKE CONCAT(#{lastSearchTime}, '%')
         </if>
@@ -250,9 +236,6 @@
         <if test="createTime != null and createTime != ''">
             AND t1.create_time LIKE CONCAT(#{createTime}, '%')
         </if>
-        <if test="subscriptionId != null and subscriptionId != ''">
-            AND t1.subscription_id = #{subscriptionId}
-        </if>
         <if test="lastSearchTime != null and lastSearchTime != ''">
             AND t1.last_search_time LIKE CONCAT(#{lastSearchTime}, '%')
         </if>
@@ -297,9 +280,6 @@
         <if test="createTime != null and createTime != ''">
             AND t1.create_time LIKE CONCAT(#{createTime}, '%')
         </if>
-        <if test="subscriptionId != null and subscriptionId != ''">
-            AND t1.subscription_id = #{subscriptionId}
-        </if>
         <if test="lastSearchTime != null and lastSearchTime != ''">
             AND t1.last_search_time LIKE CONCAT(#{lastSearchTime}, '%')
         </if>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/service/ISeoKeywordsRankService.java

@@ -25,7 +25,7 @@ public interface ISeoKeywordsRankService {
 
     Map getRankInfo(String siteCode) throws ParseException;
 
-    List<SeoRankInfoVO> getSeoRankInfo(String siteCode, String subscriptionId)
+    List<SeoRankInfoVO> getSeoRankInfo(String siteCode)
             throws ParseException;
 
     void addRankInfoByIntervalTimeByType(

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/service/ISeoKeywordsService.java

@@ -19,11 +19,10 @@ import java.util.List;
 public interface ISeoKeywordsService extends IService<SeoKeywords> {
 
     List<String> getKeywordsLastSevenDays(
-            String userFlag, Integer keywordType, String subscriptionId);
+            String userFlag, Integer keywordType);
 
     RankInfoVO getSeoRankInfo(
             String siteCode,
-            String subscriptionId,
             Integer rankStart,
             Integer rankEnd,
             String dateStr,
@@ -37,7 +36,6 @@ public interface ISeoKeywordsService extends IService<SeoKeywords> {
             String siteCode,
             Integer keywordType,
             boolean reachStandard,
-            String subscriptionId,
             String column,
             String order,
             String buttonColumn,
@@ -49,7 +47,6 @@ public interface ISeoKeywordsService extends IService<SeoKeywords> {
             Page<SeoKeywords> page,
             String siteCode,
             String keywords,
-            String subscriptionId,
             String lastSearchTime,
             String createTime,
             Integer keywordType,

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/service/impl/SeoKeywordsRankServiceImpl.java

@@ -188,7 +188,7 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
         if (userPlanSubscription != null) {
             // 通过站点获取订阅id
             List<SeoRankInfoVO> seoRankInfos =
-                    this.getSeoRankInfo(siteCode, userPlanSubscription.getId());
+                    this.getSeoRankInfo(siteCode);
             map.put("appointKeyword", seoRankInfos.get(0));
             map.put("longTailKeyword", seoRankInfos.get(1));
 
@@ -208,13 +208,13 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
      * @return 关键词排名数量
      */
     @Override
-    public List<SeoRankInfoVO> getSeoRankInfo(String siteCode, String subscriptionId)
+    public List<SeoRankInfoVO> getSeoRankInfo(String siteCode)
             throws ParseException {
         // 排名信息
         SeoRankInfoVO appointRankInfo = new SeoRankInfoVO();
         SeoRankInfoVO longTailRankInfo = new SeoRankInfoVO();
         // 1-10
-        Map<String, Integer> first = dealKeywordsRankData(siteCode, subscriptionId, 1, 10);
+        Map<String, Integer> first = dealKeywordsRankData(siteCode, 1, 10);
         if (first.containsKey("appoint")) {
             appointRankInfo.setFirstNum(first.get("appoint"));
         }
@@ -223,7 +223,7 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
         }
 
         // 11-30
-        Map<String, Integer> second = dealKeywordsRankData(siteCode, subscriptionId, 11, 30);
+        Map<String, Integer> second = dealKeywordsRankData(siteCode, 11, 30);
         if (second.containsKey("appoint")) {
             appointRankInfo.setSecondNum(second.get("appoint"));
         }
@@ -231,7 +231,7 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
             longTailRankInfo.setSecondNum(second.get("longTail"));
         }
         // 31-100
-        Map<String, Integer> third = dealKeywordsRankData(siteCode, subscriptionId, 31, 100);
+        Map<String, Integer> third = dealKeywordsRankData(siteCode, 31, 100);
         if (third.containsKey("appoint")) {
             appointRankInfo.setThirdType(third.get("appoint"));
         }
@@ -245,12 +245,12 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
     }
 
     private Map<String, Integer> dealKeywordsRankData(
-            String siteCode, String subscriptionId, Integer rankStart, Integer rankEnd) {
+            String siteCode, Integer rankStart, Integer rankEnd) {
         Map<String, Integer> KeywordsRankMap = new HashMap<>();
 
         // 指定词
         List<String> appointDateList =
-                seoKeywordsService.getKeywordsLastSevenDays(siteCode, 1, subscriptionId);
+                seoKeywordsService.getKeywordsLastSevenDays(siteCode, 1);
         String appointDatesStr = "";
         if (CollectionUtils.isNotEmpty(appointDateList)) {
             for (int i = 0; i < appointDateList.size(); i++) {
@@ -265,7 +265,7 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
             // 指定词
             RankInfoVO appointRankInfo =
                     seoKeywordsMapper.queryKeywordNumByRankRange(
-                            siteCode, subscriptionId, rankStart, rankEnd, appointDatesStr, "1");
+                            siteCode, rankStart, rankEnd, appointDatesStr, "1");
             if (appointRankInfo != null) {
                 KeywordsRankMap.put("appoint", appointRankInfo.getKeywordNum());
             }
@@ -273,7 +273,7 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
 
         // 长尾词
         List<String> dateList =
-                seoKeywordsService.getKeywordsLastSevenDays(siteCode, 2, subscriptionId);
+                seoKeywordsService.getKeywordsLastSevenDays(siteCode, 2);
         String dateStr = "";
         if (CollectionUtils.isNotEmpty(dateList)) {
             for (int i = 0; i < dateList.size(); i++) {
@@ -286,7 +286,7 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
             dateStr = "(" + dateStr + ")";
             RankInfoVO longRankInfo =
                     seoKeywordsMapper.queryKeywordNumByRankRange(
-                            siteCode, subscriptionId, rankStart, rankEnd, dateStr, "2");
+                            siteCode, rankStart, rankEnd, dateStr, "2");
             if (longRankInfo != null) {
                 KeywordsRankMap.put("longTail", longRankInfo.getKeywordNum());
             }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/service/impl/SeoKeywordsServiceImpl.java

@@ -33,15 +33,14 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
      *
      * @param userFlag
      * @param keywordType
-     * @param subscriptionId
      * @return
      */
     @Override
     public List<String> getKeywordsLastSevenDays(
-            String userFlag, Integer keywordType, String subscriptionId) {
+            String userFlag, Integer keywordType) {
         // 获取对应站点最近七天
         List<String> dateList =
-                seoKeywordsMapper.getKeywordsLastSevenDays(userFlag, subscriptionId, keywordType);
+                seoKeywordsMapper.getKeywordsLastSevenDays(userFlag, keywordType);
         return dateList;
     }
 
@@ -54,14 +53,13 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
     @Override
     public RankInfoVO getSeoRankInfo(
             String siteCode,
-            String subscriptionId,
             Integer rankStart,
             Integer rankEnd,
             String dateStr,
             String keywordType) {
         // 指定词
         return seoKeywordsMapper.queryKeywordNumByRankRange(
-                siteCode, subscriptionId, rankStart, rankEnd, dateStr, keywordType);
+                siteCode, rankStart, rankEnd, dateStr, keywordType);
     }
 
     /**
@@ -78,7 +76,6 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
             String siteCode,
             Integer keywordType,
             boolean reachStandard,
-            String subscriptionId,
             String column,
             String order,
             String buttonColumn,
@@ -119,7 +116,6 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
                 siteCode,
                 keywordType,
                 datesStr,
-                subscriptionId,
                 column,
                 order,
                 buttonColumn,
@@ -132,7 +128,6 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
      * @param page
      * @param siteCode
      * @param keywords
-     * @param subscriptionId
      * @param lastSearchTime
      * @param createTime
      * @param keywordType
@@ -146,7 +141,6 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
             Page<SeoKeywords> page,
             String siteCode,
             String keywords,
-            String subscriptionId,
             String lastSearchTime,
             String createTime,
             Integer keywordType,
@@ -159,7 +153,6 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
                     page,
                     siteCode,
                     keywords,
-                    subscriptionId,
                     lastSearchTime,
                     createTime,
                     keywordType,
@@ -172,7 +165,6 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
                     page,
                     siteCode,
                     keywords,
-                    subscriptionId,
                     lastSearchTime,
                     createTime,
                     keywordType,
@@ -188,7 +180,6 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
                 page,
                 siteCode,
                 keywords,
-                subscriptionId,
                 lastSearchTime,
                 createTime,
                 keywordType,