维多利亚

hx-common/code-generator/src/main/java/com/fjhx/generator/CodeGenerator.java

@@ -117,7 +117,6 @@ public class CodeGenerator {
         strategy.setSuperServiceClass(BASE_SERVICE_PATH);
         // 实体继承规则
         strategy.setSuperEntityClass(BASE_ENTITY_PATH);
-        strategy.setSuperMapperClass("com.github.yulichang.base.MPJBaseMapper");
         strategy.setTableFillList(Arrays.asList(
                 new TableFill("del_flag", FieldFill.INSERT),
                 new TableFill("version", FieldFill.INSERT)));

hx-common/common-tool/pom.xml

@@ -38,12 +38,6 @@
             <artifactId>hutool-all</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.github.yulichang</groupId>
-            <artifactId>mybatis-plus-join-boot-starter</artifactId>
-            <version>1.3.11</version>
-        </dependency>
-
     </dependencies>
 
 </project>

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockBackPlanServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.constants.StatusConstant;

hx-service/storage/src/main/java/com/fjhx/task/controller/ScheduleTaskController.java

@@ -64,8 +64,8 @@ public class ScheduleTaskController {
     /**
      * 统计排班数据
      */
-    // @Scheduled(cron = "30 0/5 * * * ?")
-   @PostConstruct
+    @Scheduled(cron = "30 0/5 * * * ?")
+   // @PostConstruct
     private void statisticsScheduleDateTask() {
         // if (BladeApplication.isLocalDev()) {
         //     return;

hx-service/syringe-production/src/main/java/com/fjhx/mapper/factory/FactoryProductMapper.java

@@ -1,16 +1,16 @@
 package com.fjhx.mapper.factory;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fjhx.entity.factory.FactoryProduct;
-import com.github.yulichang.base.MPJBaseMapper;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author ${author}
  * @since 2022-12-14
  */
-public interface FactoryProductMapper extends MPJBaseMapper<FactoryProduct> {
+public interface FactoryProductMapper extends BaseMapper<FactoryProduct> {
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/abnormal/AbnormalDetailsMapper.java

@@ -1,8 +1,7 @@
 package com.fjhx.mapper.abnormal;
 
-import com.fjhx.entity.abnormal.AbnormalDetails;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
+import com.fjhx.entity.abnormal.AbnormalDetails;
 
 /**
  * <p>
@@ -12,6 +11,6 @@ import com.github.yulichang.base.MPJBaseMapper;
  * @author ${author}
  * @since 2022-12-09
  */
-public interface AbnormalDetailsMapper extends MPJBaseMapper<AbnormalDetails> {
+public interface AbnormalDetailsMapper extends BaseMapper<AbnormalDetails> {
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/abnormal/AbnormalInfoMapper.java

@@ -1,8 +1,7 @@
 package com.fjhx.mapper.abnormal;
 
-import com.fjhx.entity.abnormal.AbnormalInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
+import com.fjhx.entity.abnormal.AbnormalInfo;
 
 /**
  * <p>
@@ -12,6 +11,6 @@ import com.github.yulichang.base.MPJBaseMapper;
  * @author ${author}
  * @since 2022-12-09
  */
-public interface AbnormalInfoMapper extends MPJBaseMapper<AbnormalInfo> {
+public interface AbnormalInfoMapper extends BaseMapper<AbnormalInfo> {
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/apply/ApplyPurchaseMapper.java

@@ -1,12 +1,6 @@
 package com.fjhx.mapper.apply;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.apply.ApplyPurchase;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fjhx.entity.supplier.SupplierPrice;
-import com.fjhx.utils.wrapperUtil.IWrapper;
-import com.github.yulichang.base.MPJBaseMapper;
-import org.apache.ibatis.annotations.Param;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.apply.ApplyPurchase;
 import com.fjhx.utils.wrapperUtil.IWrapper;
@@ -22,7 +16,7 @@ import java.util.Map;
  * @author ${author}
  * @since 2022-11-28
  */
-public interface ApplyPurchaseMapper extends MPJBaseMapper<ApplyPurchase> {
+public interface ApplyPurchaseMapper extends BaseMapper<ApplyPurchase> {
 
     Page<ApplyPurchase> getPage(@Param("page") Page<ApplyPurchase> page, @Param("ew") IWrapper<ApplyPurchase> wrapper);
 

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/classify/ClassifyMapper.java

@@ -1,8 +1,7 @@
 package com.fjhx.mapper.classify;
 
-import com.fjhx.entity.classify.Classify;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
+import com.fjhx.entity.classify.Classify;
 
 /**
  * <p>
@@ -12,6 +11,6 @@ import com.github.yulichang.base.MPJBaseMapper;
  * @author ${author}
  * @since 2022-11-24
  */
-public interface ClassifyMapper extends MPJBaseMapper<Classify> {
+public interface ClassifyMapper extends BaseMapper<Classify> {
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/customer/CustomerInfoMapper.java

@@ -1,8 +1,7 @@
 package com.fjhx.mapper.customer;
 
-import com.fjhx.entity.customer.CustomerInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
+import com.fjhx.entity.customer.CustomerInfo;
 
 /**
  * <p>
@@ -12,6 +11,6 @@ import com.github.yulichang.base.MPJBaseMapper;
  * @author ${author}
  * @since 2022-12-02
  */
-public interface CustomerInfoMapper extends MPJBaseMapper<CustomerInfo> {
+public interface CustomerInfoMapper extends BaseMapper<CustomerInfo> {
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/excel/ExcelImportLogMapper.java

@@ -1,17 +1,16 @@
 package com.fjhx.mapper.excel;
 
-import com.fjhx.entity.excel.ExcelImportLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
+import com.fjhx.entity.excel.ExcelImportLog;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author ${author}
  * @since 2022-12-07
  */
-public interface ExcelImportLogMapper extends MPJBaseMapper<ExcelImportLog> {
+public interface ExcelImportLogMapper extends BaseMapper<ExcelImportLog> {
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/logistics/LogisticsCompanyMapper.java

@@ -1,8 +1,7 @@
 package com.fjhx.mapper.logistics;
 
-import com.fjhx.entity.logistics.LogisticsCompany;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
+import com.fjhx.entity.logistics.LogisticsCompany;
 
 /**
  * <p>
@@ -12,6 +11,6 @@ import com.github.yulichang.base.MPJBaseMapper;
  * @author ${author}
  * @since 2022-12-07
  */
-public interface LogisticsCompanyMapper extends MPJBaseMapper<LogisticsCompany> {
+public interface LogisticsCompanyMapper extends BaseMapper<LogisticsCompany> {
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/logistics/LogisticsDetailsMapper.java

@@ -3,7 +3,6 @@ package com.fjhx.mapper.logistics;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fjhx.entity.logistics.LogisticsDetails;
 import com.fjhx.utils.wrapperUtil.IWrapper;
-import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -17,7 +16,7 @@ import java.util.Map;
  * @author ${author}
  * @since 2022-11-30
  */
-public interface LogisticsDetailsMapper extends MPJBaseMapper<LogisticsDetails> {
+public interface LogisticsDetailsMapper extends BaseMapper<LogisticsDetails> {
 
     List<Map<String, Object>> getLogisticsDetailsByLogisticsId(@Param("ew") IWrapper<Object> wrapper);
 

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/logistics/LogisticsInfoMapper.java

@@ -1,8 +1,7 @@
 package com.fjhx.mapper.logistics;
 
-import com.fjhx.entity.logistics.LogisticsInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
+import com.fjhx.entity.logistics.LogisticsInfo;
 
 /**
  * <p>
@@ -12,6 +11,6 @@ import com.github.yulichang.base.MPJBaseMapper;
  * @author ${author}
  * @since 2022-11-30
  */
-public interface LogisticsInfoMapper extends MPJBaseMapper<LogisticsInfo> {
+public interface LogisticsInfoMapper extends BaseMapper<LogisticsInfo> {
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderDetailsMapper.java

@@ -1,9 +1,9 @@
 package com.fjhx.mapper.order;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fjhx.entity.order.OrderDetails;
 import com.fjhx.params.order.OrderDetailsEx;
-import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -16,7 +16,7 @@ import java.util.List;
  * @author ${author}
  * @since 2022-12-13
  */
-public interface OrderDetailsMapper extends MPJBaseMapper<OrderDetails> {
+public interface OrderDetailsMapper extends BaseMapper<OrderDetails> {
 
     List<OrderDetailsEx> listByOrderSalesId(@Param("ew") QueryWrapper<Object> wrapper);
 

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderFollowMapper.java

@@ -1,7 +1,7 @@
 package com.fjhx.mapper.order;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fjhx.entity.order.OrderFollow;
-import com.github.yulichang.base.MPJBaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.github.yulichang.base.MPJBaseMapper;
  * @author ${author}
  * @since 2022-12-16
  */
-public interface OrderFollowMapper extends MPJBaseMapper<OrderFollow> {
+public interface OrderFollowMapper extends BaseMapper<OrderFollow> {
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderInfoMapper.java

@@ -1,11 +1,11 @@
 package com.fjhx.mapper.order;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.order.OrderInfo;
 import com.fjhx.params.order.OrderInfoEx;
 import com.fjhx.utils.wrapperUtil.IWrapper;
-import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -16,7 +16,7 @@ import org.apache.ibatis.annotations.Param;
  * @author ${author}
  * @since 2022-12-13
  */
-public interface OrderInfoMapper extends MPJBaseMapper<OrderInfo> {
+public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
 
     Page<OrderInfoEx> getPage(@Param("page") Page<OrderInfo> page, @Param("ew") IWrapper<Object> wrapper);
 

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/product/ProductCombinationMapper.java

@@ -1,17 +1,16 @@
 package com.fjhx.mapper.product;
 
-import com.fjhx.entity.product.ProductCombination;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.mapper.MPJJoinMapper;
+import com.fjhx.entity.product.ProductCombination;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author ${author}
  * @since 2022-11-30
  */
-public interface ProductCombinationMapper extends MPJJoinMapper<ProductCombination> {
+public interface ProductCombinationMapper extends BaseMapper<ProductCombination> {
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/product/ProductInfoMapper.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.product.ProductInfo;
 import com.fjhx.params.product.ProductCombinationEx;
 import com.fjhx.utils.wrapperUtil.IWrapper;
-import com.github.yulichang.base.mapper.MPJJoinMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Map;
@@ -18,7 +17,7 @@ import java.util.Map;
  * @author ${author}
  * @since 2022-11-29
  */
-public interface ProductInfoMapper extends MPJJoinMapper<ProductInfo> {
+public interface ProductInfoMapper extends BaseMapper<ProductInfo> {
 
 
     Page<Map<String, Object>> getPage(@Param("page") Page<ProductInfo> page, @Param("ew") IWrapper<ProductInfo> wrapper);

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/product/ProductSpuMapper.java

@@ -1,17 +1,16 @@
 package com.fjhx.mapper.product;
 
-import com.fjhx.entity.product.ProductSpu;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.mapper.MPJJoinMapper;
+import com.fjhx.entity.product.ProductSpu;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author ${author}
  * @since 2022-11-25
  */
-public interface ProductSpuMapper extends MPJJoinMapper<ProductSpu> {
+public interface ProductSpuMapper extends BaseMapper<ProductSpu> {
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/purchase/PurchaseMapper.java

@@ -1,8 +1,7 @@
 package com.fjhx.mapper.purchase;
 
-import com.fjhx.entity.purchase.Purchase;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.mapper.MPJJoinMapper;
+import com.fjhx.entity.purchase.Purchase;
 
 /**
  * <p>
@@ -12,6 +11,6 @@ import com.github.yulichang.base.mapper.MPJJoinMapper;
  * @author ${author}
  * @since 2022-12-01
  */
-public interface PurchaseMapper extends MPJJoinMapper<Purchase> {
+public interface PurchaseMapper extends BaseMapper<Purchase> {
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/stock/StockJournalMapper.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.stock.StockJournal;
 import com.fjhx.utils.wrapperUtil.IWrapper;
-import com.github.yulichang.base.mapper.MPJJoinMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Map;
@@ -17,7 +16,7 @@ import java.util.Map;
  * @author ${author}
  * @since 2022-11-24
  */
-public interface StockJournalMapper extends MPJJoinMapper<StockJournal> {
+public interface StockJournalMapper extends BaseMapper<StockJournal> {
 
     Page<StockJournal> getPage(@Param("page") Page<StockJournal> page, @Param("ew") IWrapper<StockJournal> wrapper);
 

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/stock/StockMapper.java

@@ -1,8 +1,7 @@
 package com.fjhx.mapper.stock;
 
-import com.fjhx.entity.stock.Stock;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.mapper.MPJJoinMapper;
+import com.fjhx.entity.stock.Stock;
 
 /**
  * <p>
@@ -12,6 +11,6 @@ import com.github.yulichang.base.mapper.MPJJoinMapper;
  * @author ${author}
  * @since 2022-11-24
  */
-public interface StockMapper extends MPJJoinMapper<Stock> {
+public interface StockMapper extends BaseMapper<Stock> {
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/stock/StockTransferMapper.java

@@ -1,9 +1,9 @@
 package com.fjhx.mapper.stock;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.stock.StockTransfer;
 import com.fjhx.utils.wrapperUtil.IWrapper;
-import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Map;
@@ -16,7 +16,7 @@ import java.util.Map;
  * @author ${author}
  * @since 2022-12-14
  */
-public interface StockTransferMapper extends MPJBaseMapper<StockTransfer> {
+public interface StockTransferMapper extends BaseMapper<StockTransfer> {
 
     Page<Map<String, Object>> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Object> wrapper);
 

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/supplier/SupplierMapper.java

@@ -2,7 +2,6 @@ package com.fjhx.mapper.supplier;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fjhx.entity.supplier.Supplier;
-import com.github.yulichang.base.mapper.MPJJoinMapper;
 
 /**
  * <p>
@@ -12,6 +11,6 @@ import com.github.yulichang.base.mapper.MPJJoinMapper;
  * @author ${author}
  * @since 2022-11-24
  */
-public interface SupplierMapper extends MPJJoinMapper<Supplier> {
+public interface SupplierMapper extends BaseMapper<Supplier> {
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/supplier/SupplierPriceMapper.java

@@ -1,10 +1,9 @@
 package com.fjhx.mapper.supplier;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.supplier.SupplierPrice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fjhx.utils.wrapperUtil.IWrapper;
-import com.github.yulichang.base.mapper.MPJJoinMapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -15,7 +14,7 @@ import org.apache.ibatis.annotations.Param;
  * @author ${author}
  * @since 2022-11-25
  */
-public interface SupplierPriceMapper extends MPJJoinMapper<SupplierPrice> {
+public interface SupplierPriceMapper extends BaseMapper<SupplierPrice> {
 
     Page<SupplierPrice> getPage(@Param("page") Page<SupplierPrice> page, @Param("ew") IWrapper<SupplierPrice> wrapper);
 

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/system/SystemConfigMapper.java

@@ -1,8 +1,7 @@
 package com.fjhx.mapper.system;
 
-import com.fjhx.entity.system.SystemConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.mapper.MPJJoinMapper;
+import com.fjhx.entity.system.SystemConfig;
 
 /**
  * <p>
@@ -12,6 +11,6 @@ import com.github.yulichang.base.mapper.MPJJoinMapper;
  * @author ${author}
  * @since 2022-12-08
  */
-public interface SystemConfigMapper extends MPJJoinMapper<SystemConfig> {
+public interface SystemConfigMapper extends BaseMapper<SystemConfig> {
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/warehouse/WarehouseMapper.java

@@ -1,9 +1,7 @@
 package com.fjhx.mapper.warehouse;
 
-import com.fjhx.entity.warehouse.Warehouse;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.github.yulichang.base.mapper.MPJJoinMapper;
+import com.fjhx.entity.warehouse.Warehouse;
 
 /**
  * <p>
@@ -13,6 +11,6 @@ import com.github.yulichang.base.mapper.MPJJoinMapper;
  * @author ${author}
  * @since 2022-11-24
  */
-public interface WarehouseMapper extends MPJJoinMapper<Warehouse> {
+public interface WarehouseMapper extends BaseMapper<Warehouse> {
 
 }