代码优化

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/base/AbstractBaseService.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/service/AbstractBaseService.java

-package org.dromara.order.base;
+package org.dromara.common.mybatis.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/base/IBaseService.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/service/IBaseService.java

-package org.dromara.order.base;
+package org.dromara.common.mybatis.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/IOrderFeeService.java

 package org.dromara.order.service;
 
-import org.dromara.order.base.IBaseService;
+import org.dromara.common.mybatis.service.IBaseService;
 import org.dromara.order.domain.OrderFee;
 import org.dromara.order.domain.bo.OrderFeeBo;
 import org.dromara.order.domain.vo.OrderFeeVo;

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/IOrderService.java

 package org.dromara.order.service;
 
-import org.dromara.order.base.IBaseService;
+import org.dromara.common.mybatis.service.IBaseService;
 import org.dromara.order.domain.Order;
 import org.dromara.order.domain.bo.OrderBo;
 import org.dromara.order.domain.vo.OrderVo;

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/IOrderTradeService.java

 package org.dromara.order.service;
 
-import org.dromara.order.base.IBaseService;
+import org.dromara.common.mybatis.service.IBaseService;
 import org.dromara.order.domain.OrderTrade;
 import org.dromara.order.domain.bo.OrderTradeBo;
 import org.dromara.order.domain.vo.OrderTradeVo;

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderFeeServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.order.base.AbstractBaseService;
+import org.dromara.common.mybatis.service.AbstractBaseService;
 import org.dromara.order.domain.OrderFee;
 import org.dromara.order.domain.bo.OrderFeeBo;
 import org.dromara.order.domain.vo.OrderFeeVo;

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.order.base.AbstractBaseService;
+import org.dromara.common.mybatis.service.AbstractBaseService;
 import org.dromara.order.domain.Order;
 import org.dromara.order.domain.bo.OrderBo;
 import org.dromara.order.domain.vo.OrderVo;

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderTradeServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.order.base.AbstractBaseService;
+import org.dromara.common.mybatis.service.AbstractBaseService;
 import org.dromara.order.domain.OrderTrade;
 import org.dromara.order.domain.bo.OrderTradeBo;
 import org.dromara.order.domain.vo.OrderTradeVo;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/base/AbstractBaseService.java

-package org.dromara.server.base;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.reflect.GenericsUtils;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @author hzh
- * @date 2024-11-18
- **/
-public abstract class AbstractBaseService<V, B, T> implements IBaseService<V, B, T> {
-
-    @Override
-    public abstract BaseMapperPlus<T, V> mapper();
-
-    @Override
-    public V queryById(Long id) {
-        return mapper().selectVoById(id);
-    }
-
-    @Override
-    public TableDataInfo<V> queryPageList(B bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<T> lqw = buildQueryWrapper(bo);
-        Page<V> result = mapper().selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
-    }
-
-    @Override
-    public List<V> queryList(B bo) {
-        LambdaQueryWrapper<T> lqw = buildQueryWrapper(bo);
-        return mapper().selectVoList(lqw);
-    }
-
-    @Override
-    public V queryOne(B bo) {
-        LambdaQueryWrapper<T> lqw = buildQueryWrapper(bo);
-        List<V> list = mapper().selectVoList(lqw);
-        return CollectionUtil.isEmpty(list) ? null : list.get(0);
-    }
-
-    @Override
-    public Boolean insertByBo(B bo) {
-        Class<T> clazz = (Class<T>) GenericsUtils.getSuperClassGenricType(this.getClass(), 2);
-        T add = MapstructUtils.convert(bo, clazz);
-        validEntityBeforeSave(add);
-        boolean flag = mapper().insert(add) > 0;
-        return flag;
-    }
-
-    @Override
-    public Boolean updateByBo(B bo) {
-        Class<T> clazz = (Class<T>) GenericsUtils.getSuperClassGenricType(this.getClass(), 2);
-        T update = MapstructUtils.convert(bo, clazz);
-        validEntityBeforeSave(update);
-        return mapper().updateById(update) > 0;
-    }
-
-    @Override
-    public LambdaQueryWrapper<T> buildQueryWrapper(B bo) {
-        LambdaQueryWrapper<T> lqw = Wrappers.lambdaQuery();
-        return lqw;
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if (isValid) {
-            validIdsBeforeDelete(ids);
-        }
-        return mapper().deleteByIds(ids) > 0;
-    }
-
-    @Override
-    public void validIdsBeforeDelete(Collection<Long> ids) {
-
-    }
-}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/base/IBaseService.java

