Java format

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/product/controller/AdwebProductController.java

@@ -32,8 +32,7 @@ import java.util.Arrays;
 @RequestMapping("/adweb/adwebProduct")
 @Slf4j
 public class AdwebProductController extends JeecgController<AdwebProduct, IAdwebProductService> {
-    @Autowired
-    private IAdwebProductService adwebProductService;
+    @Autowired private IAdwebProductService adwebProductService;
 
     /**
      * 分页列表查询
@@ -44,14 +43,16 @@ public class AdwebProductController extends JeecgController<AdwebProduct, IAdweb
      * @param req
      * @return
      */
-    //@AutoLog(value = "wp站点产品-分页列表查询")
+    // @AutoLog(value = "wp站点产品-分页列表查询")
     @Operation(summary = "wp站点产品-分页列表查询")
     @GetMapping(value = "/list")
-    public Result<IPage<AdwebProduct>> queryPageList(AdwebProduct adwebProduct,
-                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                     HttpServletRequest req) {
-        QueryWrapper<AdwebProduct> queryWrapper = QueryGenerator.initQueryWrapper(adwebProduct, req.getParameterMap());
+    public Result<IPage<AdwebProduct>> queryPageList(
+            AdwebProduct adwebProduct,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<AdwebProduct> queryWrapper =
+                QueryGenerator.initQueryWrapper(adwebProduct, req.getParameterMap());
         Page<AdwebProduct> page = new Page<AdwebProduct>(pageNo, pageSize);
         IPage<AdwebProduct> pageList = adwebProductService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -81,7 +82,9 @@ public class AdwebProductController extends JeecgController<AdwebProduct, IAdweb
     @AutoLog(value = "wp站点产品-编辑")
     @Operation(summary = "wp站点产品-编辑")
     @PreAuthorize("@jps.requiresPermissions('adweb:adweb_product:edit')")
-    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    @RequestMapping(
+            value = "/edit",
+            method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> edit(@RequestBody AdwebProduct adwebProduct) {
         adwebProductService.updateById(adwebProduct);
         return Result.OK("编辑成功!");
@@ -123,7 +126,7 @@ public class AdwebProductController extends JeecgController<AdwebProduct, IAdweb
      * @param id
      * @return
      */
-    //@AutoLog(value = "wp站点产品-通过id查询")
+    // @AutoLog(value = "wp站点产品-通过id查询")
     @Operation(summary = "wp站点产品-通过id查询")
     @GetMapping(value = "/queryById")
     public Result<AdwebProduct> queryById(@RequestParam(name = "id", required = true) String id) {
@@ -158,5 +161,4 @@ public class AdwebProductController extends JeecgController<AdwebProduct, IAdweb
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, AdwebProduct.class);
     }
-
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/product/dto/ProductDTO.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.adweb.product.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+
 import lombok.Data;
 
 import java.util.Date;
@@ -10,56 +11,39 @@ import java.util.Date;
  */
 @Data
 public class ProductDTO {
-    /**
-     *
-     */
+    /** */
     private Integer productId;
 
-    /**
-     * adwebpro or woocommerce
-     */
+    /** adwebpro or woocommerce */
     private String productType;
 
-    /**
-     * add, edit, delete
-     */
+    /** add, edit, delete */
     private String actionType;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(
+            shape = JsonFormat.Shape.STRING,
+            timezone = "GMT+8",
+            pattern = "yyyy-MM-dd HH:mm:ss")
     private Date requestTime;
-    /**
-     *
-     */
+
+    /** */
     private String productName;
 
-    /**
-     *
-     */
+    /** */
     private String productNameZh;
 
-    /**
-     *
-     */
+    /** */
     private String productImage;
 
-    /**
-     *
-     */
+    /** */
     private String[] productGalleryImage;
 
-    /**
-     *
-     */
+    /** */
     private String categoryName;
 
-    /**
-     *
-     */
+    /** */
     private String authorName;
 
-    /**
-     * siteHost
-     */
-
+    /** siteHost */
     private String siteHost;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/product/service/impl/AdwebProductServiceImpl.java

@@ -4,11 +4,14 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.codec.Base64Encoder;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
+
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.jeecg.modules.adweb.common.constant.AdwebConstant;
 import org.jeecg.modules.adweb.product.dto.ProductDTO;
 import org.jeecg.modules.adweb.product.entity.AdwebProduct;
@@ -32,7 +35,8 @@ import java.net.URL;
  */
 @Service
 @Slf4j
-public class AdwebProductServiceImpl extends ServiceImpl<AdwebProductMapper, AdwebProduct> implements IAdwebProductService {
+public class AdwebProductServiceImpl extends ServiceImpl<AdwebProductMapper, AdwebProduct>
+        implements IAdwebProductService {
 
     private final String SOHOEB2B_PUSH_PRODUCT_API = "https://admin.etcpu.com/api/product/product/";
 
@@ -52,7 +56,6 @@ public class AdwebProductServiceImpl extends ServiceImpl<AdwebProductMapper, Adw
         }
 
         pushSohoeB2BProduct(productDTO, adwebSites);
-
     }
 
     private void handleUpdate(ProductDTO productDTO, AdwebSite adwebSites) {
@@ -79,7 +82,11 @@ public class AdwebProductServiceImpl extends ServiceImpl<AdwebProductMapper, Adw
 
         try {
             boolean isUpdated = this.update(productQuery);
-            log.info("MQ消息删除产品成功, 网站：{}, 产品ID：{}, 是否更新成功：{}", adwebSites.getCode(), productDTO.getProductId(), isUpdated);
+            log.info(
+                    "MQ消息删除产品成功, 网站：{}, 产品ID：{}, 是否更新成功：{}",
+                    adwebSites.getCode(),
+                    productDTO.getProductId(),
+                    isUpdated);
         } catch (Exception e) {
             log.error("MQ消息删除产品失败：{}", e.getMessage(), e);
         }
@@ -122,8 +129,8 @@ public class AdwebProductServiceImpl extends ServiceImpl<AdwebProductMapper, Adw
 
     /**
      * 异步向苏豪通推送产品消息队列
-     * <p>
-     * TODO 待确定，是否在V3产品中加入推送到苏豪是否成功的状态
+     *
+     * <p>TODO 待确定，是否在V3产品中加入推送到苏豪是否成功的状态
      */
     @Async
     protected void pushSohoeB2BProduct(ProductDTO productDTO, AdwebSite adwebSites) {
@@ -141,12 +148,14 @@ public class AdwebProductServiceImpl extends ServiceImpl<AdwebProductMapper, Adw
 
             log.info("向苏豪推送产品消息,api地址：{}， 参数：{}", SOHOEB2B_PUSH_PRODUCT_API, params);
             try {
-                HttpResponse response = HttpRequest
-                        .post(SOHOEB2B_PUSH_PRODUCT_API)
-                        .header("Content-Type", "application/json")
-                        .header("Authorization", "Token f354b8a705c862abeae1f4f96dc55999fb9b3579")
-                        .body(params.toString())
-                        .execute(true);
+                HttpResponse response =
+                        HttpRequest.post(SOHOEB2B_PUSH_PRODUCT_API)
+                                .header("Content-Type", "application/json")
+                                .header(
+                                        "Authorization",
+                                        "Token f354b8a705c862abeae1f4f96dc55999fb9b3579")
+                                .body(params.toString())
+                                .execute(true);
 
                 if (response != null && response.getStatus() == 200) {
                     log.info("推送产品到苏豪成功：{}", response.body());
@@ -155,7 +164,6 @@ public class AdwebProductServiceImpl extends ServiceImpl<AdwebProductMapper, Adw
                 }
             } catch (Exception e) {
                 log.info("推送产品到苏豪失败：{}", e.getMessage());
-
             }
         }
     }
@@ -173,13 +181,13 @@ public class AdwebProductServiceImpl extends ServiceImpl<AdwebProductMapper, Adw
             is = httpUrl.getInputStream();
 
             outStream = new ByteArrayOutputStream();
-            //创建一个Buffer字符串
+            // 创建一个Buffer字符串
             byte[] buffer = new byte[1024];
-            //每次读取的字符串长度，如果为-1，代表全部读取完毕
+            // 每次读取的字符串长度，如果为-1，代表全部读取完毕
             int len = 0;
-            //使用一个输入流从buffer里把数据读取出来
+            // 使用一个输入流从buffer里把数据读取出来
             while ((len = is.read(buffer)) != -1) {
-                //用输出流往buffer里写入数据，中间参数代表从哪个位置开始读，len代表读取的长度
+                // 用输出流往buffer里写入数据，中间参数代表从哪个位置开始读，len代表读取的长度
                 outStream.write(buffer, 0, len);
             }
             // 对字节数组Base64编码

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

@@ -58,30 +58,27 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
- * @Description: 关键词 @Author: jeecg-boot @Date: 2024-10-15 @Version: V1.0
+ * @Description: 关键词
+ * @Author: jeecg-boot
+ * @Date: 2024-10-15
+ * @Version: V1.0
  */
 @Tag(name = "关键词")
 @RestController
 @RequestMapping("/seo/seoKeywords")
 @Slf4j
 public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeywordsService> {
-    @Autowired
-    private ISeoKeywordsService seoKeywordsService;
+    @Autowired private ISeoKeywordsService seoKeywordsService;
 
-    @Autowired
-    ISeoKeywordsRankService seoKeywordsRankService;
+    @Autowired ISeoKeywordsRankService seoKeywordsRankService;
 
-    @Autowired
-    ISeoKeywordsRankService seoKpiStatisticsService;
+    @Autowired ISeoKeywordsRankService seoKpiStatisticsService;
 
-    @Autowired
-    private SysAdwebApi sysAdwebApi;
+    @Autowired private SysAdwebApi sysAdwebApi;
 
-    @Autowired
-    private IAdwebSiteService adwebSiteService;
+    @Autowired private IAdwebSiteService adwebSiteService;
 
-    @Autowired
-    private ISeoPlanSubscriptionService seoPlanSubscriptionService;
+    @Autowired private ISeoPlanSubscriptionService seoPlanSubscriptionService;
 
     @Value("${jeecg.path.upload}")
     private String uploadUrl;
@@ -110,14 +107,17 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
         if (StringUtil.isNotEmpty(seoKeywords.getKeywords())) {
             queryWrapper.like(SeoKeywords::getKeywords, "%" + seoKeywords.getKeywords() + "%");
         }
-//        queryWrapper.eq("related_keyword_id", seoKeywords.getRelatedKeywordId());
-//        queryWrapper.eq("subscription_id", seoKeywords.getSubscriptionId());
+        //        queryWrapper.eq("related_keyword_id", seoKeywords.getRelatedKeywordId());
+        //        queryWrapper.eq("subscription_id", seoKeywords.getSubscriptionId());
         queryWrapper.eq(SeoKeywords::getSiteCode, seoKeywords.getSiteCode());
         if (seoKeywords.getKeywordType() != null) {
             queryWrapper.eq(SeoKeywords::getKeywordType, seoKeywords.getKeywordType());
         }
         queryWrapper.ne(SeoKeywords::getStatus, 0);
-        queryWrapper.orderByAsc(SeoKeywords::getPriority).orderByDesc(SeoKeywords::getOptimizeProcess).orderByDesc(SeoKeywords::getCreateTime);
+        queryWrapper
+                .orderByAsc(SeoKeywords::getPriority)
+                .orderByDesc(SeoKeywords::getOptimizeProcess)
+                .orderByDesc(SeoKeywords::getCreateTime);
         Page<SeoKeywords> page = new Page<SeoKeywords>(pageNo, pageSize);
         IPage<SeoKeywords> pageList = seoKeywordsService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -134,16 +134,16 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
     @PreAuthorize("@jps.requiresPermissions('keywords:seo_keywords:add')")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody SeoKeywords seoKeywords) {
-//        AdwebSite siteByCode = adwebSiteService.getSiteByCode(seoKeywords.getSiteCode());
-//        if (siteByCode == null) {
-//            return Result.error("未找到对应站点");
-//        }
+        //        AdwebSite siteByCode = adwebSiteService.getSiteByCode(seoKeywords.getSiteCode());
+        //        if (siteByCode == null) {
+        //            return Result.error("未找到对应站点");
+        //        }
         seoKeywords.setAppKey(AdwebConstant.APPKEY);
         // 根据siteCode获取站点域名
-//        String domain = siteByCode.getDomain();
-//        seoKeywords.setDomain(domain);
+        //        String domain = siteByCode.getDomain();
+        //        seoKeywords.setDomain(domain);
         seoKeywords.setStatus(1);
-//        seoKeywords.setLang("en");
+        //        seoKeywords.setLang("en");
         seoKeywordsService.save(seoKeywords);
         return Result.OK("添加成功！");
     }
@@ -223,9 +223,7 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
         return super.exportXls(request, seoKeywords, SeoKeywords.class, "关键词");
     }
 
-    /**
-     * 关键词排名页面 - 列表数据
-     */
+    /** 关键词排名页面 - 列表数据 */
     @AutoLog(value = "营销推广-SEO-关键词排名统计查询接口")
     @RequestMapping(value = "/keywordList")
     public Result<?> queryRankInfoList(
@@ -234,9 +232,9 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
             HttpServletRequest req)
             throws Exception {
-//        if (sysBaseAPI.isNotOwnSite(avesApiSearchKeywordsDTO.getSiteCode())) {
-//            return Result.OK(new Page<>());
-//        }
+        //        if (sysBaseAPI.isNotOwnSite(avesApiSearchKeywordsDTO.getSiteCode())) {
+        //            return Result.OK(new Page<>());
+        //        }
         // 参数判断
         IPage<SeoKeywords> pageList = new Page<>();
         String siteCode = req.getParameter("siteCode");
@@ -365,7 +363,7 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
                     "Content-Disposition",
                     "attachment;filename="
                             + new String(
-                            (fileName + ".xlsx").getBytes(), StandardCharsets.ISO_8859_1));
+                                    (fileName + ".xlsx").getBytes(), StandardCharsets.ISO_8859_1));
             out = response.getOutputStream();
             log.info("导出数据：" + list);
             writer.write(list, true);
@@ -404,7 +402,8 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
         if (StringUtil.isEmpty(site.getDomain())) {
             return Result.error("站点域名未设置！");
         }
-        SeoPlanSubscription currentSeoAndSiteSubscription = seoPlanSubscriptionService.getCurrentSeoAndSiteSubscription(site.getId());
+        SeoPlanSubscription currentSeoAndSiteSubscription =
+                seoPlanSubscriptionService.getCurrentSeoAndSiteSubscription(site.getId());
 
         if (currentSeoAndSiteSubscription == null) {
             return Result.error("当前站点没有有效的订阅套餐！");
@@ -419,7 +418,10 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
             try {
                 SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
                 String formattedDate = dateFormat.format(now);
-                File realFile = new File(uploadUrl, formattedDate + RandomStringUtils.random(4, true, true) + ".xlsx");
+                File realFile =
+                        new File(
+                                uploadUrl,
+                                formattedDate + RandomStringUtils.random(4, true, true) + ".xlsx");
                 file.transferTo(realFile);
                 stream = new FileInputStream(realFile);
                 XSSFWorkbook workbook = new XSSFWorkbook(stream);
@@ -472,14 +474,15 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
                     list.add(seoKeywords);
                 }
 
-                //新增关键词本身去重
+                // 新增关键词本身去重
                 Integer originalSize = list.size();
                 List<SeoKeywords> listNew = distinct(list);
                 // 去重
                 LambdaQueryWrapper<SeoKeywords> queryWrapper = new LambdaQueryWrapper<>();
                 queryWrapper.eq(SeoKeywords::getSiteCode, site.getCode());
                 queryWrapper.ne(SeoKeywords::getStatus, 0);
-                queryWrapper.eq(SeoKeywords::getSubscriptionId, currentSeoAndSiteSubscription.getId());
+                queryWrapper.eq(
+                        SeoKeywords::getSubscriptionId, currentSeoAndSiteSubscription.getId());
                 List<SeoKeywords> existingKeywordList = seoKeywordsService.list(queryWrapper);
                 if (CollectionUtil.isNotEmpty(existingKeywordList)) {
                     List<String> existingKeywords = new ArrayList<>();
@@ -500,10 +503,16 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
 
                 String msg = "关键词导入成功！关键词个数：" + listNew.size();
                 if (originalSize > listNew.size()) {
-                    msg = "关键词导入成功！关键词个数：" + listNew.size() + "，重复关键词已去除！重复个数：" + (originalSize - listNew.size());
+                    msg =
+                            "关键词导入成功！关键词个数："
+                                    + listNew.size()
+                                    + "，重复关键词已去除！重复个数："
+                                    + (originalSize - listNew.size());
                 }
 
-                return seoKeywordsService.saveBatch(listNew) ? Result.OK(msg) : Result.error("关键词导入失败！");
+                return seoKeywordsService.saveBatch(listNew)
+                        ? Result.OK(msg)
+                        : Result.error("关键词导入失败！");
 
             } catch (Exception e) {
                 log.error(e.getMessage(), e);
@@ -519,7 +528,6 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
         return Result.error("文件导入失败！");
     }
 
-
     /**
      * @param seoKeywords
      * @return

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

@@ -17,7 +17,10 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @Description: adweb_seo_keywords_rank @Author: jeecg-boot @Date: 2024-10-09 @Version: V1.0
+ * @Description: adweb_seo_keywords_rank
+ * @Author: jeecg-boot
+ * @Date: 2024-10-09
+ * @Version: V1.0
  */
 @Tag(name = "adweb_seo_keywords_rank")
 @RestController
@@ -33,27 +36,23 @@ public class SeoKeywordsRankController {
         return Result.OK(allSites);
     }
 
-    /**
-     * 根据 站点code 获取 站点的 订阅Id
-     */
+    /** 根据 站点code 获取 站点的 订阅Id */
     @GetMapping(value = "/getSubscriptionIdBySiteCode")
-    public Result<List<SeoPlanSubscription>> getSubscriptionIdBySiteCode(@RequestParam String siteCode) {
-        final List<SeoPlanSubscription> subscriptionIdBySiteCode = seoKeywordsRankService.getSubscriptionIdBySiteCode(siteCode);
+    public Result<List<SeoPlanSubscription>> getSubscriptionIdBySiteCode(
+            @RequestParam String siteCode) {
+        final List<SeoPlanSubscription> subscriptionIdBySiteCode =
+                seoKeywordsRankService.getSubscriptionIdBySiteCode(siteCode);
         return Result.OK(subscriptionIdBySiteCode);
     }
 
-    /**
-     * 获得综合统计信息
-     */
+    /** 获得综合统计信息 */
     @GetMapping(value = "/comprehensiveInfo")
     public Result<?> getComprehensiveInfo(@RequestParam String siteCode) throws ParseException {
         ComprehensiveStatistics statistics = seoKeywordsRankService.getComprehensiveInfo(siteCode);
         return Result.OK(statistics);
     }
 
-    /**
-     * 获取关键字排名信息
-     */
+    /** 获取关键字排名信息 */
     @GetMapping(value = "/getRankInfo")
     public Result<?> getRankInfo(@RequestParam("siteCode") String siteCode) throws ParseException {
         Map map = seoKeywordsRankService.getRankInfo(siteCode);

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

@@ -26,7 +26,10 @@ import org.springframework.web.servlet.ModelAndView;
 import java.util.Arrays;
 
 /**
- * @Description: SEO关键词搜索排名 @Author: jeecg-boot @Date: 2024-10-15 @Version: V1.0
+ * @Description: SEO关键词搜索排名
+ * @Author: jeecg-boot
+ * @Date: 2024-10-15
+ * @Version: V1.0
  */
 @Tag(name = "SEO关键词搜索排名")
 @RestController

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

@@ -21,15 +21,18 @@ import org.springframework.web.bind.annotation.*;
 import java.util.*;
 
 /**
- * @Description: seo_month_pdf @Author: jeecg-boot @Date: 2023-07-06 @Version: V1.0
+ * @Description: seo_month_pdf
+ * @Author: jeecg-boot
+ * @Date: 2023-07-06
+ * @Version: V1.0
  */
 @RestController
 @RequestMapping("/seo/seoMonthPdf")
 @Slf4j
 public class SeoMonthPdfController {
-    
+
     @Autowired private SysAdwebApi sysAdwebApi;
-    
+
     @Autowired private ISysDictItemService sysDictItemService;
 
     @Autowired private ISeoMonthPdfService seoMonthPdfService;
@@ -82,9 +85,11 @@ public class SeoMonthPdfController {
     }
 
     @GetMapping("/getSeoKeywordsRank")
-    public Result<?> getSeoKeywordsRank(@RequestParam String siteCode, @RequestParam String exportMonth) {
+    public Result<?> getSeoKeywordsRank(
+            @RequestParam String siteCode, @RequestParam String exportMonth) {
         log.info("siteCode:{},exportMonth:{}", siteCode, exportMonth);
-        MonthPdfKeywordsRankVO seoKeywordsRank = seoMonthPdfService.getSeoKeywordsRank(siteCode, exportMonth);
+        MonthPdfKeywordsRankVO seoKeywordsRank =
+                seoMonthPdfService.getSeoKeywordsRank(siteCode, exportMonth);
         log.info("seoKeywordsRank:{}", seoKeywordsRank);
         return Result.OK(seoKeywordsRank);
     }

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

@@ -1,164 +1,171 @@
 package org.jeecg.modules.adweb.seo.controller;
 
-import java.util.Arrays;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.adweb.seo.entity.SeoPlanSubscription;
-import org.jeecg.modules.adweb.seo.service.ISeoPlanSubscriptionService;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.springframework.security.access.prepost.PreAuthorize;
 
- /**
+import java.util.Arrays;
+
+/**
  * @Description: seo套餐订购
  * @Author: jeecg-boot
- * @Date:   2024-10-15
+ * @Date: 2024-10-15
  * @Version: V1.0
  */
-@Tag(name="seo套餐订购")
+@Tag(name = "seo套餐订购")
 @RestController
 @RequestMapping("/serp/seoPlanSubscription")
 @Slf4j
-public class SeoPlanSubscriptionController extends JeecgController<SeoPlanSubscription, ISeoPlanSubscriptionService> {
-	@Autowired
-	private ISeoPlanSubscriptionService seoPlanSubscriptionService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param seoPlanSubscription
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "seo套餐订购-分页列表查询")
-	@Operation(summary="seo套餐订购-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<SeoPlanSubscription>> queryPageList(SeoPlanSubscription seoPlanSubscription,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<SeoPlanSubscription> queryWrapper = QueryGenerator.initQueryWrapper(seoPlanSubscription, req.getParameterMap());
-		Page<SeoPlanSubscription> page = new Page<SeoPlanSubscription>(pageNo, pageSize);
-		IPage<SeoPlanSubscription> pageList = seoPlanSubscriptionService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param seoPlanSubscription
-	 * @return
-	 */
-	@AutoLog(value = "seo套餐订购-添加")
-	@Operation(summary="seo套餐订购-添加")
-	@PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:add')")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody SeoPlanSubscription seoPlanSubscription) {
-		seoPlanSubscriptionService.save(seoPlanSubscription);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param seoPlanSubscription
-	 * @return
-	 */
-	@AutoLog(value = "seo套餐订购-编辑")
-	@Operation(summary="seo套餐订购-编辑")
+public class SeoPlanSubscriptionController
+        extends JeecgController<SeoPlanSubscription, ISeoPlanSubscriptionService> {
+    @Autowired private ISeoPlanSubscriptionService seoPlanSubscriptionService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param seoPlanSubscription
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    // @AutoLog(value = "seo套餐订购-分页列表查询")
+    @Operation(summary = "seo套餐订购-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<SeoPlanSubscription>> queryPageList(
+            SeoPlanSubscription seoPlanSubscription,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<SeoPlanSubscription> queryWrapper =
+                QueryGenerator.initQueryWrapper(seoPlanSubscription, req.getParameterMap());
+        Page<SeoPlanSubscription> page = new Page<SeoPlanSubscription>(pageNo, pageSize);
+        IPage<SeoPlanSubscription> pageList = seoPlanSubscriptionService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param seoPlanSubscription
+     * @return
+     */
+    @AutoLog(value = "seo套餐订购-添加")
+    @Operation(summary = "seo套餐订购-添加")
+    @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:add')")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody SeoPlanSubscription seoPlanSubscription) {
+        seoPlanSubscriptionService.save(seoPlanSubscription);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param seoPlanSubscription
+     * @return
+     */
+    @AutoLog(value = "seo套餐订购-编辑")
+    @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) {
-		seoPlanSubscriptionService.updateById(seoPlanSubscription);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "seo套餐订购-通过id删除")
-	@Operation(summary="seo套餐订购-通过id删除")
+    @RequestMapping(
+            value = "/edit",
+            method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody SeoPlanSubscription seoPlanSubscription) {
+        seoPlanSubscriptionService.updateById(seoPlanSubscription);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "seo套餐订购-通过id删除")
+    @Operation(summary = "seo套餐订购-通过id删除")
     @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:delete')")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		seoPlanSubscriptionService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "seo套餐订购-批量删除")
-	@Operation(summary="seo套餐订购-批量删除")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        seoPlanSubscriptionService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "seo套餐订购-批量删除")
+    @Operation(summary = "seo套餐订购-批量删除")
     @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:deleteBatch')")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.seoPlanSubscriptionService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "seo套餐订购-通过id查询")
-	@Operation(summary="seo套餐订购-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<SeoPlanSubscription> queryById(@RequestParam(name="id",required=true) String id) {
-		SeoPlanSubscription seoPlanSubscription = seoPlanSubscriptionService.getById(id);
-		if(seoPlanSubscription==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(seoPlanSubscription);
-	}
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.seoPlanSubscriptionService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
 
     /**
-    * 导出excel
-    *
-    * @param request
-    * @param seoPlanSubscription
-    */
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    // @AutoLog(value = "seo套餐订购-通过id查询")
+    @Operation(summary = "seo套餐订购-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<SeoPlanSubscription> queryById(
+            @RequestParam(name = "id", required = true) String id) {
+        SeoPlanSubscription seoPlanSubscription = seoPlanSubscriptionService.getById(id);
+        if (seoPlanSubscription == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(seoPlanSubscription);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param seoPlanSubscription
+     */
     @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:exportXls')")
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, SeoPlanSubscription seoPlanSubscription) {
+    public ModelAndView exportXls(
+            HttpServletRequest request, SeoPlanSubscription seoPlanSubscription) {
         return super.exportXls(request, seoPlanSubscription, SeoPlanSubscription.class, "seo套餐订购");
     }
 
     /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
     @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);
     }
-
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/dto/AvesApiSearchKeywordsDTO.java

@@ -16,8 +16,10 @@ import java.util.Date;
 public class AvesApiSearchKeywordsDTO {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date startTime;
+
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
+
     private Integer keywordType;
     private String keywords;
     private Integer rankStart;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/dto/ComprehensiveStatistics.java

@@ -3,48 +3,31 @@ package org.jeecg.modules.adweb.seo.dto;
 import lombok.Data;
 
 /**
- * @author Zenas
- * 综合统计类
+ * @author Zenas 综合统计类
  */
-
 @Data
 public class ComprehensiveStatistics {
-    /**
-     * 套餐指定词
-     */
+    /** 套餐指定词 */
     private Integer planAppointKeywordNum;
 
-    /**
-     * 套餐长尾词
-     */
+    /** 套餐长尾词 */
     private Integer planLongTailKeywordNum;
 
-    /**
-     * 套餐外链数
-     */
+    /** 套餐外链数 */
     private Integer planOuterLinkNum;
 
-    /**
-     * 套餐文章数
-     */
+    /** 套餐文章数 */
     private Integer planArticleNum;
-    /**
-     * 指定词
-     */
+
+    /** 指定词 */
     private Integer appointKeywordNum;
 
-    /**
-     * 长尾词
-     */
+    /** 长尾词 */
     private Integer longTailKeywordNum;
 
-    /**
-     * 外链数
-     */
+    /** 外链数 */
     private Integer outerLinkNum;
 
-    /**
-     * 文章数
-     */
+    /** 文章数 */
     private Integer articleNum;
 }

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

@@ -14,7 +14,7 @@ import java.util.Map;
 /**
  * @Description: seo_kpi_statistics
  * @Author: jeecg-boot
- * @Date:   2024-10-09
+ * @Date: 2024-10-09
  * @Version: V1.0
  */
 public interface ISeoKeywordsRankService {
@@ -25,10 +25,15 @@ public interface ISeoKeywordsRankService {
 
     Map getRankInfo(String siteCode) throws ParseException;
 
-    List<SeoRankInfoVO> getSeoRankInfo(String siteCode, String historyId)
-            throws ParseException;
+    List<SeoRankInfoVO> getSeoRankInfo(String siteCode, String historyId) throws ParseException;
 
-    void addRankInfoByIntervalTimeByType(List<SeoKeywords> keywordList, Integer keywordType, String siteCode, String historyId, List<String> dateList) throws Exception;
+    void addRankInfoByIntervalTimeByType(
+            List<SeoKeywords> keywordList,
+            Integer keywordType,
+            String siteCode,
+            String historyId,
+            List<String> dateList)
+            throws Exception;
 
     void setSizeColumn(Sheet sheet, int size);
 

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

@@ -1,13 +1,15 @@
 package org.jeecg.modules.adweb.seo.service;
 
-import org.jeecg.modules.adweb.seo.entity.SeoKeywordsSerp;
 import com.baomidou.mybatisplus.extension.service.IService;
+
+import org.jeecg.modules.adweb.seo.entity.SeoKeywordsSerp;
+
 import java.util.Date;
 
 /**
  * @Description: SEO关键词搜索排名
  * @Author: jeecg-boot
- * @Date:   2024-10-15
+ * @Date: 2024-10-15
  * @Version: V1.0
  */
 public interface ISeoKeywordsSerpService extends IService<SeoKeywordsSerp> {

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

@@ -13,29 +13,46 @@ import java.util.List;
 /**
  * @Description: 关键词
  * @Author: jeecg-boot
- * @Date:   2024-10-15
+ * @Date: 2024-10-15
  * @Version: V1.0
  */
 public interface ISeoKeywordsService extends IService<SeoKeywords> {
 
     List<String> getKeywordsLastSevenDays(String userFlag, Integer keywordType, String historyId);
 
-    RankInfoVO getSeoRankInfo(String siteCode, String historyId, Integer rankStart, Integer rankEnd, String dateStr, String keywordType);
-
-    IPage<SeoKeywords> getKeywordList(IPage<SeoKeywords> page,
-                                      Integer rankStart,
-                                      Integer rankEnd,
-                                      String keyword,
-                                      String siteCode,
-                                      Integer keywordType,
-                                      boolean reachStandard,
-                                      String historyId,
-                                      String column,
-                                      String order,
-                                      String buttonColumn,
-                                      String buttonSort,
-                                      List<String> dateList) throws ParseException;
-
-    IPage<SeoKeywords> pageList(Page<SeoKeywords> page, String siteCode, String keywords, String subscriptionId, String lastSearchTime, String createTime, Integer keywordType,
-                                String column, String order, Integer keywordRank);
+    RankInfoVO getSeoRankInfo(
+            String siteCode,
+            String historyId,
+            Integer rankStart,
+            Integer rankEnd,
+            String dateStr,
+            String keywordType);
+
+    IPage<SeoKeywords> getKeywordList(
+            IPage<SeoKeywords> page,
+            Integer rankStart,
+            Integer rankEnd,
+            String keyword,
+            String siteCode,
+            Integer keywordType,
+            boolean reachStandard,
+            String historyId,
+            String column,
+            String order,
+            String buttonColumn,
+            String buttonSort,
+            List<String> dateList)
+            throws ParseException;
+
+    IPage<SeoKeywords> pageList(
+            Page<SeoKeywords> page,
+            String siteCode,
+            String keywords,
+            String subscriptionId,
+            String lastSearchTime,
+            String createTime,
+            Integer keywordType,
+            String column,
+            String order,
+            Integer keywordRank);
 }

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.adweb.seo.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;
@@ -32,8 +33,6 @@ public interface ISeoPlanSubscriptionService extends IService<SeoPlanSubscriptio
      */
     boolean addNewSubscription(SeoPlanSubscription seoPlanSubscription, SubscribePlan marketPlan);
 
-    /**
-     * 获取正在使用中的SEO套餐，如果没有使用中的SEO和建站套餐，则查询过期的SEO和建站套餐
-     */
+    /** 获取正在使用中的SEO套餐，如果没有使用中的SEO和建站套餐，则查询过期的SEO和建站套餐 */
     SeoPlanSubscription getCurrentSeoAndSiteSubscription(Integer siteId);
 }

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

@@ -2,8 +2,11 @@ package org.jeecg.modules.adweb.seo.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.xkcoding.http.util.StringUtil;
+
 import jakarta.annotation.Resource;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
@@ -37,7 +40,10 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * @Description: seo_kpi_statistics @Author: jeecg-boot @Date: 2024-10-09 @Version: V1.0
+ * @Description: seo_kpi_statistics
+ * @Author: jeecg-boot
+ * @Date: 2024-10-09
+ * @Version: V1.0
  */
 @Service
 @Slf4j

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

@@ -19,7 +19,10 @@ import java.util.List;
 import java.util.Objects;
 
 /**
- * @Description: SEO关键词搜索排名 @Author: jeecg-boot @Date: 2024-10-15 @Version: V1.0
+ * @Description: SEO关键词搜索排名
+ * @Author: jeecg-boot
+ * @Date: 2024-10-15
+ * @Version: V1.0
  */
 @Slf4j
 @Service

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

@@ -1,64 +1,47 @@
 package org.jeecg.modules.adweb.seo.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import com.xkcoding.http.util.StringUtil;
 import jakarta.annotation.Resource;
 
-import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.adweb.common.constant.NumConstant;
 import org.jeecg.modules.adweb.seo.entity.SeoKeywords;
 import org.jeecg.modules.adweb.seo.mapper.SeoKeywordsMapper;
 import org.jeecg.modules.adweb.seo.service.ISeoKeywordsService;
 import org.jeecg.modules.adweb.seo.vo.RankInfoVO;
-import org.jeecg.modules.adweb.site.entity.AdwebSite;
-import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description: 关键词
  * @Author: jeecg-boot
- * @Date:   2024-10-15
+ * @Date: 2024-10-15
  * @Version: V1.0
  */
 @Service
-public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKeywords> implements ISeoKeywordsService {
+public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKeywords>
+        implements ISeoKeywordsService {
 
     @Resource private SeoKeywordsMapper seoKeywordsMapper;
 
     /**
      * 获取对应站点关键词最新七天时间
+     *
      * @param userFlag
      * @param keywordType
      * @param historyId
      * @return
      */
     @Override
-    public List<String> getKeywordsLastSevenDays(String userFlag, Integer keywordType, String historyId){
-        //获取对应站点最近七天
-        List<String> dateList = seoKeywordsMapper.getKeywordsLastSevenDays(userFlag, historyId,keywordType);
+    public List<String> getKeywordsLastSevenDays(
+            String userFlag, Integer keywordType, String historyId) {
+        // 获取对应站点最近七天
+        List<String> dateList =
+                seoKeywordsMapper.getKeywordsLastSevenDays(userFlag, historyId, keywordType);
         return dateList;
     }
 
@@ -69,29 +52,39 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
      * @return 关键词排名数量
      */
     @Override
-    public RankInfoVO getSeoRankInfo(String siteCode, String historyId, Integer rankStart, Integer rankEnd, String dateStr, String keywordType) {
-        //指定词
-        return seoKeywordsMapper.queryKeywordNumByRankRange(siteCode, historyId,rankStart,rankEnd,dateStr,keywordType);
+    public RankInfoVO getSeoRankInfo(
+            String siteCode,
+            String historyId,
+            Integer rankStart,
+            Integer rankEnd,
+            String dateStr,
+            String keywordType) {
+        // 指定词
+        return seoKeywordsMapper.queryKeywordNumByRankRange(
+                siteCode, historyId, rankStart, rankEnd, dateStr, keywordType);
     }
 
     /**
      * 获取关键词列表
+     *
      * @return 关键词列表
      */
     @Override
-    public IPage<SeoKeywords> getKeywordList(IPage<SeoKeywords> page,
-                                             Integer rankStart,
-                                             Integer rankEnd,
-                                             String keyword,
-                                             String siteCode,
-                                             Integer keywordType,
-                                             boolean reachStandard,
-                                             String historyId,
-                                             String column,
-                                             String order,
-                                             String buttonColumn,
-                                             String buttonSort,
-                                             List<String> dateList) throws ParseException {
+    public IPage<SeoKeywords> getKeywordList(
+            IPage<SeoKeywords> page,
+            Integer rankStart,
+            Integer rankEnd,
+            String keyword,
+            String siteCode,
+            Integer keywordType,
+            boolean reachStandard,
+            String historyId,
+            String column,
+            String order,
+            String buttonColumn,
+            String buttonSort,
+            List<String> dateList)
+            throws ParseException {
         if (reachStandard) {
             rankStart = 1;
             int standard = 10;
@@ -104,24 +97,38 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
         boolean isCustomer = true;
 
         String datesStr = "";
-        if(CollectionUtils.isEmpty(dateList)){
+        if (CollectionUtils.isEmpty(dateList)) {
             return null;
-        }else{
-            for(int i = 0; i < dateList.size(); i++){
-                if(i == dateList.size() - 1){
-                    datesStr +=  "'" + dateList.get(i) + "'";
-                }else{
-                    datesStr +=  "'" + dateList.get(i) + "'" + ",";
+        } else {
+            for (int i = 0; i < dateList.size(); i++) {
+                if (i == dateList.size() - 1) {
+                    datesStr += "'" + dateList.get(i) + "'";
+                } else {
+                    datesStr += "'" + dateList.get(i) + "'" + ",";
                 }
             }
             datesStr = "(" + datesStr + ")";
         }
 
-        return seoKeywordsMapper.getKeywordList(page, rankStart, rankEnd, isCustomer, keyword, siteCode, keywordType, datesStr, historyId,column,order,buttonColumn,buttonSort);
+        return seoKeywordsMapper.getKeywordList(
+                page,
+                rankStart,
+                rankEnd,
+                isCustomer,
+                keyword,
+                siteCode,
+                keywordType,
+                datesStr,
+                historyId,
+                column,
+                order,
+                buttonColumn,
+                buttonSort);
     }
 
     /**
      * 关键词管理列表数据
+     *
      * @param page
      * @param siteCode
      * @param keywords
@@ -135,19 +142,58 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
      * @return
      */
     @Override
-    public IPage<SeoKeywords> pageList(Page<SeoKeywords> page, String siteCode, String keywords, String historyId, String lastSearchTime, String createTime, Integer keywordType,
-                                       String column, String order, Integer keywordRank){
-        if(column.equals("createTime")){
+    public IPage<SeoKeywords> pageList(
+            Page<SeoKeywords> page,
+            String siteCode,
+            String keywords,
+            String historyId,
+            String lastSearchTime,
+            String createTime,
+            Integer keywordType,
+            String column,
+            String order,
+            Integer keywordRank) {
+        if (column.equals("createTime")) {
             column = "create_time";
-            return seoKeywordsMapper.getPageListByCreateTime(page,siteCode,keywords,historyId,lastSearchTime,createTime,keywordType,column,order,keywordRank);
-        }else if(column.equals("lastSearchTime")){
+            return seoKeywordsMapper.getPageListByCreateTime(
+                    page,
+                    siteCode,
+                    keywords,
+                    historyId,
+                    lastSearchTime,
+                    createTime,
+                    keywordType,
+                    column,
+                    order,
+                    keywordRank);
+        } else if (column.equals("lastSearchTime")) {
             column = "last_search_time";
-            return seoKeywordsMapper.getPageListByCreateTime(page,siteCode,keywords,historyId,lastSearchTime,createTime,keywordType,column,order,keywordRank);
-        }else if (column.equals("lastRank")){
+            return seoKeywordsMapper.getPageListByCreateTime(
+                    page,
+                    siteCode,
+                    keywords,
+                    historyId,
+                    lastSearchTime,
+                    createTime,
+                    keywordType,
+                    column,
+                    order,
+                    keywordRank);
+        } else if (column.equals("lastRank")) {
             column = "last_rank";
-        } else if (column.equals("keywords")){
+        } else if (column.equals("keywords")) {
             column = "keywords";
         }
-        return seoKeywordsMapper.getPageList(page,siteCode,keywords,historyId,lastSearchTime,createTime,keywordType,column,order,keywordRank);
+        return seoKeywordsMapper.getPageList(
+                page,
+                siteCode,
+                keywords,
+                historyId,
+                lastSearchTime,
+                createTime,
+                keywordType,
+                column,
+                order,
+                keywordRank);
     }
 }

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

@@ -25,7 +25,7 @@ public class SeoMonthPdfServiceImpl implements ISeoMonthPdfService {
 
     @Override
     public MonthPdfKeywordsRankVO getSeoKeywordsRank(String siteCode, String exportMonth) {
-//        String lastDayOfMonth = getLastDayOfMonth(exportMonth);
+        //        String lastDayOfMonth = getLastDayOfMonth(exportMonth);
         String lastDayOfMonth = "2024-11-25";
         List<KeywordsInfoVO> seoKeywordsRank =
                 seoKeywordsSerpMapper.getSeoKeywordsRank(siteCode, lastDayOfMonth, 1, 50);

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

@@ -2,9 +2,12 @@ package org.jeecg.modules.adweb.seo.service.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
 import jakarta.annotation.Resource;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.LoginUser;
@@ -26,13 +29,15 @@ import java.util.List;
  * @Version: V1.0
  */
 @Service
-public class SeoPlanSubscriptionServiceImpl extends ServiceImpl<SeoPlanSubscriptionMapper, SeoPlanSubscription> implements ISeoPlanSubscriptionService {
+public class SeoPlanSubscriptionServiceImpl
+        extends ServiceImpl<SeoPlanSubscriptionMapper, SeoPlanSubscription>
+        implements ISeoPlanSubscriptionService {
 
-    @Resource
-    private ISubscribePlanService subscribePlanService;
+    @Resource private ISubscribePlanService subscribePlanService;
 
     @Override
-    public Result<?> addSeoPlanSubscription(SeoPlanSubscription seoPurchaseHistory, LoginUser sysUser) {
+    public Result<?> addSeoPlanSubscription(
+            SeoPlanSubscription seoPurchaseHistory, LoginUser sysUser) {
         boolean result = false;
 
         SubscribePlan marketPlan = subscribePlanService.getById(seoPurchaseHistory.getPlanId());
@@ -46,7 +51,7 @@ public class SeoPlanSubscriptionServiceImpl extends ServiceImpl<SeoPlanSubscript
             seoPurchaseHistory.setCreateBy("system_auto");
         }
 
-        //如果不是续费客户(就是新客户)的话，直接入库，套餐开启时间即是现在
+        // 如果不是续费客户(就是新客户)的话，直接入库，套餐开启时间即是现在
         if (seoPurchaseHistory.getIsRenew() == null || seoPurchaseHistory.getIsRenew() == 0) {
             LambdaQueryWrapper<SeoPlanSubscription> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(SeoPlanSubscription::getSiteId, seoPurchaseHistory.getSiteId());
@@ -56,8 +61,8 @@ public class SeoPlanSubscriptionServiceImpl extends ServiceImpl<SeoPlanSubscript
                 return Result.error("站点存在使用中套餐，请到期后绑定！");
             }
             result = this.addNewSubscription(seoPurchaseHistory, marketPlan);
-        } else {//续费
-            //判断是否有正在使用的套餐，如果没有，新建status为1的套餐
+        } else { // 续费
+            // 判断是否有正在使用的套餐，如果没有，新建status为1的套餐
             LambdaQueryWrapper<SeoPlanSubscription> oldQueryWrapper = new LambdaQueryWrapper<>();
             oldQueryWrapper.eq(SeoPlanSubscription::getSiteId, seoPurchaseHistory.getSiteId());
             oldQueryWrapper.eq(SeoPlanSubscription::getStatus, 1);
@@ -75,12 +80,26 @@ public class SeoPlanSubscriptionServiceImpl extends ServiceImpl<SeoPlanSubscript
 
                 if (seoPurchaseHistory.getIsCustom() == 0) {
                     // ->不是自定义服务开启时间 需找到多个套餐服务结束时间最大的那个
-                    //此站点所有对应的套餐的最大服务结束时间
-                    SeoPlanSubscription history = this.getOne(new LambdaQueryWrapper<SeoPlanSubscription>()
-                            .eq(SeoPlanSubscription::getSiteId, seoPurchaseHistory.getSiteId())
-                            .and(wrapper -> wrapper.eq(SeoPlanSubscription::getStatus, 1)
-                                    .or().eq(SeoPlanSubscription::getStatus, 2))
-                            .orderByDesc(SeoPlanSubscription::getServiceEndTime).last("limit 1"));
+                    // 此站点所有对应的套餐的最大服务结束时间
+                    SeoPlanSubscription history =
+                            this.getOne(
+                                    new LambdaQueryWrapper<SeoPlanSubscription>()
+                                            .eq(
+                                                    SeoPlanSubscription::getSiteId,
+                                                    seoPurchaseHistory.getSiteId())
+                                            .and(
+                                                    wrapper ->
+                                                            wrapper.eq(
+                                                                            SeoPlanSubscription
+                                                                                    ::getStatus,
+                                                                            1)
+                                                                    .or()
+                                                                    .eq(
+                                                                            SeoPlanSubscription
+                                                                                    ::getStatus,
+                                                                            2))
+                                            .orderByDesc(SeoPlanSubscription::getServiceEndTime)
+                                            .last("limit 1"));
                     Date maxEndTime = null;
                     if (history == null || history.getServiceEndTime() == null) {
                         maxEndTime = new Date();
@@ -96,18 +115,23 @@ public class SeoPlanSubscriptionServiceImpl extends ServiceImpl<SeoPlanSubscript
                     seoPurchaseHistory.setPlanType(marketPlan.getMarketType());
                     seoPurchaseHistory.setServiceMonth(marketPlan.getServiceTime());
                     result = this.save(seoPurchaseHistory);
-                } else if (seoPurchaseHistory.getIsCustom() == 1) {//是自定义套餐开启时间
+                } else if (seoPurchaseHistory.getIsCustom() == 1) { // 是自定义套餐开启时间
                     seoPurchaseHistory.setCreateTime(new Date());
                     seoPurchaseHistory.setPlanName(marketPlan.getPlanName());
                     seoPurchaseHistory.setPlanCode(marketPlan.getPlanCode());
                     seoPurchaseHistory.setPlanPrice(marketPlan.getPrice());
                     seoPurchaseHistory.setPlanType(marketPlan.getMarketType());
                     DateTime today = cn.hutool.core.date.DateUtil.date();
-                    long betweenTime = cn.hutool.core.date.DateUtil.between(seoPurchaseHistory.getPlanStartTime(), today, DateUnit.DAY, false);
+                    long betweenTime =
+                            cn.hutool.core.date.DateUtil.between(
+                                    seoPurchaseHistory.getPlanStartTime(),
+                                    today,
+                                    DateUnit.DAY,
+                                    false);
                     if (betweenTime > 0) {
                         return Result.error("自定义时间请选择于今天之后！");
                     } else {
-                        //如果有正在使用的套餐，才能设置为2，否则设置为1
+                        // 如果有正在使用的套餐，才能设置为2，否则设置为1
                         seoPurchaseHistory.setStatus(2);
                     }
                     seoPurchaseHistory.setServiceMonth(marketPlan.getServiceTime());
@@ -125,13 +149,14 @@ public class SeoPlanSubscriptionServiceImpl extends ServiceImpl<SeoPlanSubscript
     }
 
     @Override
-    public boolean addNewSubscription(SeoPlanSubscription seoPurchaseHistory, SubscribePlan marketPlan) {
+    public boolean addNewSubscription(
+            SeoPlanSubscription seoPurchaseHistory, SubscribePlan marketPlan) {
         boolean result = false;
         try {
             Date startTime = new Date();
             seoPurchaseHistory.setCreateTime(startTime);
             seoPurchaseHistory.setPlanStartTime(startTime);
-            seoPurchaseHistory.setStatus(1);//使用中
+            seoPurchaseHistory.setStatus(1); // 使用中
             seoPurchaseHistory.setPlanName(marketPlan.getPlanName());
             seoPurchaseHistory.setPlanCode(marketPlan.getPlanCode());
             seoPurchaseHistory.setPlanPrice(marketPlan.getPrice());
@@ -144,16 +169,19 @@ public class SeoPlanSubscriptionServiceImpl extends ServiceImpl<SeoPlanSubscript
         return result;
     }
 
-    /**
-     * 获取正在使用中的SEO套餐，如果没有使用中的SEO和建站套餐，则查询过期的SEO和建站套餐
-     */
+    /** 获取正在使用中的SEO套餐，如果没有使用中的SEO和建站套餐，则查询过期的SEO和建站套餐 */
     @Override
     public SeoPlanSubscription getCurrentSeoAndSiteSubscription(Integer siteId) {
         LambdaQueryWrapper<SeoPlanSubscription> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SeoPlanSubscription::getSiteId, siteId);
-        queryWrapper.and(wrapper -> wrapper.eq(SeoPlanSubscription::getPlanType, "SEO").or().eq(SeoPlanSubscription::getPlanType, "STATIONCONSTRUCTION"));
+        queryWrapper.and(
+                wrapper ->
+                        wrapper.eq(SeoPlanSubscription::getPlanType, "SEO")
+                                .or()
+                                .eq(SeoPlanSubscription::getPlanType, "STATIONCONSTRUCTION"));
         queryWrapper.in(SeoPlanSubscription::getStatus, Arrays.asList(1, -1));
-        queryWrapper.orderByDesc(SeoPlanSubscription::getStatus, SeoPlanSubscription::getCreateTime);
+        queryWrapper.orderByDesc(
+                SeoPlanSubscription::getStatus, SeoPlanSubscription::getCreateTime);
         List<SeoPlanSubscription> histories = this.list(queryWrapper);
         if (CollectionUtils.isNotEmpty(histories)) {
             return histories.get(0);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/vo/ServerTimeVO.java

@@ -6,12 +6,12 @@ import java.util.Date;
 
 @Data
 public class ServerTimeVO {
-	private String reachStandardTime;
-	private int reachStandardDays;
-	private int remainServerDays;
+    private String reachStandardTime;
+    private int reachStandardDays;
+    private int remainServerDays;
 
-	// 是否自定义结束日期 0：否 1：是
-	private int planServiceEndStatus;
-	//套餐开启时间
-	private Date planStartTime;
+    // 是否自定义结束日期 0：否 1：是
+    private int planServiceEndStatus;
+    // 套餐开启时间
+    private Date planStartTime;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/server/controller/AdwebServerController.java

@@ -32,8 +32,7 @@ import java.util.Arrays;
 @RequestMapping("/adweb/adwebServer")
 @Slf4j
 public class AdwebServerController extends JeecgController<AdwebServer, IAdwebServerService> {
-    @Autowired
-    private IAdwebServerService adwebServerService;
+    @Autowired private IAdwebServerService adwebServerService;
 
     /**
      * 分页列表查询
@@ -44,14 +43,16 @@ public class AdwebServerController extends JeecgController<AdwebServer, IAdwebSe
      * @param req
      * @return
      */
-    //@AutoLog(value = "wp站点服务器配置信息-分页列表查询")
+    // @AutoLog(value = "wp站点服务器配置信息-分页列表查询")
     @Operation(summary = "wp站点服务器配置信息-分页列表查询")
     @GetMapping(value = "/list")
-    public Result<IPage<AdwebServer>> queryPageList(AdwebServer adwebServer,
-                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                    HttpServletRequest req) {
-        QueryWrapper<AdwebServer> queryWrapper = QueryGenerator.initQueryWrapper(adwebServer, req.getParameterMap());
+    public Result<IPage<AdwebServer>> queryPageList(
+            AdwebServer adwebServer,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<AdwebServer> queryWrapper =
+                QueryGenerator.initQueryWrapper(adwebServer, req.getParameterMap());
         Page<AdwebServer> page = new Page<AdwebServer>(pageNo, pageSize);
         IPage<AdwebServer> pageList = adwebServerService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -81,7 +82,9 @@ public class AdwebServerController extends JeecgController<AdwebServer, IAdwebSe
     @AutoLog(value = "wp站点服务器配置信息-编辑")
     @Operation(summary = "wp站点服务器配置信息-编辑")
     @PreAuthorize("@jps.requiresPermissions('adweb:adweb_server:edit')")
-    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    @RequestMapping(
+            value = "/edit",
+            method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> edit(@RequestBody AdwebServer adwebServer) {
         adwebServerService.updateById(adwebServer);
         return Result.OK("编辑成功!");
@@ -123,7 +126,7 @@ public class AdwebServerController extends JeecgController<AdwebServer, IAdwebSe
      * @param id
      * @return
      */
-    //@AutoLog(value = "wp站点服务器配置信息-通过id查询")
+    // @AutoLog(value = "wp站点服务器配置信息-通过id查询")
     @Operation(summary = "wp站点服务器配置信息-通过id查询")
     @GetMapping(value = "/queryById")
     public Result<AdwebServer> queryById(@RequestParam(name = "id", required = true) String id) {
@@ -158,5 +161,4 @@ public class AdwebServerController extends JeecgController<AdwebServer, IAdwebSe
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, AdwebServer.class);
     }
-
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/server/service/IAdwebServerService.java

@@ -9,6 +9,4 @@ import org.jeecg.modules.adweb.server.entity.AdwebServer;
  * @Date: 2025-01-02
  * @Version: V1.0
  */
-public interface IAdwebServerService extends IService<AdwebServer> {
-
-}
+public interface IAdwebServerService extends IService<AdwebServer> {}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/server/service/impl/AdwebServerServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.adweb.server.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
 import org.jeecg.modules.adweb.server.entity.AdwebServer;
 import org.jeecg.modules.adweb.server.mapper.AdwebServerMapper;
 import org.jeecg.modules.adweb.server.service.IAdwebServerService;
@@ -13,6 +14,5 @@ import org.springframework.stereotype.Service;
  * @Version: V1.0
  */
 @Service
-public class AdwebServerServiceImpl extends ServiceImpl<AdwebServerMapper, AdwebServer> implements IAdwebServerService {
-
-}
+public class AdwebServerServiceImpl extends ServiceImpl<AdwebServerMapper, AdwebServer>
+        implements IAdwebServerService {}