Rename table

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

@@ -35,10 +35,10 @@ import org.jeecg.modules.adweb.common.constant.AdwebConstant;
 import org.jeecg.modules.adweb.seo.dto.AvesApiSearchKeywordsDTO;
 import org.jeecg.modules.adweb.seo.dto.ChangeTypeDTO;
 import org.jeecg.modules.adweb.seo.entity.SeoKeywords;
-import org.jeecg.modules.adweb.seo.entity.SeoPlanSubscription;
+import org.jeecg.modules.adweb.subscription.entity.UserPlanSubscription;
 import org.jeecg.modules.adweb.seo.service.ISeoKeywordsRankService;
 import org.jeecg.modules.adweb.seo.service.ISeoKeywordsService;
-import org.jeecg.modules.adweb.seo.service.ISeoPlanSubscriptionService;
+import org.jeecg.modules.adweb.subscription.service.IUserPlanSubscriptionService;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
 import org.jeecg.modules.adweb.system.service.SysAdwebApi;
@@ -78,7 +78,7 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
 
     @Autowired private IAdwebSiteService adwebSiteService;
 
-    @Autowired private ISeoPlanSubscriptionService seoPlanSubscriptionService;
+    @Autowired private IUserPlanSubscriptionService seoPlanSubscriptionService;
 
     @Value("${jeecg.path.upload}")
     private String uploadUrl;
@@ -402,7 +402,7 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
         if (StringUtil.isEmpty(site.getDomain())) {
             return Result.error("站点域名未设置！");
         }
