1、根据review修改代码，日志记录表按log结尾，service不再集成mybatis-plus提供的service，dao层返回数据都使用dto

src/main/java/com/link/bi/domain/dao/CollectOrderLogInfoDao.java → src/main/java/com/link/bi/domain/dao/CollectOrderLogDao.java

 package com.link.bi.domain.dao;
 
-import com.link.bi.domain.entity.CollectOrderLogInfo;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.link.bi.domain.entity.CollectOrderLog;
 
 import java.util.Date;
+import java.util.List;
 
-public interface CollectOrderLogInfoDao {
+public interface CollectOrderLogDao {
     // 插入一条记录
-    void insert(CollectOrderLogInfo collectOrderLogInfo);
+    void insert(CollectOrderLog collectOrderLog);
 
     Date selectOrderSyncLatest(Integer syncType);
+
+    List<CollectOrderLog> list(Wrapper<CollectOrderLog> queryWrapper);
 }

src/main/java/com/link/bi/domain/dao/IFinanceBaseProductDao.java

 package com.link.bi.domain.dao;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.link.bi.domain.entity.FinanceBaseProduct;
+
+import java.util.List;
+
 /**
  * @author : lvbencai
  * @date :  2025年01月07日10:04:25
@@ -7,4 +12,5 @@ package com.link.bi.domain.dao;
  */
 public interface IFinanceBaseProductDao {
 
- }
+    List<FinanceBaseProduct> list(LambdaQueryWrapper<FinanceBaseProduct> objectLambdaQueryWrapper);
+}

src/main/java/com/link/bi/domain/dao/IFinanceBaseZbjTypeDao.java

 package com.link.bi.domain.dao;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.link.bi.domain.entity.FinanceBaseZbjType;
+
+import java.util.List;
+
 /**
  * @author : lvbencai
  * @date :  2025年01月14日
@@ -7,4 +14,13 @@ package com.link.bi.domain.dao;
  */
 public interface IFinanceBaseZbjTypeDao {
 
- }
+ List<FinanceBaseZbjType> list(LambdaQueryWrapper<FinanceBaseZbjType> queryWrapper);
+
+ Page<FinanceBaseZbjType> page(Page<FinanceBaseZbjType> pageI, QueryWrapper<FinanceBaseZbjType> queryWrapper);
+
+ void removeByIds(List<Long> idsToDelete);
+
+ void saveBatch(List<FinanceBaseZbjType> recordsToSave);
+
+ void updateBatchById(List<FinanceBaseZbjType> recordsToUpdate);
+}

src/main/java/com/link/bi/domain/dao/impl/CollectOrderLogInfoDaoImpl.java → src/main/java/com/link/bi/domain/dao/impl/CollectOrderLogDaoImpl.java

 package com.link.bi.domain.dao.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.link.bi.domain.dao.CollectOrderLogInfoDao;
-import com.link.bi.domain.entity.CollectOrderLogInfo;
-import com.link.bi.domain.mapper.CollectOrderLogInfoMapper;
+import com.link.bi.domain.dao.CollectOrderLogDao;
+import com.link.bi.domain.entity.CollectOrderLog;
+import com.link.bi.domain.mapper.CollectOrderLogMapper;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
@@ -12,25 +13,25 @@ import java.util.Date;
 import java.util.List;
 
 @Repository
