Merge branch 'serp' of wangfan/adweb3-server into master

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/common/util/EnglishAnalyzer.java

@@ -1,6 +1,6 @@
 package org.jeecg.modules.adweb.common.util;
 
-
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
@@ -11,9 +11,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * 英文分词器
- */
+/** 英文分词器 */
 public class EnglishAnalyzer {
 
     public static List<String> analyze(String text, Analyzer analyzer) throws IOException {
@@ -39,11 +37,10 @@ public class EnglishAnalyzer {
             return 0;
         }
 
-        if(ListUtil.isEmpty(result)){
+        if (CollectionUtils.isEmpty(result)) {
             return 0;
         }
 
         return result.stream().mapToInt(String::length).max().getAsInt();
     }
-
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/common/util/ListUtil.java

@@ -1,172 +0,0 @@
-package org.jeecg.modules.adweb.common.util;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.commons.lang3.StringUtils;
-import org.jeecg.modules.adweb.common.constant.NumConstant;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-public final class ListUtil {
-
-    /**
-     * 判断集合是否为空
-     *
-     * @param list
-     * @return
-     */
-    public static boolean isEmpty(List list) {
-        if (list != null && list.size() != 0) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * 判断集合是否不为空
-     *
-     * @param list
-     * @return
-     */
-    public static boolean notEmpty(List list) {
-        if (list != null && list.size() != 0) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * 返回集合大小
-     *
-     * @param list
-     * @return
-     */
-    public static int returnSize(List list) {
-        if (notEmpty(list)) {
-            return list.size();
-        } else {
-            return NumConstant.ZERO;
-        }
-    }
-
-    /**
-     * @param list 原集合
-     * @param str  符号
-     * @return java.lang.String
-     * @author 汤星鹏
-     * @Description 集合转字符串
-     * @date 2019/8/26 11:50
-     */
-    public static String listToString(List list, String str) {
-        if (ListUtil.notEmpty(list)) {
-            return list.stream().map(l->l.toString()).collect(Collectors.joining(str)).toString();
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * 将String类型的结合转Long类型
-     *
-     * @param list
-     * @return
-     */
-    public static List<Long> stringToLong(List<String> list) {
-
-        if (ListUtil.notEmpty(list)) {
-            List<Long> longList = new ArrayList<>();
-            list.forEach(l -> {
-                if (StringUtils.isNotBlank(l)) {
-                    longList.add(Long.parseLong(l));
-                }
-            });
-            return longList;
-        } else {
-            return new ArrayList<>();
-        }
-    }
-
-    /**
-     * @param list  集合
-     * @param index 下标
-     * @return java.lang.Object
-     * @author 汤星鹏
-     * @Description 获取对应下标对象
-     * @date 2019/11/5 9:31
-     */
-    public static <T> T listGetIndex(List<T> list, Integer index) {
-        if (ListUtil.notEmpty(list)) {
-            return list.get(index);
-        }
-        return null;
-    }
-
-    /**
-     * @param list 集合
-     * @return java.lang.Object
-     * @author 汤星鹏
-     * @Description 获取下标为o对应对象
-     * @date 2019/11/5 9:33
-     */
-    public static <T> T listGetZero(List<T> list) {
-        return listGetIndex(list, NumConstant.ZERO);
-    }
-
-    /**
-     * @param list
-     * @return java.util.List<T>
-     * @author 汤星鹏
-     * @Description 集合去重
-     * @date 2019/11/11 14:47
-     */
-    public static <T> List<T> distinct(List<T> list) {
-        if (notEmpty(list)) {
-            return list.stream().distinct().collect(Collectors.toList());
-        }
-        return null;
-    }
-
-    /**
-     * 分页函数
-     * @author pochettino
-     * @param currentPage   当前页数
-     * @param pageSize  每一页的数据条数
-     * @param list  要进行分页的数据列表
-     * @return  当前页要展示的数据
-     */
-    public static Page getPages(Integer currentPage, Integer pageSize, List list) {
-        Page page = new Page();
-        if(list==null){
-            return  null;
-        }
-        int size = list.size();
-
-        if(pageSize > size) {
-            pageSize = size;
-        }
-        if (pageSize!=0){
-            // 求出最大页数，防止currentPage越界
-            int maxPage = size % pageSize == 0 ? size / pageSize : size / pageSize + 1;
-
-            if(currentPage > maxPage) {
-                currentPage = maxPage;
-            }
-        }
-        // 当前页第一条数据的下标
-        int curIdx = currentPage > 1 ? (currentPage - 1) * pageSize : 0;
-
-        List pageList = new ArrayList();
-
-        // 将当前页的数据放进pageList
-        for(int i = 0; i < pageSize && curIdx + i < size; i++) {
-            pageList.add(list.get(curIdx + i));
-        }
-
-        page.setCurrent(currentPage).setSize(pageSize).setTotal(list.size()).setRecords(pageList);
-        return page;
-    }
-}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/service/google/GAReportService.java

@@ -11,13 +11,13 @@ import jakarta.annotation.PostConstruct;
 
 import lombok.extern.slf4j.Slf4j;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.reflect.TypeUtils;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.FastJsonUtil;
 import org.jeecg.modules.adweb.common.mapper.CommonMapper;
 import org.jeecg.modules.adweb.common.util.DateUtil;
-import org.jeecg.modules.adweb.common.util.ListUtil;
 import org.jeecg.modules.adweb.common.util.RestTemplateUtil;
 import org.jeecg.modules.adweb.dmp.dto.OpenAPIRequest;
 import org.jeecg.modules.adweb.dmp.dto.OpenAPIResponse;
@@ -94,7 +94,7 @@ public class GAReportService {
      * @param siteCodes 待执行的网站codes，为空时执行所有网站
      */
     public void syncGAReport(List<String> siteCodes) {
-        if (ListUtil.isEmpty(siteCodes)) {
+        if (CollectionUtils.isEmpty(siteCodes)) {
             siteCodes = adwebSiteService.getAllActiveSiteCodes();
         }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/service/google/GTMAdminService.java

@@ -8,9 +8,9 @@ import jakarta.annotation.PostConstruct;
 
 import lombok.extern.slf4j.Slf4j;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.jeecg.common.util.FastJsonUtil;
-import org.jeecg.modules.adweb.common.util.ListUtil;
 import org.jeecg.modules.adweb.common.util.RestTemplateUtil;
 import org.jeecg.modules.adweb.dmp.dto.OpenAPIRequest;
 import org.jeecg.modules.adweb.dmp.dto.OpenAPIResponse;
@@ -95,7 +95,7 @@ public class GTMAdminService {
         List<GoogleGTM> googleGTMs =
                 googleGTMService.list(
                         new LambdaQueryWrapper<GoogleGTM>().eq(GoogleGTM::getSiteCode, siteCode));
-        if (ListUtil.notEmpty(googleGTMs)) {
+        if (CollectionUtils.isNotEmpty(googleGTMs)) {
             log.info("站点 {} 对应的GoogleGTM已存在，ID = {}", siteCode, googleGTMs.get(0).getId());
             return googleGTMs.get(0);
         }
@@ -179,7 +179,7 @@ public class GTMAdminService {
         List<GoogleGTM> googleGTMs =
                 googleGTMService.list(
                         new LambdaQueryWrapper<GoogleGTM>().eq(GoogleGTM::getSiteCode, siteCode));
-        if (ListUtil.isEmpty(googleGTMs)) {
+        if (CollectionUtils.isEmpty(googleGTMs)) {
             log.info("站点 {} 对应的GoogleGTM不存在", siteCode);
             return false;
         }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/controller/AdwebEnquiryController.java

@@ -13,6 +13,7 @@ import jakarta.servlet.http.HttpServletResponse;
 
 import lombok.extern.slf4j.Slf4j;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
@@ -23,7 +24,6 @@ import org.jeecg.common.system.vo.LoginUser;
 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.common.util.ListUtil;
 import org.jeecg.modules.adweb.enquiry.dto.param.AdmpEnquirySearchDto;
 import org.jeecg.modules.adweb.enquiry.dto.param.EnquiryListSearchDto;
 import org.jeecg.modules.adweb.enquiry.dto.result.AdmpEnquiryListDto;
@@ -120,7 +120,7 @@ public class AdwebEnquiryController extends JeecgController<AdwebEnquiry, IAdweb
             uidList.add(sysUser.getId());
         }
         List<String> siteCodeList = null;
-        if (ListUtil.notEmpty(uidList)) {
+        if (CollectionUtils.isNotEmpty(uidList)) {
             siteCodeList = siteUserPermissionService.getSiteCodeListByUids(uidList);
         }
 
@@ -150,7 +150,7 @@ public class AdwebEnquiryController extends JeecgController<AdwebEnquiry, IAdweb
 				end = DateUtil.addDays(end, 1);
 			}
 		}
-		if(ListUtil.isEmpty(codeList)){
+		if(CollectionUtils.isEmpty(codeList)){
 			return Result.OK(page);
 		}
 
@@ -165,7 +165,7 @@ public class AdwebEnquiryController extends JeecgController<AdwebEnquiry, IAdweb
         IPage<AdmpEnquiryListDto> pageList = adwebEnquiryMapper.selectAdmpEnquiryList(page, codeList, userEfftecive, searchDto.getWasteEnquiryType(),
                 searchDto.getSearchText(), searchDto.getSearchContent(), start, end, searchDto.getWhatsApp(), searchDto.getReadStatus(), principalUid, selfPrincipalUid);
 
-        if (ListUtil.notEmpty(pageList.getRecords())) {
+        if (CollectionUtils.isNotEmpty(pageList.getRecords())) {
             dealInfo(pageList.getRecords());
         }
         return Result.OK(pageList);
@@ -176,7 +176,7 @@ public class AdwebEnquiryController extends JeecgController<AdwebEnquiry, IAdweb
      * @param enquiryList
      */
     private void dealInfo(List<AdmpEnquiryListDto> enquiryList) {
-        if (ListUtil.isEmpty(enquiryList)) {
+        if (CollectionUtils.isEmpty(enquiryList)) {
             return;
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -205,7 +205,7 @@ public class AdwebEnquiryController extends JeecgController<AdwebEnquiry, IAdweb
             }
 
             /**********************字典数据处理***********************/
-            if (ListUtil.notEmpty(userEffectiveDict)) {
+            if (CollectionUtils.isNotEmpty(userEffectiveDict)) {
                 userEffectiveDict.forEach(dict -> {
                     if (dict.getValue().equals(enquiry.getUserEffective() + "")) {
                         enquiry.setUserEffectiveStr(dict.getLabel());

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/service/AdwebOpenApiService.java

@@ -1,24 +1,17 @@
 package org.jeecg.modules.adweb.enquiry.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import jakarta.annotation.Resource;
+
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.jeecg.common.util.FastJsonUtil;
-import org.jeecg.modules.adweb.common.constant.NumConstant;
-import org.jeecg.modules.adweb.common.util.DateUtil;
-import org.jeecg.modules.adweb.common.util.ListUtil;
-import org.jeecg.modules.adweb.common.util.SnowflakeIdUtil;
-import org.jeecg.modules.adweb.enquiry.constant.EnquiryConstants;
-import org.jeecg.modules.adweb.enquiry.dto.IndependentEnquiryDto;
-import org.jeecg.modules.adweb.enquiry.entity.AdwebEnquiry;
-import org.jeecg.modules.adweb.enquiry.entity.AdwebEnquiryForm;
+
+import org.apache.commons.collections4.CollectionUtils;
 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 java.util.Date;
 import java.util.List;
 
 /**
@@ -55,7 +48,7 @@ public class AdwebOpenApiService {
     public String loadNo(String siteCode) {
         int code = 0;
         List<AdwebSite> adwebSites = selectBySiteCode(siteCode);
-        if (ListUtil.notEmpty(adwebSites)) {
+        if (CollectionUtils.isNotEmpty(adwebSites)) {
             AdwebSite adwebSite = adwebSites.get(0);
             if(adwebSite.getDayEnquiryCount()!= null){
                 code = adwebSite.getDayEnquiryCount() + 1;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/service/impl/AdwebEnquiryServiceImpl.java

@@ -13,6 +13,7 @@ import jakarta.annotation.Resource;
 
 import lombok.extern.slf4j.Slf4j;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.system.vo.DictPropertyModel;
@@ -182,7 +183,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
                     .eq(AdwebPublicEnquiryRule::getIsEnable, 1)
                     .eq(AdwebPublicEnquiryRule::getBlackOrWhiteList, blackOrWhite)
                     .eq(AdwebPublicEnquiryRule::getUseStatus, useStatus));
-            if (ListUtil.notEmpty(AdwebPublicEnquiryRuleList)) {
+            if (CollectionUtils.isNotEmpty(AdwebPublicEnquiryRuleList)) {
                 blackWordList = AdwebPublicEnquiryRuleList.stream().map(AdwebPublicEnquiryRule::getWord).toList();
             }
         } catch (Exception e) {
@@ -209,10 +210,10 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
         Map<String, String> principalEmailMap = new HashMap<>();
         List<String> subAccountIdList = masterSubAccountRelationService.getSubAccountIdByMaster(String.valueOf(adwebSite.getUid()));
         log.info("获取的子账户id：{}", FastJsonUtil.toJSONString(subAccountIdList));
-        if (ListUtil.notEmpty(subAccountIdList)) {
+        if (CollectionUtils.isNotEmpty(subAccountIdList)) {
             subAccountIdList.add(String.valueOf(adwebSite.getUid()));
             List<SysUser> principalEmailList = sysUserService.list(new QueryWrapper<SysUser>().in("id", subAccountIdList).eq("del_flag", 0).isNotNull("email").ne("email", "").select("id", "email"));
-            if (ListUtil.notEmpty(principalEmailList)) {
+            if (CollectionUtils.isNotEmpty(principalEmailList)) {
                 principalEmailMap = principalEmailList.stream().collect(Collectors.toMap(SysUser::getId, SysUser::getEmail));
 
             }
@@ -270,7 +271,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
      * @param principalEmailMap
      */
     private void sendValidateEmail(List<AdwebEnquiry> enquiryList, AdwebSite adwebSite, Map<String, String> principalEmailMap) {
-        if (ListUtil.isEmpty(enquiryList)) {
+        if (CollectionUtils.isEmpty(enquiryList)) {
             log.info("未获取到需要发送邮件的询盘");
             return;
         }
@@ -278,7 +279,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
 
         //特殊站点发送邮件
         List<DictPropertyModel> siteRes = sysAdwebApiImpl.queryDictInfoByDictCode("turn_inquiry_site_code");
-        if (ListUtil.notEmpty(siteRes) && siteRes.get(0).getValue().equals(adwebSite.getCode())) {
+        if (CollectionUtils.isNotEmpty(siteRes) && siteRes.get(0).getValue().equals(adwebSite.getCode())) {
             specialSendEmail(enquiryList, adwebSite, principalEmailMap);
         } else {
             String emailStr = adwebSite.getEnquiryEmailList();
@@ -290,7 +291,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
             log.info("发送询盘邮件--子账户邮箱：{}", FastJsonUtil.toJSONString(principalEmailMap));
 
             List<String> emailList = JSON.parseArray(emailStr, String.class);
-            if (ListUtil.isEmpty(emailList)) {
+            if (CollectionUtils.isEmpty(emailList)) {
                 return;
             }
 
@@ -457,12 +458,12 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
             log.info("=======发送询盘邮件======");
             enquiryEmailMessageList.forEach(e -> System.out.println(e.getEmail()));
             log.info("需要添加的询盘邮件：{}", FastJsonUtil.toJSONString(enquiryEmailMessageList));
-            if (ListUtil.notEmpty(enquiryEmailMessageList)) {
+            if (CollectionUtils.isNotEmpty(enquiryEmailMessageList)) {
                 QueryWrapper<EnquiryEmailMessage> enquiryEmailMessageQueryWrapper = new QueryWrapper<>();
                 enquiryEmailMessageQueryWrapper.eq("site_code", adwebSite.getCode());
                 List<EnquiryEmailMessage> enquiryEmailMessages = enquiryEmailMessageService.list(enquiryEmailMessageQueryWrapper);
                 List<EnquiryEmailMessage> sameEnquiryEmailMessageList = new ArrayList<>();
-                if (ListUtil.notEmpty(enquiryEmailMessages)) {
+                if (CollectionUtils.isNotEmpty(enquiryEmailMessages)) {
                     for (EnquiryEmailMessage enquiryEmailMessage : enquiryEmailMessages) {
                         for (EnquiryEmailMessage enquiryEmailMessage1 : enquiryEmailMessageList) {
                             if (enquiryEmailMessage.getEnquiryId().equals(enquiryEmailMessage1.getEnquiryId()) && enquiryEmailMessage.getEmail().equals(enquiryEmailMessage1.getEmail())) {
@@ -502,7 +503,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
         QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
         sysUserQueryWrapper.eq("is_inquiry", 2);
         sysUserQueryWrapper.eq("status", 1);
-        if (ListUtil.notEmpty(idList)) {
+        if (CollectionUtils.isNotEmpty(idList)) {
             sysUserQueryWrapper.in("id", idList);
         }
         List<SysUser> sysUsers = sysUserService.list(sysUserQueryWrapper);
@@ -515,7 +516,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
                 SysUser sysUser = new SysUser();
 
                 //如果没有子账号，则只给主账号发送邮件
-                if (ListUtil.isEmpty(sysUsers)) {
+                if (CollectionUtils.isEmpty(sysUsers)) {
                     //获取主账号
                     SysUser mainUser = sysUserService.getById(adwebSite.getUid());
                     //主账号邮件信息添加
@@ -527,12 +528,12 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
                 enquiryEmailMessageList.forEach(e -> System.out.println(e.getEmail()));
 
                 log.info("需要添加的询盘邮件：{}", FastJsonUtil.toJSONString(enquiryEmailMessageList));
-                if (ListUtil.notEmpty(enquiryEmailMessageList)) {
+                if (CollectionUtils.isNotEmpty(enquiryEmailMessageList)) {
                     QueryWrapper<EnquiryEmailMessage> enquiryEmailMessageQueryWrapper = new QueryWrapper<>();
                     enquiryEmailMessageQueryWrapper.eq("site_code", adwebSite.getCode());
                     List<EnquiryEmailMessage> enquiryEmailMessages = enquiryEmailMessageService.list(enquiryEmailMessageQueryWrapper);
                     List<EnquiryEmailMessage> sameEnquiryEmailMessageList = new ArrayList<>();
-                    if (ListUtil.notEmpty(enquiryEmailMessages)) {
+                    if (CollectionUtils.isNotEmpty(enquiryEmailMessages)) {
                         for (EnquiryEmailMessage enquiryEmailMessage : enquiryEmailMessages) {
                             for (EnquiryEmailMessage enquiryEmailMessage1 : enquiryEmailMessageList) {
                                 if (enquiryEmailMessage.getEnquiryId().equals(enquiryEmailMessage1.getEnquiryId()) && enquiryEmailMessage.getEmail().equals(enquiryEmailMessage1.getEmail())) {
@@ -685,7 +686,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
         Map<String, JSONObject> formObj = FastJsonUtil.parseObject(form, Map.class);
         if (formObj == null || formObj.size() == 0) {
             List<JSONObject> formList = FastJsonUtil.parseObject(form, List.class);
-            if (ListUtil.notEmpty(formList)) {
+            if (CollectionUtils.isNotEmpty(formList)) {
                 formItems = formList;
             }
         } else {
@@ -780,7 +781,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
     }
 
     private boolean contains(List<String> keys, String key) {
-        if (ListUtil.isEmpty(keys) || StringUtil.isEmpty(key)) {
+        if (CollectionUtils.isEmpty(keys) || StringUtil.isEmpty(key)) {
             return false;
         }
         key = key.replace(":", "").replace("：", "").replaceAll(" {2,}", " ").toLowerCase().trim();
@@ -802,7 +803,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
         }
         List<SysDictItem> dictItems = sysAdwebApiImpl.selectItemsByDictCode(dictCode);
         List<String> keys = new ArrayList<>();
-        if (ListUtil.notEmpty(dictItems)) {
+        if (CollectionUtils.isNotEmpty(dictItems)) {
             for (SysDictItem item : dictItems) {
                 String value = item.getItemValue();
                 if (StringUtil.isEmpty(value)) {
@@ -831,17 +832,17 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
         //邮箱 黑名单
         //先获取对应站点的邮箱黑名单
         List<String> siteBlackEmailList = (List<String>) adwebRedisUtil.get(SiteBlackEmailKey + "::" + adwebSite.getId());
-        if (ListUtil.isEmpty(siteBlackEmailList)) {
+        if (CollectionUtils.isEmpty(siteBlackEmailList)) {
             enquirySiteBlackEmailService.saveRedisSiteBlackEmailBySiteId(adwebSite.getId(), 0);
             siteBlackEmailList = (List<String>) adwebRedisUtil.get(SiteBlackEmailKey + "::" + adwebSite.getId());
-            if (ListUtil.isEmpty(siteBlackEmailList)) {
+            if (CollectionUtils.isEmpty(siteBlackEmailList)) {
                 siteBlackEmailList = new ArrayList<>();
             }
         }
 
         //邮箱 公共黑名单
         List<String> publicBlackEmailList = (List<String>) adwebRedisUtil.get(BlackEmailKey);
-        if (ListUtil.isEmpty(publicBlackEmailList)) {
+        if (CollectionUtils.isEmpty(publicBlackEmailList)) {
             List<AdwebPublicBlackEmail> enquiryPublicBlackEmailList = adwebPublicBlackEmailService
                     .list(new LambdaQueryWrapper<AdwebPublicBlackEmail>()
                             .ne(AdwebPublicBlackEmail::getStatus, 0)
@@ -849,7 +850,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
                             .isNotNull(AdwebPublicBlackEmail::getEmail)
                             .select(AdwebPublicBlackEmail::getEmail));
 
-            if (ListUtil.notEmpty(enquiryPublicBlackEmailList)) {
+            if (CollectionUtils.isNotEmpty(enquiryPublicBlackEmailList)) {
                 publicBlackEmailList = enquiryPublicBlackEmailList.stream().map(AdwebPublicBlackEmail::getEmail).filter(StringUtil::isNotEmpty).collect(Collectors.toList());
                 adwebRedisUtil.set(BlackEmailKey, publicBlackEmailList, 60 * 60 * 24);
             } else {
@@ -859,12 +860,12 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
             publicBlackEmailList = publicBlackEmailList.stream().filter(s -> !s.isEmpty()).collect(Collectors.toList());
         }
         List<String> allBlackEmailList = new ArrayList<>();
-        if (ListUtil.notEmpty(siteBlackEmailList)) {
+        if (CollectionUtils.isNotEmpty(siteBlackEmailList)) {
             allBlackEmailList = new ArrayList<>(siteBlackEmailList);
         }
         allBlackEmailList.addAll(publicBlackEmailList);
         List<String> blackEmailList = new ArrayList<>();
-        if (ListUtil.notEmpty(allBlackEmailList)) {
+        if (CollectionUtils.isNotEmpty(allBlackEmailList)) {
             HashSet<String> blackEmailHashSet = new HashSet<String>(allBlackEmailList);
             blackEmailList = new ArrayList<>(blackEmailHashSet);
         }
@@ -874,13 +875,13 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
         //邮箱 白名单
         //先获取对应站点的邮箱白名单
         List<String> siteWhiteEmailList = (List<String>) adwebRedisUtil.get(SiteWhiteEmailListKey + "::" + adwebSite.getId());
-        if (ListUtil.isEmpty(siteWhiteEmailList)) {
+        if (CollectionUtils.isEmpty(siteWhiteEmailList)) {
             enquirySiteBlackEmailService.saveRedisSiteBlackEmailBySiteId(adwebSite.getId(), 1);
             siteWhiteEmailList = (List<String>) adwebRedisUtil.get(SiteWhiteEmailListKey + "::" + adwebSite.getId());
         }
         //公共邮箱白名单数据
         List<String> publicWhiteEmailList = (List<String>) adwebRedisUtil.get(WhiteEmailListKey);
-        if (ListUtil.isEmpty(publicWhiteEmailList)) {
+        if (CollectionUtils.isEmpty(publicWhiteEmailList)) {
             List<AdwebPublicBlackEmail> enquiryPublicWhiteEmailList = adwebPublicBlackEmailService
                     .list(new LambdaQueryWrapper<AdwebPublicBlackEmail>()
                             .ne(AdwebPublicBlackEmail::getStatus, 0)
@@ -888,7 +889,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
                             .isNotNull(AdwebPublicBlackEmail::getEmail)
                             .select(AdwebPublicBlackEmail::getEmail));
 
-            if (ListUtil.notEmpty(enquiryPublicWhiteEmailList)) {
+            if (CollectionUtils.isNotEmpty(enquiryPublicWhiteEmailList)) {
                 publicWhiteEmailList = enquiryPublicWhiteEmailList.stream().map(AdwebPublicBlackEmail::getEmail).filter(StringUtil::isNotEmpty).collect(Collectors.toList());
                 adwebRedisUtil.set(WhiteEmailListKey, publicWhiteEmailList, 60 * 60 * 24);
             } else {
@@ -898,12 +899,12 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
             publicWhiteEmailList = publicWhiteEmailList.stream().filter(s -> !s.isEmpty()).collect(Collectors.toList());
         }
         List<String> allWhiteEmailList = new ArrayList<>();
-        if (ListUtil.notEmpty(siteWhiteEmailList)) {
+        if (CollectionUtils.isNotEmpty(siteWhiteEmailList)) {
             allWhiteEmailList = new ArrayList<>(siteWhiteEmailList);
         }
         allWhiteEmailList.addAll(publicWhiteEmailList);
         List<String> whiteEmailList = new ArrayList<>();
-        if (ListUtil.notEmpty(allWhiteEmailList)) {
+        if (CollectionUtils.isNotEmpty(allWhiteEmailList)) {
             HashSet<String> whiteEmailHashSet = new HashSet<String>(allWhiteEmailList);
             whiteEmailList = new ArrayList<>(whiteEmailHashSet);
         }
@@ -914,13 +915,13 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
         //Ip黑名单
         //公共ip黑名单
         List<String> publicBlackIpList = (List<String>) adwebRedisUtil.get(BlackIpKey);
-        if (ListUtil.isEmpty(publicBlackIpList)) {
+        if (CollectionUtils.isEmpty(publicBlackIpList)) {
             List<AdwebPublicBlackIp> enquiryPublicBlackIpList = adwebPublicBlackIpService
                     .list(new LambdaQueryWrapper<AdwebPublicBlackIp>()
                             .ne(AdwebPublicBlackIp::getStatus, 0)
                             .eq(AdwebPublicBlackIp::getBlackOrWhite, 0)
                             .select(AdwebPublicBlackIp::getIp));
-            if (ListUtil.notEmpty(enquiryPublicBlackIpList)) {
+            if (CollectionUtils.isNotEmpty(enquiryPublicBlackIpList)) {
                 publicBlackIpList = enquiryPublicBlackIpList.stream().map(AdwebPublicBlackIp::getIp).collect(Collectors.toList());
                 adwebRedisUtil.set(BlackIpKey, publicBlackIpList, 60 * 60 * 24);
             } else {
@@ -929,14 +930,14 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
         }
         //站点ip黑名单
         List<String> siteBlackIpList = (List<String>) adwebRedisUtil.get(SiteBlackIpKey + "::" + adwebSite.getId());
-        if (ListUtil.isEmpty(siteBlackIpList)) {
+        if (CollectionUtils.isEmpty(siteBlackIpList)) {
             List<AdwebSiteBlackIp> enquirySiteBlackIpList = adwebSiteBlackIpService
                     .list(new LambdaQueryWrapper<AdwebSiteBlackIp>()
                             .ne(AdwebSiteBlackIp::getStatus, 0)
                             .eq(AdwebSiteBlackIp::getBlackOrWhite, 0)
                             .eq(AdwebSiteBlackIp::getSiteId, adwebSite.getId())
                             .select(AdwebSiteBlackIp::getIp));
-            if (ListUtil.notEmpty(enquirySiteBlackIpList)) {
+            if (CollectionUtils.isNotEmpty(enquirySiteBlackIpList)) {
                 siteBlackIpList = enquirySiteBlackIpList.stream().map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
                 adwebRedisUtil.set(SiteBlackIpKey + "::" + adwebSite.getId(), siteBlackIpList, 60 * 60 * 24);
             } else {
@@ -944,12 +945,12 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
             }
         }
         List<String> allBlackIpList = new ArrayList<>();
-        if (ListUtil.notEmpty(siteBlackIpList)) {
+        if (CollectionUtils.isNotEmpty(siteBlackIpList)) {
             allBlackIpList = new ArrayList<>(siteBlackIpList);
         }
         allBlackIpList.addAll(publicBlackIpList);
         List<String> blackIpList = new ArrayList<>();
-        if (ListUtil.notEmpty(allBlackIpList)) {
+        if (CollectionUtils.isNotEmpty(allBlackIpList)) {
             HashSet<String> blackIpHashSet = new HashSet<String>(allBlackIpList);
             blackIpList = new ArrayList<>(blackIpHashSet);
         }
@@ -966,7 +967,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
                             .ne(AdwebPublicBlackIp::getStatus, 0)
                             .eq(AdwebPublicBlackIp::getBlackOrWhite, 1)
                             .select(AdwebPublicBlackIp::getIp));
-            if (ListUtil.notEmpty(enquiryPublicWhiteIpList)) {
+            if (CollectionUtils.isNotEmpty(enquiryPublicWhiteIpList)) {
                 publicWhiteIpList = enquiryPublicWhiteIpList.stream().map(AdwebPublicBlackIp::getIp).collect(Collectors.toList());
                 adwebRedisUtil.set(WhiteIpListKey, publicWhiteIpList, 60 * 60 * 24);
             } else {
@@ -975,14 +976,14 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
         }
         //站点Ip白名单, 基于站点查询
         List<String> siteWhiteIpList = (List<String>) adwebRedisUtil.get(SiteWhiteIpListKey + "::" + adwebSite.getId());
-        if (ListUtil.isEmpty(siteWhiteIpList)) {
+        if (CollectionUtils.isEmpty(siteWhiteIpList)) {
             List<AdwebSiteBlackIp> enquirySiteWhiteIpList = adwebSiteBlackIpService
                     .list(new LambdaQueryWrapper<AdwebSiteBlackIp>()
                             .ne(AdwebSiteBlackIp::getStatus, 0)
                             .eq(AdwebSiteBlackIp::getBlackOrWhite, 1)
                             .eq(AdwebSiteBlackIp::getSiteId, adwebSite.getId())
                             .select(AdwebSiteBlackIp::getIp));
-            if (ListUtil.notEmpty(enquirySiteWhiteIpList)) {
+            if (CollectionUtils.isNotEmpty(enquirySiteWhiteIpList)) {
                 siteWhiteIpList = enquirySiteWhiteIpList.stream().map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
                 adwebRedisUtil.set(SiteWhiteIpListKey + "::" + adwebSite.getId(), siteWhiteIpList, 60 * 60 * 24);
             } else {
@@ -990,12 +991,12 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
             }
         }
         List<String> allWhiteIpList = new ArrayList<>();
-        if (ListUtil.notEmpty(siteWhiteIpList)) {
+        if (CollectionUtils.isNotEmpty(siteWhiteIpList)) {
             allWhiteIpList = new ArrayList<>(siteWhiteIpList);
         }
         allWhiteIpList.addAll(publicWhiteIpList);
         List<String> whiteIpList = new ArrayList<>();
-        if (ListUtil.notEmpty(allWhiteIpList)) {
+        if (CollectionUtils.isNotEmpty(allWhiteIpList)) {
             HashSet<String> whiteIpHashSet = new HashSet<String>(allWhiteIpList);
             whiteIpList = new ArrayList<>(whiteIpHashSet);
         }
@@ -1031,7 +1032,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
             isJudgeWasteEnquiry = adwebEnquiry;
 
             // 判断 询盘邮箱黑名单
-            if (ListUtil.notEmpty(blackEmailList) || StringUtils.isNotBlank(adwebEnquiry.getEmail())) {
+            if (CollectionUtils.isNotEmpty(blackEmailList) || StringUtils.isNotBlank(adwebEnquiry.getEmail())) {
 
                 String email = adwebEnquiry.getEmail().toLowerCase();
 
@@ -1054,7 +1055,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
                 //黑名单
                 String containPublicBlackStr = "";
                 boolean isContainPublicBlack = false;
-                if (ListUtil.notEmpty(publicBlackEmailList)) {
+                if (CollectionUtils.isNotEmpty(publicBlackEmailList)) {
                     for (String blackEmail : publicBlackEmailList) {
                         String allBlackEmail = blackEmail;
                         if (allBlackEmail.contains("*")) {
@@ -1080,7 +1081,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
                 boolean isSiteAllContain = true;
                 String containSiteWhiteStr = "";
                 //白名单
-                if (ListUtil.notEmpty(siteWhiteEmailList)) {
+                if (CollectionUtils.isNotEmpty(siteWhiteEmailList)) {
                     for (String whiteEmail : siteWhiteEmailList) {
                         String compareWhiteEmail = whiteEmail;
                         if (compareWhiteEmail.contains("*")) {
@@ -1108,7 +1109,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
                 //黑名单
                 boolean isContainSiteBlack = false;
                 String containSiteBlackStr = "";
-                if (ListUtil.notEmpty(siteBlackEmailList)) {
+                if (CollectionUtils.isNotEmpty(siteBlackEmailList)) {
                     for (String blackEmail : siteBlackEmailList) {
                         String allBlackEmail = blackEmail;
                         if (allBlackEmail.contains("*")) {
@@ -1175,7 +1176,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
             // @see http://52.83.154.198:8082/browse/ADWEBV2-12
             // 垃圾询盘过滤时IP按照客户IP去使用黑名单过滤而不再使用来源IP
             // 判断是否为ip黑名单
-            if (ListUtil.notEmpty(blackIpList) || StringUtils.isNotBlank(adwebEnquiry.getCustomerIp())) {
+            if (CollectionUtils.isNotEmpty(blackIpList) || StringUtils.isNotBlank(adwebEnquiry.getCustomerIp())) {
                 String ip = adwebEnquiry.getCustomerIp();
                 //公共ip黑名单
                 boolean isPublicIp = false;
@@ -1229,7 +1230,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
                     }
                 }
             } else {
-                if (ListUtil.notEmpty(urlList)) {
+                if (CollectionUtils.isNotEmpty(urlList)) {
                     adwebEnquiry.setWasteEnquiry(1);
                     adwebEnquiry.setUserEffective(0);
                     adwebEnquiry.setWasteEnquiryType("other");
@@ -1243,7 +1244,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
             // 判断询盘是否包含关键词
             String message = adwebEnquiry.getMessage().replaceAll("[\\n\\t]",
                     " ").replaceAll(" {2,}", " ").toLowerCase();
-            if (ListUtil.notEmpty(blackWordList) || ListUtil.notEmpty(siteBlackRuleList)) {
+            if (CollectionUtils.isNotEmpty(blackWordList) || CollectionUtils.isNotEmpty(siteBlackRuleList)) {
                 //公共关键词黑名单
                 boolean isPublicWord = false;
                 String isBlackWord = "";
@@ -1324,29 +1325,29 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
 
         //更新redis
         //站点
-        if (ListUtil.notEmpty(siteBlackEmailList)) {
+        if (CollectionUtils.isNotEmpty(siteBlackEmailList)) {
             adwebRedisUtil.set(SiteBlackEmailKey + "::" + adwebSite.getId(), siteBlackEmailList, 86400);
         }
-        if (ListUtil.notEmpty(siteBlackIpList)) {
+        if (CollectionUtils.isNotEmpty(siteBlackIpList)) {
             adwebRedisUtil.set(SiteBlackIpKey + "::" + adwebSite.getId(), siteBlackIpList, 86400);
         }
-        if (ListUtil.notEmpty(siteWhiteEmailList)) {
+        if (CollectionUtils.isNotEmpty(siteWhiteEmailList)) {
             adwebRedisUtil.set(SiteWhiteEmailListKey + "::" + adwebSite.getId(), siteWhiteEmailList, 86400);
         }
-        if (ListUtil.notEmpty(siteWhiteIpList)) {
+        if (CollectionUtils.isNotEmpty(siteWhiteIpList)) {
             adwebRedisUtil.set(SiteWhiteIpListKey + "::" + adwebSite.getId(), siteWhiteIpList, 86400);
         }
         //公共
-        if (ListUtil.notEmpty(publicBlackEmailList)) {
+        if (CollectionUtils.isNotEmpty(publicBlackEmailList)) {
             adwebRedisUtil.set(BlackEmailKey, publicBlackEmailList, 86400);
         }
-        if (ListUtil.notEmpty(publicBlackIpList)) {
+        if (CollectionUtils.isNotEmpty(publicBlackIpList)) {
             adwebRedisUtil.set(BlackIpKey, publicBlackIpList, 86400);
         }
-        if (ListUtil.notEmpty(publicWhiteEmailList)) {
+        if (CollectionUtils.isNotEmpty(publicWhiteEmailList)) {
             adwebRedisUtil.set(WhiteEmailListKey, publicWhiteEmailList, 86400);
         }
-        if (ListUtil.notEmpty(publicWhiteIpList)) {
+        if (CollectionUtils.isNotEmpty(publicWhiteIpList)) {
             adwebRedisUtil.set(WhiteIpListKey, publicWhiteIpList, 86400);
         }
     }
@@ -1371,7 +1372,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
         Pattern pattern1 = Pattern.compile("(https?|ftp|file)://([-a-zA-Z0-9]+\\.)+[a-zA-Z0-9]+");
         List<String> domainPatterns = getFormKeys("enquiry_domain_pattern");
         String domainPattern = "";
-        if (ListUtil.notEmpty(domainPatterns)) {
+        if (CollectionUtils.isNotEmpty(domainPatterns)) {
             domainPattern = domainPatterns.get(0);
         }
         if (StringUtil.isEmpty(domainPattern)) {
@@ -1415,7 +1416,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
         }
 
         // 如果邮箱和 URL 都存在，并且 URL 中不包含 http 和 https，则从 URL 中删除邮箱
-        if (ListUtil.notEmpty(emailList)) {
+        if (CollectionUtils.isNotEmpty(emailList)) {
             Set<String> urlSet = new HashSet<>(urls);
             urlSet.removeAll(emailList.stream()
                     .filter(email -> urlSet.contains(email) && !email.contains("http") && !email.contains("https"))
@@ -1435,7 +1436,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
             log.info("上一封邮件为垃圾询盘,处理中...");
             boolean emailFlag = false;
             String isJudgeWasteEnquiryEmail = isJudgeWasteEnquiry.getEmail().toLowerCase();
-            if (StringUtils.isNotBlank(isJudgeWasteEnquiryEmail) && ListUtil.notEmpty(blackEmailList)) {
+            if (StringUtils.isNotBlank(isJudgeWasteEnquiryEmail) && CollectionUtils.isNotEmpty(blackEmailList)) {
                 for (String blackEmail : blackEmailList) {
                     if (isJudgeWasteEnquiry.getEmail().equals(blackEmail)) {
                         emailFlag = false;
@@ -1507,7 +1508,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
             log.info("上一封邮件为垃圾询盘,处理中...");
             boolean emailFlag = false;
             String isJudgeWasteEnquiryEmail = isJudgeWasteEnquiry.getEmail().toLowerCase();
-            if (StringUtils.isNotBlank(isJudgeWasteEnquiryEmail) && ListUtil.notEmpty(siteBlackEmailList)) {
+            if (StringUtils.isNotBlank(isJudgeWasteEnquiryEmail) && CollectionUtils.isNotEmpty(siteBlackEmailList)) {
                 for (String blackEmail : siteBlackEmailList) {
                     if (isJudgeWasteEnquiry.getEmail().equals(blackEmail)) {
                         emailFlag = false;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/service/impl/AdwebPublicEnquiryRuleServiceImpl.java

@@ -1,17 +1,19 @@
 package org.jeecg.modules.adweb.enquiry.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 org.jeecg.modules.adweb.common.util.ListUtil;
+
+import jakarta.annotation.Resource;
+
+import org.apache.commons.collections4.CollectionUtils;
 import org.jeecg.modules.adweb.enquiry.entity.AdwebPublicEnquiryRule;
 import org.jeecg.modules.adweb.enquiry.mapper.AdwebPublicEnquiryRuleMapper;
 import org.jeecg.modules.adweb.enquiry.service.IAdwebPublicEnquiryRuleService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.stereotype.Service;
 
-import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -39,7 +41,7 @@ public class AdwebPublicEnquiryRuleServiceImpl extends ServiceImpl<AdwebPublicEn
                 .eq("use_status", 1)
                 .eq("is_enable", 1)
                 .eq("black_or_white_list", 0));
-        if (ListUtil.isEmpty(list)) {
+        if (CollectionUtils.isEmpty(list)) {
             return null;
         }
         return list.stream().map(AdwebPublicEnquiryRule::getWord).collect(Collectors.toList());
@@ -52,7 +54,7 @@ public class AdwebPublicEnquiryRuleServiceImpl extends ServiceImpl<AdwebPublicEn
                 .eq("use_status", 0)
                 .eq("is_enable", 1)
                 .eq("black_or_white_list", 0));
-        if (ListUtil.isEmpty(list)) {
+        if (CollectionUtils.isEmpty(list)) {
             return null;
         }
         return list.stream().map(AdwebPublicEnquiryRule::getWord).collect(Collectors.toList());

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/service/impl/AdwebSiteBlackEmailServiceImpl.java

@@ -4,9 +4,11 @@ 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 jakarta.annotation.Resource;
+
+import org.apache.commons.collections4.CollectionUtils;
 import org.jeecg.common.util.RedisUtil;
-import org.jeecg.modules.adweb.common.util.ListUtil;
 import org.jeecg.modules.adweb.enquiry.dto.param.EffectiveEnquiryParamDto;
 import org.jeecg.modules.adweb.enquiry.entity.AdwebSiteBlackEmail;
 import org.jeecg.modules.adweb.enquiry.mapper.AdwebSiteBlackEmailMapper;
@@ -45,12 +47,12 @@ public class AdwebSiteBlackEmailServiceImpl extends ServiceImpl<AdwebSiteBlackEm
         siteAllEmailQueryWrapper.eq("site_id", siteId);
         siteAllEmailQueryWrapper.eq("black_or_white", blackOrWhite);
         List<AdwebSiteBlackEmail> allEmailList = list(siteAllEmailQueryWrapper);
-        if(ListUtil.isEmpty(allEmailList)){
+        if(CollectionUtils.isEmpty(allEmailList)){
             log.warn("未获取到对应站点的名单数据");
         }
 
         List<String> emailList = new ArrayList<>();
-        if(ListUtil.notEmpty(allEmailList)){
+        if(CollectionUtils.isNotEmpty(allEmailList)){
             for (AdwebSiteBlackEmail enquirySiteBlackEmail1 : allEmailList){
                 if(enquirySiteBlackEmail1.getType().equals("0")){
                     emailList.add("*" + enquirySiteBlackEmail1.getEmail() + "*");
@@ -61,13 +63,13 @@ public class AdwebSiteBlackEmailServiceImpl extends ServiceImpl<AdwebSiteBlackEm
         }
         //处理对应站点的黑名单
         if(blackOrWhite == 0){
-            if (ListUtil.notEmpty(emailList)) {
+            if (CollectionUtils.isNotEmpty(emailList)) {
                 redisUtil.set(SiteBlackEmailKey + "::" + siteId, emailList, 60 * 60 * 24);
             }else {
                 redisUtil.del(SiteBlackEmailKey + "::" + siteId);
             }
         }else{
-            if (ListUtil.notEmpty(emailList)) {
+            if (CollectionUtils.isNotEmpty(emailList)) {
                 redisUtil.set(SiteWhiteEmailListKey + "::" + siteId, emailList, 60 * 60 * 24);
             }else {
                 redisUtil.del(SiteWhiteEmailListKey + "::" + siteId);
@@ -85,13 +87,13 @@ public class AdwebSiteBlackEmailServiceImpl extends ServiceImpl<AdwebSiteBlackEm
         siteAllEmailQueryWrapper.ne("status", 0);
         siteAllEmailQueryWrapper.eq("site_id", siteId);
         List<AdwebSiteBlackEmail> allEmailList = list(siteAllEmailQueryWrapper);
-        if(ListUtil.isEmpty(allEmailList)){
+        if(CollectionUtils.isEmpty(allEmailList)){
             log.warn("未获取到对应站点的黑白名单数据");
         }
 
         List<String> emailList = new ArrayList<>();
         List<String> whiteEmailList = new ArrayList<>();
-        if(ListUtil.notEmpty(allEmailList)){
+        if(CollectionUtils.isNotEmpty(allEmailList)){
             for (AdwebSiteBlackEmail enquirySiteBlackEmail1 : allEmailList){
                 if(enquirySiteBlackEmail1.getBlackOrWhite() == 0){
                     if(enquirySiteBlackEmail1.getType().equals("0")){
@@ -140,7 +142,7 @@ public class AdwebSiteBlackEmailServiceImpl extends ServiceImpl<AdwebSiteBlackEm
         enquirySiteBlackEmailQueryWrapper.eq("site_code", effectiveEnquiryParamDto.getSiteCode());
         enquirySiteBlackEmailQueryWrapper.eq("status", 1);
         List<AdwebSiteBlackEmail> enquirySiteBlackEmailList = list(enquirySiteBlackEmailQueryWrapper);
-        if(ListUtil.notEmpty(enquirySiteBlackEmailList)){
+        if(CollectionUtils.isNotEmpty(enquirySiteBlackEmailList)){
             //如果有白名单 先删除原数据，后添加新的黑名单数据
             for(AdwebSiteBlackEmail enquirySiteBlackEmail : enquirySiteBlackEmailList){
                 if(enquirySiteBlackEmail.getBlackOrWhite() == 1){
@@ -179,14 +181,14 @@ public class AdwebSiteBlackEmailServiceImpl extends ServiceImpl<AdwebSiteBlackEm
         List<String> whiteEmailList = enquirySiteBlackEmailListMap.get("white");
 
         //处理对应站点的黑名单
-        if (ListUtil.notEmpty(emailList)) {
+        if (CollectionUtils.isNotEmpty(emailList)) {
             redisUtil.set(SiteBlackEmailKey + "::" + effectiveEnquiryParamDto.getSiteId(), emailList, 60 * 60 * 24);
         }else {
             redisUtil.del(SiteBlackEmailKey + "::" + effectiveEnquiryParamDto.getSiteId());
         }
 
         //处理对应站点的白名单
-        if (ListUtil.notEmpty(whiteEmailList)) {
+        if (CollectionUtils.isNotEmpty(whiteEmailList)) {
             redisUtil.set(SiteWhiteEmailListKey + "::" + effectiveEnquiryParamDto.getSiteId(), whiteEmailList, 60 * 60 * 24);
         }else {
             redisUtil.del(SiteWhiteEmailListKey + "::" + effectiveEnquiryParamDto.getSiteId());

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/service/impl/AdwebSiteBlackIpServiceImpl.java

@@ -5,9 +5,11 @@ 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 jakarta.annotation.Resource;
+
+import org.apache.commons.collections4.CollectionUtils;
 import org.jeecg.common.util.RedisUtil;
-import org.jeecg.modules.adweb.common.util.ListUtil;
 import org.jeecg.modules.adweb.enquiry.dto.param.EffectiveEnquiryParamDto;
 import org.jeecg.modules.adweb.enquiry.entity.AdwebSiteBlackIp;
 import org.jeecg.modules.adweb.enquiry.mapper.AdwebSiteBlackIpMapper;
@@ -89,16 +91,16 @@ public class AdwebSiteBlackIpServiceImpl extends ServiceImpl<AdwebSiteBlackIpMap
             redisUtil.del(SiteBlackIpKey + "::" + effectiveEnquiryParamDto.getSiteId());
             redisUtil.del(SiteWhiteIpListKey + "::" + effectiveEnquiryParamDto.getSiteId());
         }
-        if(ListUtil.notEmpty(redisList)){
+        if(CollectionUtils.isNotEmpty(redisList)){
             List<String> blackIpList = redisList.stream().filter(siteBlackIp -> siteBlackIp.getBlackOrWhite().equals(0)).map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
-            if(ListUtil.notEmpty(blackIpList)){
+            if(CollectionUtils.isNotEmpty(blackIpList)){
                 redisUtil.set(SiteBlackIpKey + "::" + effectiveEnquiryParamDto.getSiteId(), blackIpList, 60 * 60 * 24);
             } else{
                 redisUtil.del(SiteBlackIpKey + "::" + effectiveEnquiryParamDto.getSiteId());
             }
 
             List<String> whiteIpList = redisList.stream().filter(siteBlackIp -> siteBlackIp.getBlackOrWhite().equals(1)).map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
-            if(ListUtil.notEmpty(whiteIpList)){
+            if(CollectionUtils.isNotEmpty(whiteIpList)){
                 redisUtil.set(SiteWhiteIpListKey + "::" + effectiveEnquiryParamDto.getSiteId(), whiteIpList, 60 * 60 * 24);
             } else{
                 redisUtil.del(SiteWhiteIpListKey + "::" + effectiveEnquiryParamDto.getSiteId());

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/service/impl/EnquiryEmailMessageServiceImpl.java

@@ -7,17 +7,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
+import jakarta.annotation.Resource;
+
 import lombok.Data;
+
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.util.FastJsonUtil;
-
-
 import org.jeecg.modules.adweb.common.service.FeishuService;
-import org.jeecg.modules.adweb.common.util.JedisUtil;
-import org.jeecg.modules.adweb.common.util.ListUtil;
 import org.jeecg.modules.adweb.common.util.AdwebRedisUtil;
+import org.jeecg.modules.adweb.common.util.JedisUtil;
 import org.jeecg.modules.adweb.enquiry.constant.EnquiryConstants;
 import org.jeecg.modules.adweb.enquiry.constant.EnquirySendStatus;
 import org.jeecg.modules.adweb.enquiry.entity.AdwebEnquiry;
@@ -25,10 +27,7 @@ import org.jeecg.modules.adweb.enquiry.entity.AdwebEnquiryForm;
 import org.jeecg.modules.adweb.enquiry.entity.EnquiryEmailMessage;
 import org.jeecg.modules.adweb.enquiry.mapper.EnquiryEmailMessageMapper;
 import org.jeecg.modules.adweb.enquiry.service.IAdwebEnquiryFormService;
-import org.jeecg.modules.adweb.enquiry.service.IAdwebEnquiryService;
 import org.jeecg.modules.adweb.enquiry.service.IEnquiryEmailMessageService;
-
-
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
 import org.jeecg.modules.adweb.system.entity.SysException;
@@ -36,7 +35,6 @@ import org.jeecg.modules.adweb.system.service.IMasterSubAccountRelationService;
 import org.jeecg.modules.adweb.system.service.ISysExceptionService;
 import org.jeecg.modules.message.handle.enums.SendMsgTypeEnum;
 import org.jeecg.modules.message.handle.impl.EmailSendMsgHandle;
-
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysDictService;
 import org.jeecg.modules.system.service.ISysUserService;
@@ -44,7 +42,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
-import jakarta.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -263,7 +260,7 @@ public class EnquiryEmailMessageServiceImpl extends ServiceImpl<EnquiryEmailMess
             List<String> subAccountIdList = masterSubAccountRelationService.getSubAccountIdByMaster(String.valueOf(adwebEnquiry.getUid()));
             if (!subAccountIdList.isEmpty()) {
                 List<SysUser> principalEmailList = sysUserService.list(new QueryWrapper<SysUser>().in("id", subAccountIdList).eq("del_flag", 0).isNotNull("email").ne("email","").select("id", "email"));
-                if (ListUtil.notEmpty(principalEmailList)) {
+                if (CollectionUtils.isNotEmpty(principalEmailList)) {
                     emailList = principalEmailList.stream().map(SysUser::getEmail).collect(Collectors.toList());
                 }
             }
@@ -274,14 +271,14 @@ public class EnquiryEmailMessageServiceImpl extends ServiceImpl<EnquiryEmailMess
             }
         }
 
-        if(ListUtil.notEmpty(emailList)){
+        if(CollectionUtils.isNotEmpty(emailList)){
             QueryWrapper<EnquiryEmailMessage> enquiryEmailMessageQueryWrapper = new QueryWrapper<>();
             enquiryEmailMessageQueryWrapper.eq("enquiry_id", adwebEnquiry.getId());
             enquiryEmailMessageQueryWrapper.eq("site_code", adwebEnquiry.getSiteCode());
             enquiryEmailMessageQueryWrapper.in("email",emailList);
             List<EnquiryEmailMessage> enquiryEmailMessageList = list(enquiryEmailMessageQueryWrapper);
 
-            if(ListUtil.notEmpty(enquiryEmailMessageList)){
+            if(CollectionUtils.isNotEmpty(enquiryEmailMessageList)){
                 List<String> oldEmailList = enquiryEmailMessageList.stream().map(EnquiryEmailMessage::getEmail).collect(Collectors.toList());
                 List<String> noNeedEmailList = new ArrayList<>();
                 for(String email : emailList){
@@ -289,12 +286,12 @@ public class EnquiryEmailMessageServiceImpl extends ServiceImpl<EnquiryEmailMess
                         noNeedEmailList.add(email);
                     }
                 }
-                if(ListUtil.notEmpty(noNeedEmailList)){
+                if(CollectionUtils.isNotEmpty(noNeedEmailList)){
                     emailList.removeAll(noNeedEmailList);
                 }
             }
 
-            if(ListUtil.notEmpty(emailList)){
+            if(CollectionUtils.isNotEmpty(emailList)){
                 List<EnquiryEmailMessage> enquiryEmailMessageList1 = new ArrayList<>();
                 for (String email : emailList){
                     EnquiryEmailMessage enquiryEmailMessage = new EnquiryEmailMessage();

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

@@ -16,12 +16,12 @@ import jakarta.annotation.PostConstruct;
 
 import lombok.extern.slf4j.Slf4j;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.util.FastJsonUtil;
 import org.jeecg.modules.adweb.common.util.AdwebRedisUtil;
 import org.jeecg.modules.adweb.common.util.CommonUtil;
 import org.jeecg.modules.adweb.common.util.DateUtil;
-import org.jeecg.modules.adweb.common.util.ListUtil;
 import org.jeecg.modules.adweb.seo.entity.SeoKeywords;
 import org.jeecg.modules.adweb.seo.entity.SeoKeywordsSerp;
 import org.jeecg.modules.adweb.seo.mapper.SeoKeywordsMapper;
@@ -99,14 +99,14 @@ public class DataForSEOService {
      * @param limit 最大查询条数
      */
     public void runKeywordsSerpTasks(List<String> siteCodes, int keywordType, int limit) {
-        if (ListUtil.isEmpty(siteCodes)) {
+        if (CollectionUtil.isEmpty(siteCodes)) {
             siteCodes = adwebSiteService.getAllActiveSiteCodes();
         }
 
         List<SeoKeywords> seoKeywords =
                 seoKeywordsMapper.getKeywordsToSerp(siteCodes, keywordType, limit);
 
-        if (ListUtil.isEmpty(seoKeywords)) {
+        if (CollectionUtils.isEmpty(seoKeywords)) {
             log.info("暂无需要Serp查询的关键词");
         } else {
             // DataForSEO - each POST call containing no more than 100 tasks

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

@@ -2,11 +2,13 @@ package org.jeecg.modules.adweb.seo.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-
 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;
 import org.apache.poi.ss.usermodel.Row;
@@ -15,7 +17,6 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.adweb.common.constant.AdwebConstant;
-import org.jeecg.modules.adweb.common.util.ListUtil;
 import org.jeecg.modules.adweb.seo.entity.ComprehensiveStatistics;
 import org.jeecg.modules.adweb.seo.entity.SeoKeywords;
 import org.jeecg.modules.adweb.seo.entity.SeoKeywordsSerp;
@@ -87,7 +88,7 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
 
     /** 放入营销方案名称 */
     private void setPlanName(List<AdwebSite> siteList) {
-        if (ListUtil.isEmpty(siteList)) {
+        if (CollectionUtils.isEmpty(siteList)) {
             return;
         }
 
@@ -101,7 +102,7 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
         historyQueryWrapper.in("site_id", siteIds);
         historyQueryWrapper.eq("status", 1);
         List<SeoPlanSubscription> seoPlanSubscriptions = seoPlanSubscriptionService.list(historyQueryWrapper);
-        if (ListUtil.isEmpty(seoPlanSubscriptions)) {
+        if (CollectionUtils.isEmpty(seoPlanSubscriptions)) {
             return;
         }
 
@@ -215,7 +216,7 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
         List<String> appointDateList =
                 seoKeywordsService.getKeywordsLastSevenDays(siteCode, 1, subscriptionId);
         String appointDatesStr = "";
-        if (ListUtil.notEmpty(appointDateList)) {
+        if (CollectionUtils.isNotEmpty(appointDateList)) {
             for (int i = 0; i < appointDateList.size(); i++) {
                 if (i == appointDateList.size() - 1) {
                     appointDatesStr += "'" + appointDateList.get(i) + "'";
@@ -237,7 +238,7 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
         // 长尾词
         List<String> dateList = seoKeywordsService.getKeywordsLastSevenDays(siteCode, 2, subscriptionId);
         String dateStr = "";
-        if (ListUtil.notEmpty(dateList)) {
+        if (CollectionUtils.isNotEmpty(dateList)) {
             for (int i = 0; i < dateList.size(); i++) {
                 if (i == dateList.size() - 1) {
                     dateStr += "'" + dateList.get(i) + "'";
@@ -264,12 +265,12 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
      */
     @Override
     public void addRankInfoByIntervalTimeByType(List<SeoKeywords> keywordList, Integer keywordType, String siteCode, String subscriptionId, List<String> dateList) throws Exception {
-        if (ListUtil.isEmpty(keywordList)) {
+        if (CollectionUtils.isEmpty(keywordList)) {
             return;
         }
 
         String datesStr = "";
-        if(ListUtil.isEmpty(dateList)){
+        if(CollectionUtils.isEmpty(dateList)){
             return;
         }else{
             for(int i = 0; i < dateList.size(); i++){
@@ -287,12 +288,12 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
                 .in(SeoKeywordsSerp::getSeDate, dateList));
         List<SeoKeywordsSerp> noRepeatSerpList = new ArrayList<>();
         Map<String, Integer> serpMap = new HashMap<>();
-        if(ListUtil.notEmpty(serpList)){
+        if(CollectionUtils.isNotEmpty(serpList)){
             for (SeoKeywordsSerp seoKeywordsSerp : serpList) {
                 seoKeywordsSerp.setKey(seoKeywordsSerp.getKeywordsId() + "_" + seoKeywordsSerp.getSeDate());
-                if(ListUtil.notEmpty(noRepeatSerpList)){
+                if(CollectionUtils.isNotEmpty(noRepeatSerpList)){
                     List<SeoKeywordsSerp> have = noRepeatSerpList.stream().filter(o -> o.getKey().equals(seoKeywordsSerp.getKey())).collect(Collectors.toList());
-                    if(ListUtil.isEmpty(have)){
+                    if(CollectionUtils.isEmpty(have)){
                         serpMap.put(seoKeywordsSerp.getKey(),seoKeywordsSerp.getRankAbsolute());
                         noRepeatSerpList.add(seoKeywordsSerp);
                     }else{

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

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import lombok.extern.slf4j.Slf4j;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.modules.adweb.common.util.DateUtil;
-import org.jeecg.modules.adweb.common.util.ListUtil;
 import org.jeecg.modules.adweb.seo.entity.SeoKeywordsSerp;
 import org.jeecg.modules.adweb.seo.mapper.SeoKeywordsSerpMapper;
 import org.jeecg.modules.adweb.seo.service.ISeoKeywordsSerpService;
@@ -68,7 +68,7 @@ public class SeoKeywordsSerpServiceImpl extends ServiceImpl<SeoKeywordsSerpMappe
             serpsToFill.add(serp);
         }
 
-        if (ListUtil.notEmpty(serpsToFill)) {
+        if (CollectionUtils.isNotEmpty(serpsToFill)) {
             log.info("复制Serp记录，keyword ID = {}, 时间范围 = {} to {}", keywordId, startDate, endDate);
             return this.saveBatch(serpsToFill);
         }

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import jakarta.annotation.Resource;
 
-import org.jeecg.modules.adweb.common.util.ListUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import org.jeecg.modules.adweb.seo.entity.SeoKeywords;
 import org.jeecg.modules.adweb.seo.mapper.SeoKeywordsMapper;
 import org.jeecg.modules.adweb.seo.service.ISeoKeywordsService;
@@ -82,7 +82,7 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
         boolean isCustomer = true;
 
         String datesStr = "";
-        if(ListUtil.isEmpty(dateList)){
+        if(CollectionUtils.isEmpty(dateList)){
             return null;
         }else{
             for(int i = 0; i < dateList.size(); i++){

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

@@ -3,12 +3,17 @@ package org.jeecg.modules.adweb.site.controller;
 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.netty.util.internal.StringUtil;
 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 lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -16,7 +21,6 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.adweb.common.constant.AdwebConstant;
-import org.jeecg.modules.adweb.common.util.ListUtil;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
 import org.jeecg.modules.adweb.site.service.ISiteUserPermissionService;
@@ -199,7 +203,7 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
         List<AdwebSite> siteList = adwebSiteService.list(queryWrapper);
 
         // 处理域名，全部改为绝对路径
-        if (ListUtil.notEmpty(siteList)) {
+        if (CollectionUtils.isNotEmpty(siteList)) {
             for (AdwebSite site : siteList) {
                 String domain = site.getDomain();
                 if (StringUtil.isNullOrEmpty(domain)) {

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

@@ -4,12 +4,12 @@ package org.jeecg.modules.adweb.site.service.impl;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
 import lombok.extern.slf4j.Slf4j;
-import org.jeecg.modules.adweb.common.util.ListUtil;
+
+import org.apache.commons.collections4.CollectionUtils;
 import org.jeecg.modules.adweb.site.entity.AdwebSitePermission;
 import org.jeecg.modules.adweb.site.entity.AdwebSiteUserPermission;
-import org.jeecg.modules.adweb.site.entity.SiteUserPermissionMapper;
 import org.jeecg.modules.adweb.site.service.ISitePermissionService;
 import org.jeecg.modules.adweb.site.service.ISiteUserPermissionService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +43,7 @@ public class SiteUserPermissionServiceImpl implements ISiteUserPermissionService
         } catch (Exception e) {
             log.error("通过uid获取站点权限失败", e);
         }
-        if (ListUtil.isEmpty(AdwebSiteUserPermissionList)) {
+        if (CollectionUtils.isEmpty(AdwebSiteUserPermissionList)) {
             codeList.add("-1");
             return codeList;
         }
@@ -57,7 +57,7 @@ public class SiteUserPermissionServiceImpl implements ISiteUserPermissionService
         } catch (Exception e) {
             log.error("通过站点权限获取站点code失败", e);
         }
-        if (ListUtil.isEmpty(codeList)) {
+        if (CollectionUtils.isEmpty(codeList)) {
             codeList.add("-1");
             return codeList;
         }
@@ -75,7 +75,7 @@ public class SiteUserPermissionServiceImpl implements ISiteUserPermissionService
         } catch (Exception e) {
             log.error("通过uid获取站点权限失败", e);
         }
-        if (ListUtil.isEmpty(AdwebSiteUserPermissionList)) {
+        if (CollectionUtils.isEmpty(AdwebSiteUserPermissionList)) {
             codeList.add("-1");
             return codeList;
         }
@@ -88,7 +88,7 @@ public class SiteUserPermissionServiceImpl implements ISiteUserPermissionService
         } catch (Exception e) {
             log.error("通过站点权限获取站点code失败", e);
         }
-        if (ListUtil.isEmpty(codeList)) {
+        if (CollectionUtils.isEmpty(codeList)) {
             codeList.add("-1");
             return codeList;
         }

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

@@ -3,10 +3,13 @@ package org.jeecg.modules.adweb.system.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
 import jakarta.annotation.Resource;
+
 import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.collections4.CollectionUtils;
 import org.jeecg.common.system.api.ISysBaseAPI;
-import org.jeecg.modules.adweb.common.util.ListUtil;
 import org.jeecg.modules.adweb.system.entity.MasterSubAccountRelation;
 import org.jeecg.modules.adweb.system.mapper.MasterSubAccountRelationMapper;
 import org.jeecg.modules.adweb.system.service.IMasterSubAccountRelationService;
@@ -108,7 +111,7 @@ public class MasterSubAccountRelationServiceImpl extends ServiceImpl<MasterSubAc
             queryWrapper.eq("sub_id", uid);
             queryWrapper.eq("status", 1);
             List<MasterSubAccountRelation> relations = this.list(queryWrapper);
-            if (ListUtil.isEmpty(relations)) {
+            if (CollectionUtils.isEmpty(relations)) {
                 return defaultList;
             }
             masterId = relations.get(0).getMasterId();
@@ -118,7 +121,7 @@ public class MasterSubAccountRelationServiceImpl extends ServiceImpl<MasterSubAc
         queryWrapper.eq("master_id", masterId);
         queryWrapper.eq("status", 1);
         List<MasterSubAccountRelation> relations = this.list(queryWrapper);
-        if (ListUtil.isEmpty(relations)) {
+        if (CollectionUtils.isEmpty(relations)) {
             return defaultList;
         }
         List<String> uidList = relations.stream().map(MasterSubAccountRelation::getSubId).collect(Collectors.toList());

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

@@ -3,8 +3,12 @@ package org.jeecg.modules.adweb.system.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xkcoding.http.util.StringUtil;
+
 import jakarta.annotation.Resource;
+
 import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.vo.DictModel;
@@ -12,7 +16,6 @@ import org.jeecg.common.system.vo.DictPropertyModel;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.adweb.common.constant.AdwebConstant;
 import org.jeecg.modules.adweb.common.constant.NumConstant;
-import org.jeecg.modules.adweb.common.util.ListUtil;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
 import org.jeecg.modules.adweb.site.service.ISiteUserPermissionService;
@@ -100,7 +103,7 @@ public class SysAdwebApiImpl implements SysAdwebApi {
         } catch (Exception e) {
             log.error("获取当前登录渠道下客户群的uid");
         }
-        if (ListUtil.isEmpty(list)) {
+        if (CollectionUtils.isEmpty(list)) {
             list = new ArrayList<>();
             list.add("-1");
         }
@@ -132,7 +135,7 @@ public class SysAdwebApiImpl implements SysAdwebApi {
         queryWrapper.eq("id", siteId);
         queryWrapper.ne("status", NumConstant.ZERO);
         List<AdwebSite> list = adwebSiteService.list(queryWrapper);
-        if (ListUtil.notEmpty(list)) {
+        if (CollectionUtils.isNotEmpty(list)) {
             return false;
         }
         return true;
@@ -164,7 +167,7 @@ public class SysAdwebApiImpl implements SysAdwebApi {
         queryWrapper.eq("code", siteCode);
         queryWrapper.ne("status", AdwebConstant.SITE_DEL);
         List<AdwebSite> list = adwebSiteService.list(queryWrapper);
-        if (ListUtil.notEmpty(list)) {
+        if (CollectionUtils.isNotEmpty(list)) {
             return false;
         }
         return true;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java

@@ -11,11 +11,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.base.Joiner;
 import com.xkcoding.http.util.StringUtil;
+
 import freemarker.core.TemplateClassResolver;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
+
+import jakarta.annotation.Resource;
+
 import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.shiro.SecurityUtils;
@@ -43,7 +49,6 @@ import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
 import org.jeecg.config.security.utils.SecureUtil;
 import org.jeecg.modules.adweb.common.constant.AdwebConstant;
 import org.jeecg.modules.adweb.common.constant.NumConstant;
-import org.jeecg.modules.adweb.common.util.ListUtil;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
 import org.jeecg.modules.adweb.site.service.ISiteUserPermissionService;
@@ -65,11 +70,8 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.freemarker.FreeMarkerTemplateUtils;
 import org.springframework.util.AntPathMatcher;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.PathMatcher;
 
-import jakarta.annotation.Resource;
-import javax.sql.DataSource;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -79,6 +81,8 @@ import java.sql.SQLException;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import javax.sql.DataSource;
+
 /**
  * @Description: 底层共通业务API，提供其他独立模块调用
  * @Author: scott
@@ -1929,7 +1933,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 		} catch (Exception e) {
 			log.error("获取当前登录渠道下客户群的uid");
 		}
-		if (ListUtil.isEmpty(list)) {
+		if (CollectionUtils.isEmpty(list)) {
 			list = new ArrayList<>();
 			list.add("-1");
 		}
@@ -1956,7 +1960,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 		queryWrapper.eq("id", siteId);
 		queryWrapper.ne("status", NumConstant.ZERO);
 		List<AdwebSite> list = adwebSiteService.list(queryWrapper);
-		if (ListUtil.notEmpty(list)) {
+		if (CollectionUtils.isEmpty(list)) {
 			return false;
 		}
 		return true;
@@ -1984,7 +1988,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 		queryWrapper.eq("code", siteCode);
 		queryWrapper.ne("status", AdwebConstant.SITE_DEL);
 		List<AdwebSite> list = adwebSiteService.list(queryWrapper);
-		if (ListUtil.notEmpty(list)) {
+		if (CollectionUtils.isNotEmpty(list)) {
 			return false;
 		}
 		return true;