-package org.dromara.server.base;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @author wenhe
- */
-public interface IBaseService<V, B, T> {
-
-    /**
-     * 详情
-     *
-     * @param id 主键
-     * @return 详情
-     */
-    V queryById(Long id);
-
-    /**
-     * 分页查询活动机票订单列表
-     *
-     * @param bo        查询条件
-     * @param pageQuery 分页参数
-     * @return 活动机票订单分页列表
-     */
-    TableDataInfo<V> queryPageList(B bo, PageQuery pageQuery);
-
-    /**
-     * 查询符合条件的列表
-     *
-     * @param bo 查询条件
-     * @return 列表
-     */
-    List<V> queryList(B bo);
-
-    /**
-     * 查询符合条件的对象
-     * @param bo 查询条件
-     * @return 对象
-     */
-    V queryOne(B bo);
-
-    /**
-     * 新增
-     *
-     * @param bo bo
-     * @return 是否新增成功
-     */
-    Boolean insertByBo(B bo);
-
-    /**
-     * 修改
-     *
-     * @param bo bo
-     * @return 是否修改成功
-     */
-    Boolean updateByBo(B bo);
-
-    /**
-     * 校验并批量删除
-     *
-     * @param ids     待删除的主键集合
-     * @param isValid 是否进行有效性校验
-     * @return 是否删除成功
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-
-    /**
-     * 删除之前校验id
-     *
-     * @param ids 待删除的主键集合
-     */
-    default void validIdsBeforeDelete(Collection<Long> ids){
-
-    }
-
-    /**
-     * 构建查询条件
-     *
-     * @param bo bo
-     * @return 查询条件
-     */
-    LambdaQueryWrapper<T> buildQueryWrapper(B bo);
-
-    /**
-     * 保存之前校验实体
-     *
-     * @param entity 实体
-     */
-    default void validEntityBeforeSave(T entity){
-
-    }
-
-    default BaseMapperPlus mapper() {
-        return null;
-    }
-
-}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/dubbo/RemoteYsOrderServiceImpl.java