-public class CollectOrderLogInfoDaoImpl implements CollectOrderLogInfoDao {
+public class CollectOrderLogDaoImpl implements CollectOrderLogDao {
 
     @Autowired
-    private CollectOrderLogInfoMapper logInfoMapper;
+    private CollectOrderLogMapper logInfoMapper;
 
     @Override
-    public void insert(CollectOrderLogInfo collectOrderLogInfo) {
-        logInfoMapper.insert(collectOrderLogInfo);
+    public void insert(CollectOrderLog collectOrderLog) {
+        logInfoMapper.insert(collectOrderLog);
     }
 
     @Override
     public Date selectOrderSyncLatest(Integer syncType) {
         // 查询最新发货日期
-        List<CollectOrderLogInfo> orderList = logInfoMapper.selectList(
-                new LambdaQueryWrapper<CollectOrderLogInfo>()
+        List<CollectOrderLog> orderList = logInfoMapper.selectList(
+                new LambdaQueryWrapper<CollectOrderLog>()
                         // 默认查询xxljob自动同步时间
-                        .eq(CollectOrderLogInfo::getSyncType,syncType)
-                        .eq(CollectOrderLogInfo::getDelFlag,0)
-                        .orderByDesc(CollectOrderLogInfo::getUpdateTime)
+                        .eq(CollectOrderLog::getSyncType,syncType)
+                        .eq(CollectOrderLog::getDelFlag,0)
+                        .orderByDesc(CollectOrderLog::getUpdateTime)
                         .last("LIMIT 1"));
         if(ObjectUtils.isNotEmpty(orderList)){
             // 最新的数据日期
@@ -39,5 +40,10 @@ public class CollectOrderLogInfoDaoImpl implements CollectOrderLogInfoDao {
         return null;
     }
 
+    @Override
+    public List<CollectOrderLog> list(Wrapper<CollectOrderLog> queryWrapper) {
+        return logInfoMapper.selectList(queryWrapper);
+    }
+
 
 }

src/main/java/com/link/bi/domain/dao/impl/FinanceBaseProductDaoImpl.java

 package com.link.bi.domain.dao.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.link.bi.domain.dao.IFinanceBaseProductDao;
+import com.link.bi.domain.entity.FinanceBaseProduct;
+import com.link.bi.domain.mapper.FinanceBaseProductMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author : lvbencai
  * @date : 2025-01-14 17:00:00
@@ -12,5 +18,11 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @Service
 public class FinanceBaseProductDaoImpl implements IFinanceBaseProductDao {
+    @Autowired
+    private FinanceBaseProductMapper mapper;
 
+    @Override
+    public List<FinanceBaseProduct> list(LambdaQueryWrapper<FinanceBaseProduct> objectLambdaQueryWrapper) {
+        return mapper.selectList(objectLambdaQueryWrapper);
+    }
 }

src/main/java/com/link/bi/domain/dao/impl/FinanceBaseZbjTypeDaoImpl.java

 package com.link.bi.domain.dao.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.link.bi.domain.dao.IFinanceBaseZbjTypeDao;
+import com.link.bi.domain.entity.FinanceBaseZbjType;
+import com.link.bi.domain.mapper.FinanceBaseZbjTypeMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author : lvbencai
  * @date : 2025-01-14 17:30:00
@@ -12,5 +20,33 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @Service
 public class FinanceBaseZbjTypeDaoImpl implements IFinanceBaseZbjTypeDao {
+    @Autowired
+    private FinanceBaseZbjTypeMapper mapper;
+
+    @Override
+    public List<FinanceBaseZbjType> list(LambdaQueryWrapper<FinanceBaseZbjType> queryWrapper) {
+        return mapper.selectList(new LambdaQueryWrapper<>());
+    }
+
+    @Override
+    public Page<FinanceBaseZbjType> page(Page<FinanceBaseZbjType> page, QueryWrapper<FinanceBaseZbjType> queryWrapper) {
+        return mapper.selectPage(page, queryWrapper);
+    }
+
+    @Override
+    public void removeByIds(List<Long> idsToDelete) {
+        mapper.deleteBatchIds(idsToDelete);
+    }
+
+    @Override
+    public void saveBatch(List<FinanceBaseZbjType> recordsToSave) {
+        //TODO 待完善
+//        mapper.
+    }
 
+    @Override
+    public void updateBatchById(List<FinanceBaseZbjType> recordsToUpdate) {
+        //TODO 待完善
+//        mapper.u
+    }
 }

src/main/java/com/link/bi/domain/entity/CollectErrorInfo.java → src/main/java/com/link/bi/domain/entity/CollectErrorLog.java

@@ -12,9 +12,9 @@ import java.util.Map;
  * CollectErrorInfo 类表示采集错误记录，与数据库表 market_bi.collect_error_info 相对应。
  * 包含了采集错误记录的各种信息，如唯一键、入参信息、类型、采集时间、删除标志、创建和更新的用户及时间等。
  */
-@TableName(value ="collect_error_info")
+@TableName(value ="collect_error_log")
 @Data
-public class CollectErrorInfo {
+public class CollectErrorLog {
 
 
 

src/main/java/com/link/bi/domain/entity/CollectOrderLogInfo.java → src/main/java/com/link/bi/domain/entity/CollectOrderLog.java

@@ -17,8 +17,8 @@ import java.util.Date;
  * @description
  */
 @Data
-@TableName("collect_order_log_info")
-public class CollectOrderLogInfo implements Serializable {
+@TableName("collect_order_log")
+public class CollectOrderLog implements Serializable {
 
     /**
      * 唯一键，用于唯一标识采集订单日志信息记录
@@ -29,67 +29,56 @@ public class CollectOrderLogInfo implements Serializable {
     /**
      * 采集订单的数量，存储为字符串，长度不超过 20 个字符
      */
-    //@TableField("order_count")
     private Integer orderCount;
 
     /**
      * 采集订单的详细数量，存储为字符串，长度不超过 20 个字符
      */
-    //@TableField("order_detail_count")
     private Integer orderDetailCount;
 
     /**
      * 采集批次信息，可存储长度不超过 30 个字符，使用 utf8mb4 字符集和 utf8mb4_0900_ai_ci 校对规则
      */
-    //@TableField("batch_no")
     private String batchNo;
 
     /**
      * 采集的最新时间，代表上一次采集的结束时间，存储为日期时间类型
      */
-    //@TableField("latest_time")
     private Date latestTime;
 
     /**
      * 是否删除的标志，'0' 表示未删除，'1' 表示已删除，使用 utf8mb3 字符集和 utf8mb3_general_ci 校对规则
      */
-    //@TableField("del_flag")
     private String delFlag;
 
     /**
      * 创建者信息，存储为长度不超过 20 个字符的字符串
      */
-    //@TableField("create_by")
     private String createBy;
 
     /**
      * 创建人的用户 ID，存储为长整型
      */
-    //@TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建时间，存储为日期时间类型，使用数据库的当前时间作为默认值
      */
-    //@TableField("create_time")
     private Date createTime;
 
     /**
      * 更新者信息，存储为长度不超过 20 个字符的字符串
      */
-    //@TableField("update_by")
     private String updateBy;
 
     /**
      * 修改人的用户 ID，存储为长整型
      */
-    //@TableField("update_user_id")
     private Long updateUserId;
 
     /**
      * 更新时间，存储为日期时间类型，更新时自动更新为当前时间
      */
-    //@TableField("update_time")
     private Date updateTime;
     private Integer syncType;
 

src/main/java/com/link/bi/domain/mapper/CollectOrderLogInfoMapper.java → src/main/java/com/link/bi/domain/mapper/CollectOrderLogMapper.java

 package com.link.bi.domain.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.link.bi.domain.entity.CollectOrderLogInfo;
+import com.link.bi.domain.entity.CollectOrderLog;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface CollectOrderLogInfoMapper extends BaseMapper<CollectOrderLogInfo> {
+public interface CollectOrderLogMapper extends BaseMapper<CollectOrderLog> {
 }

src/main/java/com/link/bi/pojo/response/CollectOrderLogListDto.java

+package com.link.bi.pojo.response;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 采集订单日志信息
+ *
+ * @author lvbencai
+ * @date a
+ * @description
+ */
+@Data
+public class CollectOrderLogListDto implements Serializable {
+
+    /**
+     * 唯一键，用于唯一标识采集订单日志信息记录
+     */
+    private Long cliId;
+
+    /**
+     * 采集订单的数量，存储为字符串，长度不超过 20 个字符
+     */
+    private Integer orderCount;
+
+    /**
+     * 采集订单的详细数量，存储为字符串，长度不超过 20 个字符
+     */
+    private Integer orderDetailCount;
+
+    /**
+     * 采集批次信息，可存储长度不超过 30 个字符，使用 utf8mb4 字符集和 utf8mb4_0900_ai_ci 校对规则
+     */
+    private String batchNo;
+
+    /**
+     * 采集的最新时间，代表上一次采集的结束时间，存储为日期时间类型
+     */
+    private Date latestTime;
+
+    /**
+     * 是否删除的标志，'0' 表示未删除，'1' 表示已删除，使用 utf8mb3 字符集和 utf8mb3_general_ci 校对规则
+     */
+    private String delFlag;
+
+    /**
+     * 创建者信息，存储为长度不超过 20 个字符的字符串
+     */
+    private String createBy;
+
+    /**
+     * 创建人的用户 ID，存储为长整型
+     */
+    private Long createUserId;
+
+    /**
+     * 创建时间，存储为日期时间类型，使用数据库的当前时间作为默认值
+     */
+    private Date createTime;
+
+    /**
+     * 更新者信息，存储为长度不超过 20 个字符的字符串
+     */
+    private String updateBy;
+
+    /**
+     * 修改人的用户 ID，存储为长整型
+     */
+    private Long updateUserId;
+
+    /**
+     * 更新时间，存储为日期时间类型，更新时自动更新为当前时间
+     */
+    private Date updateTime;
+    private Integer syncType;
+
+
+}

src/main/java/com/link/bi/service/CollectOrderLogInfoService.java

 package com.link.bi.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.link.bi.domain.entity.CollectOrderLogInfo;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.link.bi.domain.entity.CollectOrderLog;
 
 import java.util.Date;
+import java.util.List;
+
+public interface CollectOrderLogInfoService  {
+    List<CollectOrderLog> list(Wrapper<CollectOrderLog> queryWrapper);
 
-public interface CollectOrderLogInfoService  extends IService<CollectOrderLogInfo> {
     Date selectOrderSyncLatest(Integer syncType);
 }

src/main/java/com/link/bi/service/FinanceBaseProductService.java

 package com.link.bi.service;
 
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.link.bi.domain.entity.FinanceBaseProduct;
 import com.link.bi.pojo.request.FinanceSelectCommonVo;
 import com.link.bi.pojo.response.FinanceBaseProductListDto;
@@ -10,8 +9,8 @@ import java.util.List;
 import java.util.Map;
 
 
-public interface FinanceBaseProductService extends IService<FinanceBaseProduct> {
-    Map<String,FinanceBaseProduct> selectBaseProduct();
+public interface FinanceBaseProductService {
+    Map<String, FinanceBaseProduct> selectBaseProduct();
 
     List<FinanceBaseProductListDto> flavorList(FinanceSelectCommonVo commonVo);
 

src/main/java/com/link/bi/service/FinanceBaseZbjTypeService.java

@@ -2,8 +2,6 @@ package com.link.bi.service;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.link.bi.domain.entity.FinanceBaseZbjType;
 import com.link.bi.pojo.request.FinanceBaseZbjTypeListVo;
 import com.link.bi.pojo.request.FinanceSelectCommonVo;
 import com.link.bi.pojo.response.FinanceZbjTypeListDto;
@@ -13,8 +11,8 @@ import java.util.List;
 import java.util.Map;
 
 
-public interface FinanceBaseZbjTypeService extends IService<FinanceBaseZbjType> {
-    Map<String,String> selectBaseZbjType();
+public interface FinanceBaseZbjTypeService {
+    Map<String, String> selectBaseZbjType();
 
     IPage<FinanceZbjTypeListDto> pageFinanceBaseZbjType(String keyword);
 

src/main/java/com/link/bi/service/FinanceOrderDetailService.java

 package com.link.bi.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
-import com.link.bi.domain.entity.FinanceOrderDetail;
 import com.link.bi.pojo.request.FinanceCostVo;
 import com.link.bi.pojo.response.FinanceBiListDto;
 import com.link.bi.pojo.response.FinanceOrderDetailListDto;
 
 import javax.servlet.http.HttpServletResponse;
 
-public interface FinanceOrderDetailService extends IService<FinanceOrderDetail> {
+public interface FinanceOrderDetailService {
     PageInfo<FinanceBiListDto> selectBiFinanceCostList(FinanceCostVo financeCostVo);
 
     PageInfo<FinanceOrderDetailListDto> selectBiFinanceCostDetailPage(FinanceCostVo financeCostVo);

src/main/java/com/link/bi/service/FinanceOrderService.java

 package com.link.bi.service;
 
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.link.bi.domain.entity.FinanceOrder;
-
-public interface FinanceOrderService extends IService<FinanceOrder> {
+public interface FinanceOrderService {
 
 }

src/main/java/com/link/bi/service/IEcGoodsSupplyDemandService.java

 package com.link.bi.service;
 
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.link.bi.domain.entity.EcGoodsSupplyDemand;
 import com.link.bi.domain.wq.MarketDetailWq;
 import org.springframework.web.multipart.MultipartFile;
@@ -15,7 +14,7 @@ import java.util.Map;
  * @author admin
  * @date 2024-12-05
  */
-public interface IEcGoodsSupplyDemandService extends IService<EcGoodsSupplyDemand> {
+public interface IEcGoodsSupplyDemandService  {
     List<EcGoodsSupplyDemand> importData(MultipartFile ecGoodsSupplyDemand, Integer year);
 
 

src/main/java/com/link/bi/service/impl/CollectOrderLogInfoServiceImpl.java

 package com.link.bi.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.link.bi.domain.dao.CollectOrderLogInfoDao;
-import com.link.bi.domain.entity.CollectOrderLogInfo;
-import com.link.bi.domain.mapper.CollectOrderLogInfoMapper;
+import com.link.bi.domain.dao.CollectOrderLogDao;
+import com.link.bi.domain.entity.CollectOrderLog;
 import com.link.bi.service.CollectOrderLogInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -13,16 +11,16 @@ import java.util.Date;
 import java.util.List;
 
 @Service
-public class CollectOrderLogInfoServiceImpl extends ServiceImpl<CollectOrderLogInfoMapper, CollectOrderLogInfo> implements CollectOrderLogInfoService {
+public class CollectOrderLogInfoServiceImpl  implements CollectOrderLogInfoService {
 
     @Autowired
-    private CollectOrderLogInfoDao dao;
+    private CollectOrderLogDao dao;
 
 
 
     @Override
-    public List<CollectOrderLogInfo> list(Wrapper<CollectOrderLogInfo> queryWrapper) {
-        return list(queryWrapper);
+    public List<CollectOrderLog> list(Wrapper<CollectOrderLog> queryWrapper) {
+        return dao.list(queryWrapper);
     }
     /**
      * 查询最新修改日期

src/main/java/com/link/bi/service/impl/EcGoodsSupplyDemandServiceImpl.java

@@ -3,11 +3,9 @@ package com.link.bi.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.EasyExcel;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.link.bi.config.listener.EcGoodsSupplyDemandListener;
 import com.link.bi.domain.dao.IEcGoodsSupplyDemandDao;
 import com.link.bi.domain.entity.EcGoodsSupplyDemand;
-import com.link.bi.domain.mapper.EcGoodsSupplyDemandMapper;
 import com.link.bi.domain.wq.MarketDetailWq;
 import com.link.bi.pojo.response.PrdInfoDto;
 import com.link.bi.service.IEcGoodsSupplyDemandService;
@@ -31,7 +29,7 @@ import java.util.Map;
  */
 @Service
 @Slf4j
-public class EcGoodsSupplyDemandServiceImpl extends ServiceImpl<EcGoodsSupplyDemandMapper, EcGoodsSupplyDemand> implements IEcGoodsSupplyDemandService {
+public class EcGoodsSupplyDemandServiceImpl   implements IEcGoodsSupplyDemandService {
     @Autowired
     IEcGoodsSupplyDemandDao demandDao;
 

src/main/java/com/link/bi/service/impl/FinanceBaseProductServiceImpl.java

@@ -3,14 +3,14 @@ package com.link.bi.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.link.bi.domain.dao.IFinanceBaseProductDao;
 import com.link.bi.domain.entity.FinanceBaseProduct;
-import com.link.bi.domain.mapper.FinanceBaseProductMapper;
 import com.link.bi.pojo.request.FinanceSelectCommonVo;
 import com.link.bi.pojo.response.FinanceBaseProductListDto;
 import com.link.bi.service.FinanceBaseProductService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -29,13 +29,15 @@ import java.util.stream.Collectors;
 @DS("bi")
 @Slf4j
 @Service
-public class FinanceBaseProductServiceImpl extends ServiceImpl<FinanceBaseProductMapper, FinanceBaseProduct> implements FinanceBaseProductService {
+public class FinanceBaseProductServiceImpl implements FinanceBaseProductService {
 
+    @Autowired
+    private IFinanceBaseProductDao dao;
 
     @Override
     public Map<String, FinanceBaseProduct> selectBaseProduct() {
         // 查询所有商品
-        List<FinanceBaseProduct> list = list();
+        List<FinanceBaseProduct> list = dao.list(new LambdaQueryWrapper<>());
         // 以料号为key，商品对象为value，放入map中
         Map<String, FinanceBaseProduct> map = list.stream()
                 .collect(HashMap::new, (k, v) -> k.put(v.getPrdCode(), v), HashMap::putAll);
@@ -49,7 +51,7 @@ public class FinanceBaseProductServiceImpl extends ServiceImpl<FinanceBaseProduc
         queryWrapper.like(commonVo.getKeyword() != null && !commonVo.getKeyword().isEmpty(), FinanceBaseProduct::getFlavor, commonVo.getKeyword());
         queryWrapper.groupBy(FinanceBaseProduct::getFlavor);
         queryWrapper.orderByDesc(FinanceBaseProduct::getFlavor);
-        List<FinanceBaseProduct> list = list(queryWrapper);
+        List<FinanceBaseProduct> list = dao.list(queryWrapper);
 
         // 转化成List<FinanceZbjTypeListDto>
         List<FinanceBaseProductListDto> collect = list.stream()
@@ -72,7 +74,7 @@ public class FinanceBaseProductServiceImpl extends ServiceImpl<FinanceBaseProduc
         queryWrapper.like(commonVo.getKeyword() != null && !commonVo.getKeyword().isEmpty(), FinanceBaseProduct::getSpec, commonVo.getKeyword());
         queryWrapper.groupBy(FinanceBaseProduct::getSpec);
         queryWrapper.orderByDesc(FinanceBaseProduct::getSpec);
-        List<FinanceBaseProduct> list = list(queryWrapper);
+        List<FinanceBaseProduct> list = dao.list(queryWrapper);
 
         // 转化成List<FinanceZbjTypeListDto>
         List<FinanceBaseProductListDto> collect = list.stream()
@@ -92,7 +94,7 @@ public class FinanceBaseProductServiceImpl extends ServiceImpl<FinanceBaseProduc
         queryWrapper.like(commonVo.getKeyword() != null && !commonVo.getKeyword().isEmpty(), FinanceBaseProduct::getPrdName, commonVo.getKeyword());
         queryWrapper.groupBy(FinanceBaseProduct::getPrdName);
         queryWrapper.orderByDesc(FinanceBaseProduct::getPrdName);
-        List<FinanceBaseProduct> list = list(queryWrapper);
+        List<FinanceBaseProduct> list = dao.list(queryWrapper);
 
         // 转化成List<FinanceZbjTypeListDto>
         List<FinanceBaseProductListDto> collect = list.stream().map(item -> {
@@ -113,7 +115,7 @@ public class FinanceBaseProductServiceImpl extends ServiceImpl<FinanceBaseProduc
         queryWrapper.like(commonVo.getKeyword() != null && !commonVo.getKeyword().isEmpty(), FinanceBaseProduct::getSeries, commonVo.getKeyword());
         queryWrapper.groupBy(FinanceBaseProduct::getSeries);
         queryWrapper.orderByDesc(FinanceBaseProduct::getSeries);
-        List<FinanceBaseProduct> list = list(queryWrapper);
+        List<FinanceBaseProduct> list = dao.list(queryWrapper);
 
         // 转化成List<FinanceZbjTypeListDto>
         List<FinanceBaseProductListDto> collect = list.stream()

src/main/java/com/link/bi/service/impl/FinanceBaseZbjTypeServiceImpl.java

@@ -4,15 +4,13 @@ package com.link.bi.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.EasyExcel;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.link.bi.config.listener.FinanceBaseZbjTypeListener;
+import com.link.bi.domain.dao.IFinanceBaseZbjTypeDao;
 import com.link.bi.domain.entity.FinanceBaseZbjType;
-import com.link.bi.domain.mapper.FinanceBaseZbjTypeMapper;
 import com.link.bi.pojo.request.FinanceBaseZbjTypeListVo;
 import com.link.bi.pojo.request.FinanceSelectCommonVo;
 import com.link.bi.pojo.response.FinanceBaseZbjTypeImportDto;
@@ -20,6 +18,8 @@ import com.link.bi.pojo.response.FinanceZbjTypeListDto;
 import com.link.bi.service.FinanceBaseZbjTypeService;
 import com.sfa.common.core.utils.bean.BeanUtils;
 import com.sfa.common.core.web.page.TableSupport;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -36,12 +36,15 @@ import java.util.stream.Collectors;
  * @author lvbencai
  * @date 2025年01月07日17:00:16
  */
-@DS("bi")
+//@DS("bi")
 @Service
-public class FinanceBaseZbjTypeServiceImpl extends ServiceImpl<FinanceBaseZbjTypeMapper, FinanceBaseZbjType> implements FinanceBaseZbjTypeService {
+@Slf4j
+public class FinanceBaseZbjTypeServiceImpl implements FinanceBaseZbjTypeService {
+    @Autowired
+    private IFinanceBaseZbjTypeDao dao;
     @Override
     public Map<String, String> selectBaseZbjType() {
-        List<FinanceBaseZbjType> list = list();
+        List<FinanceBaseZbjType> list = dao.list(new LambdaQueryWrapper<>());
         // 以fenxiaoName为key，直播间渠道类型为value，放入map中
         Map<String, String> map = list.stream()
                 .collect(HashMap::new, (k, v) -> k.put(v.getFenxiaoName(), v.getZbjQdType()), HashMap::putAll);
@@ -60,7 +63,7 @@ public class FinanceBaseZbjTypeServiceImpl extends ServiceImpl<FinanceBaseZbjTyp
         if (keyword != null && !keyword.isEmpty()) {
             queryWrapper.like("zbj_qd_type", keyword);
         }
-        Page<FinanceBaseZbjType> page = this.page(TableSupport.pageI(), queryWrapper);
+        Page<FinanceBaseZbjType> page = dao.page(TableSupport.pageI(), queryWrapper);
         Page<FinanceZbjTypeListDto> result = new Page<>();
         BeanUtils.copyProperties(page, result);
         result.setRecords(page.getRecords().stream().map(item -> {
@@ -76,6 +79,7 @@ public class FinanceBaseZbjTypeServiceImpl extends ServiceImpl<FinanceBaseZbjTyp
 
     /**
      * 成本分析页面-查询下拉列表数据
+     *
      * @param commonVo
      * @return
      */
@@ -85,7 +89,7 @@ public class FinanceBaseZbjTypeServiceImpl extends ServiceImpl<FinanceBaseZbjTyp
         queryWrapper.select(FinanceBaseZbjType::getZbjQdType);
         queryWrapper.like(commonVo.getKeyword() != null && !commonVo.getKeyword().isEmpty(), FinanceBaseZbjType::getZbjQdType, commonVo.getKeyword());
         queryWrapper.groupBy(FinanceBaseZbjType::getZbjQdType);
-        List<FinanceBaseZbjType> list = list(queryWrapper);
+        List<FinanceBaseZbjType> list = dao.list(queryWrapper);
 
         // 转化成List<FinanceZbjTypeListDto>
         List<FinanceZbjTypeListDto> result = new ArrayList<>();
@@ -99,6 +103,7 @@ public class FinanceBaseZbjTypeServiceImpl extends ServiceImpl<FinanceBaseZbjTyp
 
     /**
      * 直播间分类页面-查询列表数据
+     *
      * @param zbjTypeListVo
      * @return
      */
@@ -106,7 +111,7 @@ public class FinanceBaseZbjTypeServiceImpl extends ServiceImpl<FinanceBaseZbjTyp
     public List<FinanceZbjTypeListDto> baseZbjTypeAllList(FinanceBaseZbjTypeListVo zbjTypeListVo) {
         LambdaQueryWrapper<FinanceBaseZbjType> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(zbjTypeListVo.getZbjQdType() != null && !zbjTypeListVo.getZbjQdType().isEmpty(), FinanceBaseZbjType::getZbjQdType, zbjTypeListVo.getZbjQdType());
-        List<FinanceBaseZbjType> list = list(queryWrapper);
+        List<FinanceBaseZbjType> list = dao.list(queryWrapper);
 
         // 转化成List<FinanceZbjTypeListDto>
         List<FinanceZbjTypeListDto> result = new ArrayList<>();
@@ -114,7 +119,7 @@ public class FinanceBaseZbjTypeServiceImpl extends ServiceImpl<FinanceBaseZbjTyp
             FinanceZbjTypeListDto dto = new FinanceZbjTypeListDto();
             BeanUtils.copyProperties(item, dto);
             // 如果fenxiaoName为空，设置为- 2025年02月07日10:35:25
-            if(ObjectUtil.isEmpty(dto.getFenxiaoName())){
+            if (ObjectUtil.isEmpty(dto.getFenxiaoName())) {
                 dto.setFenxiaoName("-");
             }
             result.add(dto);
@@ -124,6 +129,7 @@ public class FinanceBaseZbjTypeServiceImpl extends ServiceImpl<FinanceBaseZbjTyp
 
     /**
      * 执行Excel数据全量同步
+     *
      * @param file 上传的Excel文件
      */
     @Transactional(rollbackFor = Exception.class)
@@ -141,7 +147,7 @@ public class FinanceBaseZbjTypeServiceImpl extends ServiceImpl<FinanceBaseZbjTyp
             List<FinanceBaseZbjType> dataList = importData.stream().map(item -> {
                 FinanceBaseZbjType zbjType = new FinanceBaseZbjType();
                 BeanUtils.copyProperties(item, zbjType);
-                zbjType.setBatchNo(DateUtil.format(new Date(),"yyyyMMddHHmmss"));
+                zbjType.setBatchNo(DateUtil.format(new Date(), "yyyyMMddHHmmss"));
                 return zbjType;
             }).collect(Collectors.toList());
 
@@ -151,18 +157,19 @@ public class FinanceBaseZbjTypeServiceImpl extends ServiceImpl<FinanceBaseZbjTyp
             batchUpsertProducts(dataList);
             return "文件解析并更新数据成功。";
         } catch (IOException e) {
-            log.error(e.getMessage(),e);
+            log.error(e.getMessage(), e);
             return "文件解析失败，请检查文件格式或内容。";
         }
 
 
     }
+
     public void deleteAbsentProducts(List<FinanceBaseZbjType> dataList) {
         Set excelQdTypes = dataList.stream()
                 .map(FinanceBaseZbjType::getZbjQdType)
-               .collect(Collectors.toSet()) ;
+                .collect(Collectors.toSet());
         // 查询数据库中所有数据
-        List<FinanceBaseZbjType> allDbRecords = this.list();
+        List<FinanceBaseZbjType> allDbRecords = dao.list(new LambdaQueryWrapper<>());
         // 找出数据库中存在但 Excel 中不存在的记录的 fbztId
         List<Long> idsToDelete = new ArrayList<>();
         for (FinanceBaseZbjType dbRecord : allDbRecords) {
@@ -173,45 +180,45 @@ public class FinanceBaseZbjTypeServiceImpl extends ServiceImpl<FinanceBaseZbjTyp
         }
         // 删除这些记录
         if (!idsToDelete.isEmpty()) {
-            this.removeByIds(idsToDelete);
+            dao.removeByIds(idsToDelete);
         }
     }
 
     public void batchUpsertProducts(List<FinanceBaseZbjType> dataList) {
         // 查询数据库中所有数据
-        List<FinanceBaseZbjType> allDbRecords = this.list();
+        List<FinanceBaseZbjType> allDbRecords = dao.list(new LambdaQueryWrapper<>());
         // FbztId匹配到的更新，否则进行保存
         List<FinanceBaseZbjType> recordsToSave = new ArrayList<>();
         List<FinanceBaseZbjType> recordsToUpdate = new ArrayList<>();
         dataList.forEach(data -> {
             FinanceBaseZbjType existingRecord = allDbRecords.stream()
-                    .filter(record -> checkRecord(record,data) )
+                    .filter(record -> checkRecord(record, data))
                     .findFirst()
                     .orElse(null);
             if (existingRecord != null) {
                 // 更新
                 BeanUtils.copyProperties(data, existingRecord);
                 recordsToUpdate.add(existingRecord);
-            }else {
+            } else {
                 // 保存
                 recordsToSave.add(data);
             }
         });
         // 批量保存
         if (!recordsToSave.isEmpty()) {
-            this.saveBatch(recordsToSave);
+            dao.saveBatch(recordsToSave);
         }
         // 批量更新
         if (!recordsToUpdate.isEmpty()) {
-            this.updateBatchById(recordsToUpdate);
+            dao.updateBatchById(recordsToUpdate);
         }
     }
 
     private boolean checkRecord(FinanceBaseZbjType record, FinanceBaseZbjType data) {
-        if(ObjectUtil.isNotEmpty(record.getFenxiaoName())){
+        if (ObjectUtil.isNotEmpty(record.getFenxiaoName())) {
             return record.getFenxiaoName().equals(data.getFenxiaoName())
                     && record.getZbjQdType().equals(data.getZbjQdType());
-        }else{
+        } else {
             return ObjectUtil.isEmpty(data.getFenxiaoName()) && record.getZbjQdType().equals(data.getZbjQdType());
         }
     }

src/main/java/com/link/bi/service/impl/FinanceOrderDetailServiceImpl.java

@@ -9,11 +9,9 @@ import com.alibaba.excel.write.metadata.style.WriteCellStyle;
 import com.alibaba.excel.write.metadata.style.WriteFont;
 import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
 import com.link.bi.domain.dao.IFinanceOrderDetailDao;
 import com.link.bi.domain.entity.FinanceOrderDetail;
-import com.link.bi.domain.mapper.FinanceOrderDetailMapper;
 import com.link.bi.domain.wq.FinanceCostWq;
 import com.link.bi.pojo.request.FinanceCostVo;
 import com.link.bi.pojo.response.FinanceBiListDto;
@@ -49,7 +47,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-public class FinanceOrderDetailServiceImpl extends ServiceImpl<FinanceOrderDetailMapper, FinanceOrderDetail> implements FinanceOrderDetailService {
+public class FinanceOrderDetailServiceImpl implements FinanceOrderDetailService {
 
     @Autowired
     IFinanceOrderDetailDao detailDao;
@@ -61,8 +59,6 @@ public class FinanceOrderDetailServiceImpl extends ServiceImpl<FinanceOrderDetai
     public PageInfo<FinanceBiListDto> selectBiFinanceCostList(FinanceCostVo financeCostVo) {
         PageInfo<FinanceBiListDto> pageInfo = new PageInfo<>();
         // 多线程，设置不同线程的参数
-        log.info("多线程开始");
-        log.info("00000000000000");
         List<Date[]> dates = DateUtils.splitTimeInterval(financeCostVo.getStartDate(), financeCostVo.getEndDate());
         if (dates.size() == 0) {
             return pageInfo;
@@ -98,7 +94,6 @@ public class FinanceOrderDetailServiceImpl extends ServiceImpl<FinanceOrderDetai
             PageInfo<FinanceOrderDetail> orderDetailPageInfo = new PageInfo<>();
             long total = 0;
             int pages = 1;
-            log.info("1111111");
 
             List<FinanceOrderDetail> aggregatedResult = new ArrayList<>();
             try {
@@ -108,7 +103,6 @@ public class FinanceOrderDetailServiceImpl extends ServiceImpl<FinanceOrderDetai
                         @Override
                         public PageInfo<FinanceOrderDetail> call() throws Exception {
                             PageInfo<FinanceOrderDetail> detailPageInfo = detailDao.selectBiFinanceCostList(wq);
-                            log.info("dddddddd");
                             endLock.countDown();
                             log.info("{} has finished the job!");
                             return detailPageInfo;
@@ -118,8 +112,7 @@ public class FinanceOrderDetailServiceImpl extends ServiceImpl<FinanceOrderDetai
                 }
 
                 endLock.await();
-                log.info("终于轮到我了1-" + queue.size());
-                log.info("终于轮到我了2-" + queue.size());
+                log.info("endLock.await()结束-" + queue.size());
 
                 // 汇聚结果
                 for (Future<PageInfo<FinanceOrderDetail>> future : queue) {
@@ -181,7 +174,6 @@ public class FinanceOrderDetailServiceImpl extends ServiceImpl<FinanceOrderDetai
                 // 关闭线程池
                 executorService.shutdown();
             }
-
         }
 
 
@@ -261,13 +253,13 @@ public class FinanceOrderDetailServiceImpl extends ServiceImpl<FinanceOrderDetai
             // 交易时间 毫秒转时间
             dto.setTradeTime(DateUtil.format(new Date(Long.parseLong(dto.getTradeTime())), "yyyy-MM-dd HH:mm:ss"));
             // 订单状态 转换 96 成本确认  110 已完成
-            if(ObjectUtil.isNotEmpty(dto.getTradeStatus())){
+            if (ObjectUtil.isNotEmpty(dto.getTradeStatus())) {
                 if (dto.getTradeStatus().equals("96")) {
                     dto.setTradeStatus("成本确认");
                 } else if (dto.getTradeStatus().equals("110")) {
                     dto.setTradeStatus("已完成");
                 }
-            }else{
+            } else {
                 dto.setTradeStatus("-");
             }
 

src/main/java/com/link/bi/service/impl/FinanceOrderServiceImpl.java

 package com.link.bi.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.link.bi.domain.entity.FinanceOrder;
-import com.link.bi.domain.mapper.FinanceOrderMapper;
 import com.link.bi.service.FinanceOrderService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -17,6 +14,6 @@ import org.springframework.stereotype.Service;
 @DS("bi")
 @Slf4j
 @Service
-public class FinanceOrderServiceImpl extends ServiceImpl<FinanceOrderMapper, FinanceOrder> implements FinanceOrderService {
+public class FinanceOrderServiceImpl implements FinanceOrderService {
 
 }