-        SeoPlanSubscription currentSeoAndSiteSubscription =
+        UserPlanSubscription currentSeoAndSiteSubscription =
                 seoPlanSubscriptionService.getCurrentSeoAndSiteSubscription(site.getId());
 
         if (currentSeoAndSiteSubscription == null) {

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

@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.adweb.seo.dto.ComprehensiveStatistics;
-import org.jeecg.modules.adweb.seo.entity.SeoPlanSubscription;
+import org.jeecg.modules.adweb.subscription.entity.UserPlanSubscription;
 import org.jeecg.modules.adweb.seo.service.ISeoKeywordsRankService;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,9 +38,9 @@ public class SeoKeywordsRankController {
 
     /** 根据 站点code 获取 站点的 订阅Id */
     @GetMapping(value = "/getSubscriptionIdBySiteCode")
-    public Result<List<SeoPlanSubscription>> getSubscriptionIdBySiteCode(
+    public Result<List<UserPlanSubscription>> getSubscriptionIdBySiteCode(
             @RequestParam String siteCode) {
-        final List<SeoPlanSubscription> subscriptionIdBySiteCode =
+        final List<UserPlanSubscription> subscriptionIdBySiteCode =
                 seoKeywordsRankService.getSubscriptionIdBySiteCode(siteCode);
         return Result.OK(subscriptionIdBySiteCode);
     }

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

@@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.commons.lang3.tuple.ImmutableTriple;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.adweb.seo.dto.ComprehensiveStatistics;
 import org.jeecg.modules.adweb.seo.entity.SeoKeywords;
-import org.jeecg.modules.adweb.seo.entity.SeoPlanSubscription;
+import org.jeecg.modules.adweb.subscription.entity.UserPlanSubscription;
 import org.jeecg.modules.adweb.seo.vo.RankInfoVO;
 
 import java.util.List;
@@ -133,7 +132,7 @@ public interface SeoKeywordsMapper extends BaseMapper<SeoKeywords> {
             String order,
             Integer keywordRank);
 
-    List<SeoPlanSubscription> getSubscriptionIdBySiteCode(String siteCode);
+    List<UserPlanSubscription> getSubscriptionIdBySiteCode(String siteCode);
 
     List<ComprehensiveStatistics.KeywordRankStats> getKeywordsRankStats(
             String siteCode, int targetRank);

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

@@ -317,7 +317,7 @@
     </select>
 
     <select id="getSubscriptionIdBySiteCode"
-            resultType="org.jeecg.modules.adweb.seo.entity.SeoPlanSubscription">
+            resultType="org.jeecg.modules.adweb.subscription.entity.UserPlanSubscription">
         SELECT
         t1.id,
         t1.plan_id

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

@@ -3,7 +3,7 @@ package org.jeecg.modules.adweb.seo.service;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.jeecg.modules.adweb.seo.dto.ComprehensiveStatistics;
 import org.jeecg.modules.adweb.seo.entity.SeoKeywords;
-import org.jeecg.modules.adweb.seo.entity.SeoPlanSubscription;
+import org.jeecg.modules.adweb.subscription.entity.UserPlanSubscription;
 import org.jeecg.modules.adweb.seo.vo.SeoRankInfoVO;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 
@@ -37,5 +37,5 @@ public interface ISeoKeywordsRankService {
 
     void setSizeColumn(Sheet sheet, int size);
 
-    List<SeoPlanSubscription> getSubscriptionIdBySiteCode(String siteCode);
+    List<UserPlanSubscription> getSubscriptionIdBySiteCode(String siteCode);
 }

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

@@ -20,12 +20,12 @@ import org.jeecg.modules.adweb.common.constant.AdwebConstant;
 import org.jeecg.modules.adweb.seo.dto.ComprehensiveStatistics;
 import org.jeecg.modules.adweb.seo.entity.SeoKeywords;
 import org.jeecg.modules.adweb.seo.entity.SeoKeywordsSerp;
-import org.jeecg.modules.adweb.seo.entity.SeoPlanSubscription;
+import org.jeecg.modules.adweb.subscription.entity.UserPlanSubscription;
 import org.jeecg.modules.adweb.seo.mapper.SeoKeywordsMapper;
 import org.jeecg.modules.adweb.seo.service.ISeoKeywordsRankService;
 import org.jeecg.modules.adweb.seo.service.ISeoKeywordsSerpService;
 import org.jeecg.modules.adweb.seo.service.ISeoKeywordsService;
-import org.jeecg.modules.adweb.seo.service.ISeoPlanSubscriptionService;
+import org.jeecg.modules.adweb.subscription.service.IUserPlanSubscriptionService;
 import org.jeecg.modules.adweb.seo.vo.RankInfoVO;
 import org.jeecg.modules.adweb.seo.vo.SeoRankInfoVO;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
@@ -57,7 +57,7 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
 
     @Autowired private ISiteUserPermissionService siteUserPermissionService;
 
-    @Autowired private ISeoPlanSubscriptionService seoPlanSubscriptionService;
+    @Autowired private IUserPlanSubscriptionService seoPlanSubscriptionService;
 
     @Autowired private ISeoKeywordsService seoKeywordsService;
 
@@ -104,23 +104,23 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
             siteIds.add(site.getId());
         }
 
-        LambdaQueryWrapper<SeoPlanSubscription> historyQueryWrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<UserPlanSubscription> historyQueryWrapper = new LambdaQueryWrapper<>();
         historyQueryWrapper.select(
-                SeoPlanSubscription::getId,
-                SeoPlanSubscription::getPlanId,
-                SeoPlanSubscription::getSiteId,
-                SeoPlanSubscription::getPlanName,
-                SeoPlanSubscription::getPlanType);
-        historyQueryWrapper.in(SeoPlanSubscription::getSiteId, siteIds);
-        historyQueryWrapper.eq(SeoPlanSubscription::getStatus, 1);
-        List<SeoPlanSubscription> seoPlanSubscriptions =
+                UserPlanSubscription::getId,
+                UserPlanSubscription::getPlanId,
+                UserPlanSubscription::getSiteId,
+                UserPlanSubscription::getPlanName,
+                UserPlanSubscription::getPlanType);
+        historyQueryWrapper.in(UserPlanSubscription::getSiteId, siteIds);
+        historyQueryWrapper.eq(UserPlanSubscription::getStatus, 1);
+        List<UserPlanSubscription> seoPlanSubscriptions =
                 seoPlanSubscriptionService.list(historyQueryWrapper);
         if (CollectionUtils.isEmpty(seoPlanSubscriptions)) {
             return;
         }
 
         for (AdwebSite site : siteList) {
-            for (SeoPlanSubscription seoPlanSubscription : seoPlanSubscriptions) {
+            for (UserPlanSubscription seoPlanSubscription : seoPlanSubscriptions) {
                 if (seoPlanSubscription.getSiteId().equals(site.getId() + "")) {
                     site.setPlanId(seoPlanSubscription.getPlanId());
                     site.setPlanName(seoPlanSubscription.getPlanName());
@@ -182,7 +182,7 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
     public Map getRankInfo(String siteCode) throws ParseException {
         // 通过站点code获取站点id
         AdwebSite siteByCode = adwebSiteService.getSiteByCode(siteCode);
-        SeoPlanSubscription seoPlanSubscription =
+        UserPlanSubscription seoPlanSubscription =
                 seoPlanSubscriptionService.getCurrentSeoAndSiteSubscription(siteByCode.getId());
         // 通过站点获取订阅id
         List<SeoRankInfoVO> seoRankInfos =
@@ -404,7 +404,7 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
     }
 
     @Override
-    public List<SeoPlanSubscription> getSubscriptionIdBySiteCode(String siteCode) {
+    public List<UserPlanSubscription> getSubscriptionIdBySiteCode(String siteCode) {
         return seoKeywordsMapper.getSubscriptionIdBySiteCode(siteCode);
     }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/controller/AdwebSiteController.java

@@ -29,7 +29,7 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.FastJsonUtil;
 import org.jeecg.config.security.utils.SecureUtil;
 import org.jeecg.modules.adweb.common.constant.AdwebConstant;
-import org.jeecg.modules.adweb.seo.mapper.SeoPlanSubscriptionMapper;
+import org.jeecg.modules.adweb.subscription.mapper.UserPlanSubscriptionMapper;
 import org.jeecg.modules.adweb.site.dto.param.SiteStepDTO;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 import org.jeecg.modules.adweb.site.entity.AdwebSitePermission;
@@ -65,7 +65,7 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
 
     @Resource private ISitePermissionService sitePermissionService;
 
-    @Resource private SeoPlanSubscriptionMapper seoPlanSubscriptionMapper;
+    @Resource private UserPlanSubscriptionMapper seoPlanSubscriptionMapper;
 
     @Resource private SelfWebSiteService selfWebSiteService;
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/SelfWebSiteServiceCommon.java

@@ -10,8 +10,8 @@ import org.jeecg.common.util.FastJsonUtil;
 import org.jeecg.modules.adweb.common.constant.AdwebConstant;
 import org.jeecg.modules.adweb.common.util.DateUtil;
 import org.jeecg.modules.adweb.enquiry.constant.EnquiryDistributeTypeConstant;
-import org.jeecg.modules.adweb.seo.entity.SeoPlanSubscription;
-import org.jeecg.modules.adweb.seo.service.ISeoPlanSubscriptionService;
+import org.jeecg.modules.adweb.subscription.entity.UserPlanSubscription;
+import org.jeecg.modules.adweb.subscription.service.IUserPlanSubscriptionService;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 import org.jeecg.modules.adweb.subscription.entity.SubscribePlan;
 import org.jeecg.modules.adweb.subscription.service.ISubscribePlanService;
@@ -47,7 +47,7 @@ public class SelfWebSiteServiceCommon {
 
     @Resource private IAdwebThemeService adwebThemeService;
 
-    @Resource private ISeoPlanSubscriptionService seoPlanSubscriptionService;
+    @Resource private IUserPlanSubscriptionService seoPlanSubscriptionService;
 
     @Resource private ISubscribePlanService subscribePlanService;
 
@@ -137,7 +137,7 @@ public class SelfWebSiteServiceCommon {
                 giveDay = 0;
                 compensateDay = 0;
             }
-            SeoPlanSubscription history = new SeoPlanSubscription();
+            UserPlanSubscription history = new UserPlanSubscription();
             history.setPlanId(planId);
             history.setSiteId(adwebSite.getId() + "");
             history.setIsRenew(0);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/SiteManageService.java

@@ -10,8 +10,8 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.modules.adweb.common.util.DateUtil;
-import org.jeecg.modules.adweb.seo.entity.SeoPlanSubscription;
-import org.jeecg.modules.adweb.seo.service.ISeoPlanSubscriptionService;
+import org.jeecg.modules.adweb.subscription.entity.UserPlanSubscription;
+import org.jeecg.modules.adweb.subscription.service.IUserPlanSubscriptionService;
 import org.jeecg.modules.adweb.site.dto.result.SiteBasicInfo;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 import org.jeecg.modules.adweb.site.mapper.AdwebSiteMapper;
@@ -35,7 +35,7 @@ public class SiteManageService {
 
     @Resource private IAdwebSiteService adwebSiteService;
 
-    @Resource private ISeoPlanSubscriptionService seoPlanSubscriptionService;
+    @Resource private IUserPlanSubscriptionService seoPlanSubscriptionService;
 
     @Resource private SysDictMapper sysDictMapper;
 
@@ -96,7 +96,7 @@ public class SiteManageService {
         siteBasicInfo.setPercentage(siteStatus * 100 / 6);
 
         // 获取绑定的套餐信息
-        SeoPlanSubscription history =
+        UserPlanSubscription history =
                 seoPlanSubscriptionService.getCurrentSeoAndSiteSubscription(adwebSite.getId());
         String defaultPlanName = sysDictMapper.getDefaultPlanName();
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/controller/SeoPlanSubscriptionController.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscription/controller/UserPlanSubscriptionController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.adweb.seo.controller;
+package org.jeecg.modules.adweb.subscription.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,8 +16,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.adweb.seo.entity.SeoPlanSubscription;
-import org.jeecg.modules.adweb.seo.service.ISeoPlanSubscriptionService;
+import org.jeecg.modules.adweb.subscription.entity.UserPlanSubscription;
+import org.jeecg.modules.adweb.subscription.service.IUserPlanSubscriptionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -26,18 +26,18 @@ import org.springframework.web.servlet.ModelAndView;
 import java.util.Arrays;
 
 /**
- * @Description: seo套餐订购
+ * @Description: AdWeb套餐订购
  * @Author: jeecg-boot
  * @Date: 2024-10-15
  * @Version: V1.0
  */
-@Tag(name = "seo套餐订购")
+@Tag(name = "AdWeb套餐订购")
 @RestController
 @RequestMapping("/serp/seoPlanSubscription")
 @Slf4j
-public class SeoPlanSubscriptionController
-        extends JeecgController<SeoPlanSubscription, ISeoPlanSubscriptionService> {
-    @Autowired private ISeoPlanSubscriptionService seoPlanSubscriptionService;
+public class UserPlanSubscriptionController
+        extends JeecgController<UserPlanSubscription, IUserPlanSubscriptionService> {
+    @Autowired private IUserPlanSubscriptionService seoPlanSubscriptionService;
 
     /**
      * 分页列表查询
@@ -48,18 +48,18 @@ public class SeoPlanSubscriptionController
      * @param req
      * @return
      */
-    // @AutoLog(value = "seo套餐订购-分页列表查询")
-    @Operation(summary = "seo套餐订购-分页列表查询")
+    // @AutoLog(value = "AdWeb套餐订购-分页列表查询")
+    @Operation(summary = "AdWeb套餐订购-分页列表查询")
     @GetMapping(value = "/list")
-    public Result<IPage<SeoPlanSubscription>> queryPageList(
-            SeoPlanSubscription seoPlanSubscription,
+    public Result<IPage<UserPlanSubscription>> queryPageList(
+            UserPlanSubscription seoPlanSubscription,
             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
             HttpServletRequest req) {
-        QueryWrapper<SeoPlanSubscription> queryWrapper =
+        QueryWrapper<UserPlanSubscription> queryWrapper =
                 QueryGenerator.initQueryWrapper(seoPlanSubscription, req.getParameterMap());
-        Page<SeoPlanSubscription> page = new Page<SeoPlanSubscription>(pageNo, pageSize);
-        IPage<SeoPlanSubscription> pageList = seoPlanSubscriptionService.page(page, queryWrapper);
+        Page<UserPlanSubscription> page = new Page<UserPlanSubscription>(pageNo, pageSize);
+        IPage<UserPlanSubscription> pageList = seoPlanSubscriptionService.page(page, queryWrapper);
         return Result.OK(pageList);
     }
 
@@ -69,11 +69,11 @@ public class SeoPlanSubscriptionController
      * @param seoPlanSubscription
      * @return
      */
-    @AutoLog(value = "seo套餐订购-添加")
+    @AutoLog(value = "AdWeb套餐订购-添加")
     @Operation(summary = "seo套餐订购-添加")
     @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:add')")
     @PostMapping(value = "/add")
-    public Result<String> add(@RequestBody SeoPlanSubscription seoPlanSubscription) {
+    public Result<String> add(@RequestBody UserPlanSubscription seoPlanSubscription) {
         seoPlanSubscriptionService.save(seoPlanSubscription);
         return Result.OK("添加成功！");
     }
@@ -84,13 +84,13 @@ public class SeoPlanSubscriptionController
      * @param seoPlanSubscription
      * @return
      */
-    @AutoLog(value = "seo套餐订购-编辑")
+    @AutoLog(value = "AdWeb套餐订购-编辑")
     @Operation(summary = "seo套餐订购-编辑")
     @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:edit')")
     @RequestMapping(
             value = "/edit",
             method = {RequestMethod.PUT, RequestMethod.POST})
-    public Result<String> edit(@RequestBody SeoPlanSubscription seoPlanSubscription) {
+    public Result<String> edit(@RequestBody UserPlanSubscription seoPlanSubscription) {
         seoPlanSubscriptionService.updateById(seoPlanSubscription);
         return Result.OK("编辑成功!");
     }
@@ -101,8 +101,8 @@ public class SeoPlanSubscriptionController
      * @param id
      * @return
      */
-    @AutoLog(value = "seo套餐订购-通过id删除")
-    @Operation(summary = "seo套餐订购-通过id删除")
+    @AutoLog(value = "AdWeb套餐订购-通过id删除")
+    @Operation(summary = "AdWeb套餐订购-通过id删除")
     @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:delete')")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
@@ -116,8 +116,8 @@ public class SeoPlanSubscriptionController
      * @param ids
      * @return
      */
-    @AutoLog(value = "seo套餐订购-批量删除")
-    @Operation(summary = "seo套餐订购-批量删除")
+    @AutoLog(value = "AdWeb套餐订购-批量删除")
+    @Operation(summary = "AdWeb套餐订购-批量删除")
     @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:deleteBatch')")
     @DeleteMapping(value = "/deleteBatch")
     public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
@@ -131,12 +131,12 @@ public class SeoPlanSubscriptionController
      * @param id
      * @return
      */
-    // @AutoLog(value = "seo套餐订购-通过id查询")
-    @Operation(summary = "seo套餐订购-通过id查询")
+    // @AutoLog(value = "AdWeb套餐订购-通过id查询")
+    @Operation(summary = "AdWeb套餐订购-通过id查询")
     @GetMapping(value = "/queryById")
-    public Result<SeoPlanSubscription> queryById(
+    public Result<UserPlanSubscription> queryById(
             @RequestParam(name = "id", required = true) String id) {
-        SeoPlanSubscription seoPlanSubscription = seoPlanSubscriptionService.getById(id);
+        UserPlanSubscription seoPlanSubscription = seoPlanSubscriptionService.getById(id);
         if (seoPlanSubscription == null) {
             return Result.error("未找到对应数据");
         }
@@ -152,8 +152,8 @@ public class SeoPlanSubscriptionController
     @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:exportXls')")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(
-            HttpServletRequest request, SeoPlanSubscription seoPlanSubscription) {
-        return super.exportXls(request, seoPlanSubscription, SeoPlanSubscription.class, "seo套餐订购");
+            HttpServletRequest request, UserPlanSubscription seoPlanSubscription) {
+        return super.exportXls(request, seoPlanSubscription, UserPlanSubscription.class, "seo套餐订购");
     }
 
     /**
@@ -166,6 +166,6 @@ public class SeoPlanSubscriptionController
     @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:importExcel')")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, SeoPlanSubscription.class);
+        return super.importExcel(request, response, UserPlanSubscription.class);
     }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/entity/SeoPlanSubscription.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscription/entity/UserPlanSubscription.java

@@ -1,13 +1,16 @@
-package org.jeecg.modules.adweb.seo.entity;
+package org.jeecg.modules.adweb.subscription.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+
 import io.swagger.v3.oas.annotations.media.Schema;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -15,168 +18,142 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * @Description: seo套餐订购
+ * @Description: AdWeb套餐订购
  * @Author: jeecg-boot
- * @Date: 2024-10-15
- * @Version: V1.0
+ * @Date: 2024-10-15@Version: V1.0
  */
 @Data
-@TableName("adweb_seo_plan_subscription")
+@TableName("adweb_sysuser_plan_subscription")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description = "seo套餐订购")
-public class SeoPlanSubscription implements Serializable {
+@Schema(description = "AdWeb套餐订购")
+public class UserPlanSubscription implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 主键
-     */
+    /** 主键 */
     @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "主键")
     private String id;
-    /**
-     * 站点
-     */
+
+    /** 站点 */
     @Excel(name = "站点", width = 15)
     @Schema(description = "站点")
     private String siteId;
-    /**
-     * 套餐
-     */
+
+    /** 套餐 */
     @Excel(name = "套餐", width = 15)
     @Schema(description = "套餐")
     private String planId;
-    /**
-     * 创建人
-     */
+
+    /** 创建人 */
     @Schema(description = "创建人")
     private String createBy;
-    /**
-     * 创建日期
-     */
+
+    /** 创建日期 */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建日期")
     private Date createTime;
-    /**
-     * 状态
-     */
+
+    /** 状态 */
     @Excel(name = "状态", width = 15)
     @Schema(description = "状态")
     private Integer status;
-    /**
-     * 方案使用者ID
-     */
+
+    /** 方案使用者ID */
     @Excel(name = "方案使用者ID", width = 15)
     @Schema(description = "方案使用者ID")
     private String usedUid;
-    /**
-     * 方案类型
-     */
+
+    /** 方案类型 */
     @Excel(name = "方案类型", width = 15)
     @Schema(description = "方案类型")
     private String planType;
-    /**
-     * 方案价格
-     */
+
+    /** 方案价格 */
     @Excel(name = "方案价格", width = 15)
     @Schema(description = "方案价格")
     private Double planPrice;
-    /**
-     * 方案编码
-     */
+
+    /** 方案编码 */
     @Excel(name = "方案编码", width = 15)
     @Schema(description = "方案编码")
     private String planCode;
-    /**
-     * 方案名称
-     */
+
+    /** 方案名称 */
     @Excel(name = "方案名称", width = 15)
     @Schema(description = "方案名称")
     private String planName;
-    /**
-     * 指定关键词最早达标时间
-     */
+
+    /** 指定关键词最早达标时间 */
     @Excel(name = "指定关键词最早达标时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "指定关键词最早达标时间")
     private Date keywordsAchieveTime;
-    /**
-     * 是否续费
-     */
+
+    /** 是否续费 */
     @Excel(name = "是否续费", width = 15)
     @Schema(description = "是否续费")
     private Integer isRenew;
-    /**
-     * 是否自定义套餐开始时间
-     */
+
+    /** 是否自定义套餐开始时间 */
     @Excel(name = "是否自定义套餐开始时间", width = 15)
     @Schema(description = "是否自定义套餐开始时间")
     private Integer isCustom;
-    /**
-     * 套餐开启时间
-     */
+
+    /** 套餐开启时间 */
     @Excel(name = "套餐开启时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "套餐开启时间")
     private Date planStartTime;
-    /**
-     * 服务开启时间
-     */
+
+    /** 服务开启时间 */
     @Excel(name = "服务开启时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "服务开启时间")
     private Date serviceStartTime;
-    /**
-     * 服务到期时间
-     */
+
+    /** 服务到期时间 */
     @Excel(name = "服务到期时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "服务到期时间")
     private Date serviceEndTime;
-    /**
-     * 套餐详情的服务时长的按钮切换
-     */
+
+    /** 套餐详情的服务时长的按钮切换 */
     @Excel(name = "套餐详情的服务时长的按钮切换", width = 15)
     @Schema(description = "套餐详情的服务时长的按钮切换")
     private Integer serviceStatus;
-    /**
-     * 套餐时长(单位：月份)
-     */
+
+    /** 套餐时长(单位：月份) */
     @Excel(name = "套餐时长(单位：月份)", width = 15)
     @Schema(description = "套餐时长(单位：月份)")
     private Integer serviceMonth;
-    /**
-     * 0不需要提醒，1需要提醒
-     */
+
+    /** 0不需要提醒，1需要提醒 */
     @Excel(name = "0不需要提醒，1需要提醒", width = 15)
     @Schema(description = "0不需要提醒，1需要提醒")
     private Integer remind;
-    /**
-     * 备注
-     */
+
+    /** 备注 */
     @Excel(name = "备注", width = 15)
     @Schema(description = "备注")
     private String remark;
-    /**
-     * 优化人uid
-     */
+
+    /** 优化人uid */
     @Excel(name = "优化人uid", width = 15)
     @Schema(description = "优化人uid")
     private String optimizerUid;
-    /**
-     * 赠送天数
-     */
+
+    /** 赠送天数 */
     @Excel(name = "赠送天数", width = 15)
     @Schema(description = "赠送天数")
     private Integer giveDay;
-    /**
-     * 补偿天数
-     */
+
+    /** 补偿天数 */
     @Excel(name = "补偿天数", width = 15)
     @Schema(description = "补偿天数")
     private Integer compensateDay;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/mapper/SeoPlanSubscriptionMapper.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscription/mapper/UserPlanSubscriptionMapper.java

@@ -1,19 +1,20 @@
-package org.jeecg.modules.adweb.seo.mapper;
+package org.jeecg.modules.adweb.subscription.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
 import org.apache.ibatis.annotations.Select;
-import org.jeecg.modules.adweb.seo.entity.SeoPlanSubscription;
+import org.jeecg.modules.adweb.subscription.entity.UserPlanSubscription;
 
 import java.util.Map;
 
 /**
- * @Description: seo套餐订购
+ * @Description: AdWeb套餐订购
  * @Author: jeecg-boot
  * @Date: 2024-10-15
  * @Version: V1.0
  */
-public interface SeoPlanSubscriptionMapper extends BaseMapper<SeoPlanSubscription> {
+public interface UserPlanSubscriptionMapper extends BaseMapper<UserPlanSubscription> {
     /**
      * 根据站点code获取关键词达标标准
      *

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/mapper/xml/SeoPlanSubscriptionMapper.xml → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscription/mapper/xml/UserPlanSubscriptionMapper.xml

@@ -1,12 +1,12 @@
 <?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="org.jeecg.modules.adweb.seo.mapper.SeoPlanSubscriptionMapper">
+<mapper namespace="org.jeecg.modules.adweb.subscription.mapper.UserPlanSubscriptionMapper">
     <select id="getKeywordStandard" resultType="java.lang.Integer">
         SELECT
             IF(COUNT(*) = 0 OR t1.target IS NULL, 10, t1.target)
         FROM
             adweb_subscribe_plan t1,
-            adweb_seo_plan_subscription t2,
+            adweb_sysuser_plan_subscription t2,
             adweb_site t3
         WHERE
             t2.`status` = 1

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/service/ISeoPlanSubscriptionService.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscription/service/IUserPlanSubscriptionService.java

@@ -1,28 +1,28 @@
-package org.jeecg.modules.adweb.seo.service;
+package org.jeecg.modules.adweb.subscription.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.adweb.seo.entity.SeoPlanSubscription;
 import org.jeecg.modules.adweb.subscription.entity.SubscribePlan;
+import org.jeecg.modules.adweb.subscription.entity.UserPlanSubscription;
 
 /**
- * @Description: seo套餐订购
+ * @Description: AdWeb套餐订购
  * @Author: jeecg-boot
  * @Date: 2024-10-15
  * @Version: V1.0
  */
-public interface ISeoPlanSubscriptionService extends IService<SeoPlanSubscription> {
+public interface IUserPlanSubscriptionService extends IService<UserPlanSubscription> {
 
     /**
-     * 绑定SEO套餐
+     * 绑定AdWeb套餐
      *
      * @param seoPlanSubscription
      * @param sysUser
      * @return
      */
-    Result<?> addSeoPlanSubscription(SeoPlanSubscription seoPlanSubscription, LoginUser sysUser);
+    Result<?> addSeoPlanSubscription(UserPlanSubscription seoPlanSubscription, LoginUser sysUser);
 
     /**
      * 新增套餐订阅记录
@@ -31,8 +31,8 @@ public interface ISeoPlanSubscriptionService extends IService<SeoPlanSubscriptio
      * @param marketPlan
      * @return
      */
-    boolean addNewSubscription(SeoPlanSubscription seoPlanSubscription, SubscribePlan marketPlan);
+    boolean addNewSubscription(UserPlanSubscription seoPlanSubscription, SubscribePlan marketPlan);
 
     /** 获取正在使用中的SEO套餐，如果没有使用中的SEO和建站套餐，则查询过期的SEO和建站套餐 */
-    SeoPlanSubscription getCurrentSeoAndSiteSubscription(Integer siteId);
+    UserPlanSubscription getCurrentSeoAndSiteSubscription(Integer siteId);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/service/impl/SeoPlanSubscriptionServiceImpl.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscription/service/impl/UserPlanSubscriptionServiceImpl.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.adweb.seo.service.impl;
+package org.jeecg.modules.adweb.subscription.service.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
@@ -11,11 +11,11 @@ import jakarta.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.adweb.seo.entity.SeoPlanSubscription;
-import org.jeecg.modules.adweb.seo.mapper.SeoPlanSubscriptionMapper;
-import org.jeecg.modules.adweb.seo.service.ISeoPlanSubscriptionService;
 import org.jeecg.modules.adweb.subscription.entity.SubscribePlan;
+import org.jeecg.modules.adweb.subscription.entity.UserPlanSubscription;
+import org.jeecg.modules.adweb.subscription.mapper.UserPlanSubscriptionMapper;
 import org.jeecg.modules.adweb.subscription.service.ISubscribePlanService;
+import org.jeecg.modules.adweb.subscription.service.IUserPlanSubscriptionService;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
@@ -23,21 +23,21 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @Description: seo套餐订购
+ * @Description: AdWeb套餐订购
  * @Author: jeecg-boot
  * @Date: 2024-10-15
  * @Version: V1.0
  */
 @Service
-public class SeoPlanSubscriptionServiceImpl
-        extends ServiceImpl<SeoPlanSubscriptionMapper, SeoPlanSubscription>
-        implements ISeoPlanSubscriptionService {
+public class UserPlanSubscriptionServiceImpl
+        extends ServiceImpl<UserPlanSubscriptionMapper, UserPlanSubscription>
+        implements IUserPlanSubscriptionService {
 
     @Resource private ISubscribePlanService subscribePlanService;
 
     @Override
     public Result<?> addSeoPlanSubscription(
-            SeoPlanSubscription seoPurchaseHistory, LoginUser sysUser) {
+            UserPlanSubscription seoPurchaseHistory, LoginUser sysUser) {
         boolean result = false;
 
         SubscribePlan marketPlan = subscribePlanService.getById(seoPurchaseHistory.getPlanId());
@@ -53,27 +53,27 @@ public class SeoPlanSubscriptionServiceImpl
 
         // 如果不是续费客户(就是新客户)的话，直接入库，套餐开启时间即是现在
         if (seoPurchaseHistory.getIsRenew() == null || seoPurchaseHistory.getIsRenew() == 0) {
-            LambdaQueryWrapper<SeoPlanSubscription> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(SeoPlanSubscription::getSiteId, seoPurchaseHistory.getSiteId());
-            queryWrapper.eq(SeoPlanSubscription::getStatus, 1);
-            List<SeoPlanSubscription> seoPurchaseHistoryList = this.list(queryWrapper);
+            LambdaQueryWrapper<UserPlanSubscription> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(UserPlanSubscription::getSiteId, seoPurchaseHistory.getSiteId());
+            queryWrapper.eq(UserPlanSubscription::getStatus, 1);
+            List<UserPlanSubscription> seoPurchaseHistoryList = this.list(queryWrapper);
             if (!CollectionUtils.isEmpty(seoPurchaseHistoryList)) {
                 return Result.error("站点存在使用中套餐，请到期后绑定！");
             }
             result = this.addNewSubscription(seoPurchaseHistory, marketPlan);
         } else { // 续费
             // 判断是否有正在使用的套餐，如果没有，新建status为1的套餐
-            LambdaQueryWrapper<SeoPlanSubscription> oldQueryWrapper = new LambdaQueryWrapper<>();
-            oldQueryWrapper.eq(SeoPlanSubscription::getSiteId, seoPurchaseHistory.getSiteId());
-            oldQueryWrapper.eq(SeoPlanSubscription::getStatus, 1);
-            List<SeoPlanSubscription> oldHistoryList = this.list(oldQueryWrapper);
+            LambdaQueryWrapper<UserPlanSubscription> oldQueryWrapper = new LambdaQueryWrapper<>();
+            oldQueryWrapper.eq(UserPlanSubscription::getSiteId, seoPurchaseHistory.getSiteId());
+            oldQueryWrapper.eq(UserPlanSubscription::getStatus, 1);
+            List<UserPlanSubscription> oldHistoryList = this.list(oldQueryWrapper);
             if (CollectionUtils.isEmpty(oldHistoryList)) {
                 return Result.error("站点不存在使用中套餐，请先新增套餐");
             } else {
-                LambdaQueryWrapper<SeoPlanSubscription> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq(SeoPlanSubscription::getSiteId, seoPurchaseHistory.getSiteId());
-                queryWrapper.eq(SeoPlanSubscription::getStatus, 2);
-                List<SeoPlanSubscription> seoPurchaseHistoryList = this.list(queryWrapper);
+                LambdaQueryWrapper<UserPlanSubscription> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(UserPlanSubscription::getSiteId, seoPurchaseHistory.getSiteId());
+                queryWrapper.eq(UserPlanSubscription::getStatus, 2);
+                List<UserPlanSubscription> seoPurchaseHistoryList = this.list(queryWrapper);
                 if (!CollectionUtils.isEmpty(seoPurchaseHistoryList)) {
                     return Result.error("同一站点不能同时续费多个相同类型的套餐！");
                 }
@@ -81,24 +81,24 @@ public class SeoPlanSubscriptionServiceImpl
                 if (seoPurchaseHistory.getIsCustom() == 0) {
                     // ->不是自定义服务开启时间 需找到多个套餐服务结束时间最大的那个
                     // 此站点所有对应的套餐的最大服务结束时间
-                    SeoPlanSubscription history =
+                    UserPlanSubscription history =
                             this.getOne(
-                                    new LambdaQueryWrapper<SeoPlanSubscription>()
+                                    new LambdaQueryWrapper<UserPlanSubscription>()
                                             .eq(
-                                                    SeoPlanSubscription::getSiteId,
+                                                    UserPlanSubscription::getSiteId,
                                                     seoPurchaseHistory.getSiteId())
                                             .and(
                                                     wrapper ->
                                                             wrapper.eq(
-                                                                            SeoPlanSubscription
+                                                                            UserPlanSubscription
                                                                                     ::getStatus,
                                                                             1)
                                                                     .or()
                                                                     .eq(
-                                                                            SeoPlanSubscription
+                                                                            UserPlanSubscription
                                                                                     ::getStatus,
                                                                             2))
-                                            .orderByDesc(SeoPlanSubscription::getServiceEndTime)
+                                            .orderByDesc(UserPlanSubscription::getServiceEndTime)
                                             .last("limit 1"));
                     Date maxEndTime = null;
                     if (history == null || history.getServiceEndTime() == null) {
@@ -150,7 +150,7 @@ public class SeoPlanSubscriptionServiceImpl
 
     @Override
     public boolean addNewSubscription(
-            SeoPlanSubscription seoPurchaseHistory, SubscribePlan marketPlan) {
+            UserPlanSubscription seoPurchaseHistory, SubscribePlan marketPlan) {
         boolean result = false;
         try {
             Date startTime = new Date();
@@ -171,18 +171,18 @@ public class SeoPlanSubscriptionServiceImpl
 
     /** 获取正在使用中的SEO套餐，如果没有使用中的SEO和建站套餐，则查询过期的SEO和建站套餐 */
     @Override
-    public SeoPlanSubscription getCurrentSeoAndSiteSubscription(Integer siteId) {
-        LambdaQueryWrapper<SeoPlanSubscription> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(SeoPlanSubscription::getSiteId, siteId);
+    public UserPlanSubscription getCurrentSeoAndSiteSubscription(Integer siteId) {
+        LambdaQueryWrapper<UserPlanSubscription> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(UserPlanSubscription::getSiteId, siteId);
         queryWrapper.and(
                 wrapper ->
-                        wrapper.eq(SeoPlanSubscription::getPlanType, "SEO")
+                        wrapper.eq(UserPlanSubscription::getPlanType, "SEO")
                                 .or()
-                                .eq(SeoPlanSubscription::getPlanType, "STATIONCONSTRUCTION"));
-        queryWrapper.in(SeoPlanSubscription::getStatus, Arrays.asList(1, -1));
+                                .eq(UserPlanSubscription::getPlanType, "STATIONCONSTRUCTION"));
+        queryWrapper.in(UserPlanSubscription::getStatus, Arrays.asList(1, -1));
         queryWrapper.orderByDesc(
-                SeoPlanSubscription::getStatus, SeoPlanSubscription::getCreateTime);
-        List<SeoPlanSubscription> histories = this.list(queryWrapper);
+                UserPlanSubscription::getStatus, UserPlanSubscription::getCreateTime);
+        List<UserPlanSubscription> histories = this.list(queryWrapper);
         if (CollectionUtils.isNotEmpty(histories)) {
             return histories.get(0);
         }