@@ -158,14 +158,14 @@ public class RemoteYsOrderServiceImpl implements RemoteYsOrderService {
         log.info("支付成功后确认出票,orderType:{},orderNo:{}", orderType, orderNo);
         if (StringUtils.equals(orderType, OrderType.AIRPORT.getType())) {
             //飞机票
-            Optional.ofNullable(orderAirportService.queryOne(new OrderAirportBo().setOrderNo(orderNo))).ifPresent(vo -> {
+            Optional.ofNullable(orderAirportService.getOne(new OrderAirportBo().setOrderNo(orderNo))).ifPresent(vo -> {
                 //确认出票
                 airportService.confirmOrder(vo.getPersonCode(), new OrderConfirmModel().setOrderNo(orderNo).setAutoDraw(1));
                 orderAirportService.updateOrderInfo(List.of(orderNo));
             });
         } else if (StringUtils.equals(orderType, OrderType.TRAIN.getType())) {
             //火车票
-            Optional.ofNullable(orderTrainService.queryOne(new OrderTrainBo().setOrderNo(orderNo))).ifPresent(vo -> {
+            Optional.ofNullable(orderTrainService.getOne(new OrderTrainBo().setOrderNo(orderNo))).ifPresent(vo -> {
                 //确认出票
                 trainService.confirmOrder(vo.getPersonCode(), new ConfirmOrderModel().setOrderNo(orderNo));
                 orderTrainService.updateOrderInfo(List.of(orderNo));
@@ -174,7 +174,7 @@ public class RemoteYsOrderServiceImpl implements RemoteYsOrderService {
 
         } else if (StringUtils.equals(orderType, OrderType.HOTEL.getType())) {
             //酒店
-            Optional.ofNullable(orderHotelService.queryOne(new OrderHotelBo().setOrderNo(orderNo))).ifPresent(vo -> {
+            Optional.ofNullable(orderHotelService.getOne(new OrderHotelBo().setOrderNo(orderNo))).ifPresent(vo -> {
                 //确认出票
                 hotelService.orderPay(vo.getPersonCode(), new PayOrderModel().setOrderNo(orderNo));
                 orderHotelService.updateOrderInfo(List.of(orderNo));

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IApplyService.java

 package org.dromara.server.service;
 
-import org.dromara.server.base.IBaseService;
+import org.dromara.common.mybatis.service.IBaseService;
 import org.dromara.server.domain.Apply;
 import org.dromara.server.domain.bo.ApplyApproveBo;
 import org.dromara.server.domain.bo.ApplyBo;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IBizUserService.java

 package org.dromara.server.service;
 
-import org.dromara.server.base.IBaseService;
+import org.dromara.common.mybatis.service.IBaseService;
 import org.dromara.server.domain.BizUser;
 import org.dromara.server.domain.bo.BizUserBo;
 import org.dromara.server.domain.vo.BizUserVo;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IOrderAirportRefundService.java

 package org.dromara.server.service;
 
-import org.dromara.server.base.IBaseService;
+import org.dromara.common.mybatis.service.IBaseService;
 import org.dromara.server.domain.OrderAirportRefund;
 import org.dromara.server.domain.bo.OrderAirportRefundBo;
 import org.dromara.server.domain.vo.OrderAirportRefundVo;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IOrderAirportService.java

 package org.dromara.server.service;
 
-import org.dromara.server.base.IBaseService;
+import org.dromara.common.mybatis.service.IBaseService;
 import org.dromara.server.domain.OrderAirport;
 import org.dromara.server.domain.bo.OrderAirportBo;
 import org.dromara.server.domain.vo.OrderAirportVo;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IOrderHotelService.java

 package org.dromara.server.service;
 
-import org.dromara.server.base.IBaseService;
+import org.dromara.common.mybatis.service.IBaseService;
 import org.dromara.server.domain.OrderHotel;
 import org.dromara.server.domain.bo.OrderHotelBo;
 import org.dromara.server.domain.vo.OrderHotelVo;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IOrderTrainRefundService.java

 package org.dromara.server.service;
 
-import org.dromara.server.base.IBaseService;
+import org.dromara.common.mybatis.service.IBaseService;
 import org.dromara.server.domain.OrderTrainRefund;
 import org.dromara.server.domain.bo.OrderTrainRefundBo;
 import org.dromara.server.domain.vo.OrderTrainRefundVo;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IOrderTrainService.java

 package org.dromara.server.service;
 
-import org.dromara.server.base.IBaseService;
+import org.dromara.common.mybatis.service.IBaseService;
 import org.dromara.server.domain.OrderTrain;
 import org.dromara.server.domain.bo.OrderTrainBo;
 import org.dromara.server.domain.vo.OrderTrainVo;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IOrderVehiclesService.java

 package org.dromara.server.service;
 
-import org.dromara.server.base.IBaseService;
+import org.dromara.common.mybatis.service.IBaseService;
 import org.dromara.server.domain.OrderVehicles;
 import org.dromara.server.domain.bo.OrderVehiclesBo;
 import org.dromara.server.domain.vo.OrderVehiclesVo;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/ApplyServiceImpl.java

@@ -10,8 +10,8 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.service.AbstractBaseService;
 import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.server.base.AbstractBaseService;
 import org.dromara.server.constant.ApplyStatus;
 import org.dromara.server.domain.Apply;
 import org.dromara.server.domain.ApplyApprove;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/BizUserServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.server.base.AbstractBaseService;
+import org.dromara.common.mybatis.service.AbstractBaseService;
 import org.dromara.server.domain.BizUser;
 import org.dromara.server.domain.bo.BizUserBo;
 import org.dromara.server.domain.vo.BizUserVo;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderAirportRefundServiceImpl.java

@@ -8,13 +8,13 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.common.mybatis.service.AbstractBaseService;
 import org.dromara.common.ys.model.res.airport.OrderRefundDetailModel;
 import org.dromara.common.ys.model.res.airport.other.InsuranceInfoBean;
 import org.dromara.common.ys.model.res.airport.other.OrderBusinessInfoBean;
 import org.dromara.common.ys.model.res.airport.other.OrderPayInfoBean;
 import org.dromara.common.ys.model.res.airport.other.OrderRangeInfoBean;
 import org.dromara.common.ys.service.IAirportService;
-import org.dromara.server.base.AbstractBaseService;
 import org.dromara.server.domain.*;
 import org.dromara.server.domain.bo.OrderAirportRefundBo;
 import org.dromara.server.domain.vo.OrderAirportRefundVo;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderAirportServiceImpl.java

@@ -10,10 +10,10 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.service.AbstractBaseService;
 import org.dromara.common.ys.model.res.airport.QueryTkOrderModel;
 import org.dromara.common.ys.model.res.airport.other.*;
 import org.dromara.common.ys.service.IAirportService;
-import org.dromara.server.base.AbstractBaseService;
 import org.dromara.server.domain.*;
 import org.dromara.server.domain.bo.OrderAirportBo;
 import org.dromara.server.domain.vo.OrderAirportRangeVo;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderHotelServiceImpl.java

@@ -8,13 +8,13 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.common.mybatis.service.AbstractBaseService;
 import org.dromara.common.ys.model.res.airport.other.OrderBusinessInfoBean;
 import org.dromara.common.ys.model.res.airport.other.OrderPayInfoBean;
 import org.dromara.common.ys.model.res.hotel.HotelOrderQueryDetailModel;
 import org.dromara.common.ys.model.res.hotel.bean.HotelOrderPriceInfoBean;
 import org.dromara.common.ys.model.res.hotel.bean.HotelOrderPsgInfoBean;
 import org.dromara.common.ys.service.IHotelService;
-import org.dromara.server.base.AbstractBaseService;
 import org.dromara.server.domain.*;
 import org.dromara.server.domain.bo.OrderHotelBo;
 import org.dromara.server.domain.vo.OrderHotelVo;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderTrainRefundServiceImpl.java

@@ -8,6 +8,7 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.common.mybatis.service.AbstractBaseService;
 import org.dromara.common.ys.common.PageInfo;
 import org.dromara.common.ys.model.res.airport.other.OrderPayInfoBean;
 import org.dromara.common.ys.model.res.train.OrderRefundDetailModel;
@@ -16,7 +17,6 @@ import org.dromara.common.ys.model.res.train.bean.BusinessInfo;
 import org.dromara.common.ys.model.res.train.bean.BxOrderInfoBean;
 import org.dromara.common.ys.model.res.train.bean.TrRefundticketInfoBean;
 import org.dromara.common.ys.service.ITrainService;
-import org.dromara.server.base.AbstractBaseService;
 import org.dromara.server.domain.*;
 import org.dromara.server.domain.bo.OrderTrainRefundBo;
 import org.dromara.server.domain.vo.OrderTrainRefundVo;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderTrainServiceImpl.java

@@ -10,15 +10,15 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.service.AbstractBaseService;
 import org.dromara.common.ys.model.req.train.OrderQueryModel;
 import org.dromara.common.ys.model.res.airport.other.OrderPayInfoBean;
-import org.dromara.common.ys.model.res.train.*;
+import org.dromara.common.ys.model.res.train.OrderInfoModel;
 import org.dromara.common.ys.model.res.train.bean.BusinessInfo;
 import org.dromara.common.ys.model.res.train.bean.PayInfo;
 import org.dromara.common.ys.model.res.train.bean.RangeInfo;
 import org.dromara.common.ys.model.res.train.bean.TicketInfo;
 import org.dromara.common.ys.service.ITrainService;
-import org.dromara.server.base.AbstractBaseService;
 import org.dromara.server.domain.*;
 import org.dromara.server.domain.bo.OrderTrainBo;
 import org.dromara.server.domain.vo.OrderTrainRangeVo;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderVehiclesServiceImpl.java

@@ -10,11 +10,11 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.service.AbstractBaseService;
 import org.dromara.common.ys.model.res.airport.other.OrderBusinessInfoBean;
 import org.dromara.common.ys.model.res.airport.other.OrderPayInfoBean;
 import org.dromara.common.ys.model.res.vehicles.OrderDetailModel;
 import org.dromara.common.ys.service.IVehiclesService;
-import org.dromara.server.base.AbstractBaseService;
 import org.dromara.server.domain.BizUser;
 import org.dromara.server.domain.OrderVehicles;
 import org.dromara.server.domain.OrderVehiclesBusiness;