From 9401bb7483ae32b1406f53f939dffc2e9ceabd21 Mon Sep 17 00:00:00 2001 From: shenyifei Date: Wed, 12 Nov 2025 18:42:06 +0800 Subject: [PATCH] =?UTF-8?q?refactor(import):=20=E4=BC=98=E5=8C=96=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E8=AF=AD=E5=8F=A5=E9=A1=BA=E5=BA=8F=E5=B9=B6=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/turbo/admin/controller/CostItemController.java | 4 ++-- .../erp/turbo/admin/controller/PurchaseOrderController.java | 2 -- .../erp/turbo/admin/controller/SupplierController.java | 1 - .../turbo/biz/app/executor/query/SupplierCheckQryExe.java | 1 - .../erp/turbo/biz/app/service/CostItemServiceImpl.java | 6 +++--- .../com/xunhong/erp/turbo/biz/domain/entity/Supplier.java | 1 - .../erp/turbo/biz/domain/gateway/CostItemGateway.java | 4 ++-- .../biz/infrastructure/gateway/CostItemGatewayImpl.java | 4 ++-- .../biz/infrastructure/gateway/ShipOrderGatewayImpl.java | 5 +++-- .../facade/app/executor/cmd/VehicleExtractionCmdExe.java | 1 - .../com/xunhong/erp/turbo/api/biz/api/CostItemServiceI.java | 4 ++-- 11 files changed, 14 insertions(+), 19 deletions(-) diff --git a/erp-turbo-admin/src/main/java/com/xunhong/erp/turbo/admin/controller/CostItemController.java b/erp-turbo-admin/src/main/java/com/xunhong/erp/turbo/admin/controller/CostItemController.java index 7b04b78..ad1786e 100644 --- a/erp-turbo-admin/src/main/java/com/xunhong/erp/turbo/admin/controller/CostItemController.java +++ b/erp-turbo-admin/src/main/java/com/xunhong/erp/turbo/admin/controller/CostItemController.java @@ -8,8 +8,8 @@ import com.alibaba.cola.dto.SingleResponse; import com.xunhong.erp.turbo.api.biz.api.CostItemServiceI; import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemCreateCmd; import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemDestroyCmd; -import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemUpdateCmd; import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemDragCmd; +import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemUpdateCmd; import com.xunhong.erp.turbo.api.biz.dto.qry.CostItemListQry; import com.xunhong.erp.turbo.api.biz.dto.qry.CostItemPageQry; import com.xunhong.erp.turbo.api.biz.dto.qry.CostItemShowQry; @@ -92,4 +92,4 @@ public class CostItemController { costItemService.drag(costItemDragCmd); return Response.buildSuccess(); } -} \ No newline at end of file +} diff --git a/erp-turbo-admin/src/main/java/com/xunhong/erp/turbo/admin/controller/PurchaseOrderController.java b/erp-turbo-admin/src/main/java/com/xunhong/erp/turbo/admin/controller/PurchaseOrderController.java index 2ae2c9a..a0f72f9 100644 --- a/erp-turbo-admin/src/main/java/com/xunhong/erp/turbo/admin/controller/PurchaseOrderController.java +++ b/erp-turbo-admin/src/main/java/com/xunhong/erp/turbo/admin/controller/PurchaseOrderController.java @@ -1,7 +1,6 @@ package com.xunhong.erp.turbo.admin.controller; import cn.dev33.satoken.annotation.SaCheckLogin; -import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; import cn.dev33.satoken.annotation.SaMode; import com.alibaba.cola.dto.MultiResponse; @@ -15,7 +14,6 @@ import com.xunhong.erp.turbo.api.biz.dto.qry.PurchaseOrderListQry; import com.xunhong.erp.turbo.api.biz.dto.qry.PurchaseOrderPageQry; import com.xunhong.erp.turbo.api.biz.dto.qry.PurchaseOrderShowQry; import com.xunhong.erp.turbo.api.biz.dto.vo.PurchaseOrderVO; -import com.xunhong.erp.turbo.api.rbac.dto.constants.PermissionConstant; import com.xunhong.erp.turbo.api.rbac.dto.constants.RoleConstant; import com.xunhong.erp.turbo.api.user.api.AdminServiceI; import com.xunhong.erp.turbo.api.user.dto.qry.AdminShowQry; diff --git a/erp-turbo-admin/src/main/java/com/xunhong/erp/turbo/admin/controller/SupplierController.java b/erp-turbo-admin/src/main/java/com/xunhong/erp/turbo/admin/controller/SupplierController.java index d79a45f..7b36bfa 100644 --- a/erp-turbo-admin/src/main/java/com/xunhong/erp/turbo/admin/controller/SupplierController.java +++ b/erp-turbo-admin/src/main/java/com/xunhong/erp/turbo/admin/controller/SupplierController.java @@ -1,7 +1,6 @@ package com.xunhong.erp.turbo.admin.controller; import cn.dev33.satoken.annotation.SaCheckLogin; -import cn.dev33.satoken.annotation.SaCheckPermission; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/SupplierCheckQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/SupplierCheckQryExe.java index 7ae5863..f737cc5 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/SupplierCheckQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/SupplierCheckQryExe.java @@ -1,7 +1,6 @@ package com.xunhong.erp.turbo.biz.app.executor.query; import com.xunhong.erp.turbo.api.biz.dto.qry.SupplierCheckQry; -import com.xunhong.erp.turbo.api.biz.dto.qry.SupplierShowQry; import com.xunhong.erp.turbo.api.biz.dto.vo.SupplierVO; import com.xunhong.erp.turbo.biz.app.assembler.SupplierAssembler; import com.xunhong.erp.turbo.biz.domain.entity.Supplier; diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/CostItemServiceImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/CostItemServiceImpl.java index 7c52107..2e764e5 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/CostItemServiceImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/CostItemServiceImpl.java @@ -3,8 +3,8 @@ package com.xunhong.erp.turbo.biz.app.service; import com.xunhong.erp.turbo.api.biz.api.CostItemServiceI; import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemCreateCmd; import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemDestroyCmd; -import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemUpdateCmd; import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemDragCmd; +import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemUpdateCmd; import com.xunhong.erp.turbo.api.biz.dto.qry.CostItemListQry; import com.xunhong.erp.turbo.api.biz.dto.qry.CostItemPageQry; import com.xunhong.erp.turbo.api.biz.dto.qry.CostItemShowQry; @@ -13,10 +13,10 @@ import com.xunhong.erp.turbo.base.dto.PageDTO; import com.xunhong.erp.turbo.biz.app.executor.cmd.CostItemCreateCmdExe; import com.xunhong.erp.turbo.biz.app.executor.cmd.CostItemDestroyCmdExe; import com.xunhong.erp.turbo.biz.app.executor.cmd.CostItemUpdateCmdExe; +import com.xunhong.erp.turbo.biz.app.executor.query.CostItemDragCmdExe; import com.xunhong.erp.turbo.biz.app.executor.query.CostItemListQryExe; import com.xunhong.erp.turbo.biz.app.executor.query.CostItemPageQryExe; import com.xunhong.erp.turbo.biz.app.executor.query.CostItemShowQryExe; -import com.xunhong.erp.turbo.biz.app.executor.query.CostItemDragCmdExe; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboService; @@ -75,4 +75,4 @@ public class CostItemServiceImpl implements CostItemServiceI { public void drag(CostItemDragCmd costItemDragCmd) { costItemDragCmdExe.execute(costItemDragCmd); } -} \ No newline at end of file +} diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Supplier.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Supplier.java index 515a5e1..9de3b3c 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Supplier.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Supplier.java @@ -2,7 +2,6 @@ package com.xunhong.erp.turbo.biz.domain.entity; import com.alibaba.cola.domain.Entity; import com.alibaba.cola.dto.DTO; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/CostItemGateway.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/CostItemGateway.java index dc5dca4..b752f56 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/CostItemGateway.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/CostItemGateway.java @@ -3,8 +3,8 @@ package com.xunhong.erp.turbo.biz.domain.gateway; import com.baomidou.mybatisplus.core.metadata.IPage; import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemCreateCmd; import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemDestroyCmd; -import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemUpdateCmd; import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemDragCmd; +import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemUpdateCmd; import com.xunhong.erp.turbo.api.biz.dto.qry.CostItemListQry; import com.xunhong.erp.turbo.api.biz.dto.qry.CostItemPageQry; import com.xunhong.erp.turbo.api.biz.dto.qry.CostItemShowQry; @@ -29,4 +29,4 @@ public interface CostItemGateway { void destroy(CostItemDestroyCmd costItemDestroyCmd); void drag(CostItemDragCmd costItemDragCmd); -} \ No newline at end of file +} diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/CostItemGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/CostItemGatewayImpl.java index a7e7e31..c2f3d5d 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/CostItemGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/CostItemGatewayImpl.java @@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemCreateCmd; import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemDestroyCmd; -import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemUpdateCmd; import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemDragCmd; +import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemUpdateCmd; import com.xunhong.erp.turbo.api.biz.dto.qry.CostItemListQry; import com.xunhong.erp.turbo.api.biz.dto.qry.CostItemPageQry; import com.xunhong.erp.turbo.api.biz.dto.qry.CostItemShowQry; @@ -150,4 +150,4 @@ public class CostItemGatewayImpl implements CostItemGateway { return prevSort != null && nextSort != null && (nextSort - prevSort) < 1.0; // 判断间隙是否耗尽 } -} \ No newline at end of file +} diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ShipOrderGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ShipOrderGatewayImpl.java index 1e7a6e8..8a7d29b 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ShipOrderGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ShipOrderGatewayImpl.java @@ -1,6 +1,5 @@ package com.xunhong.erp.turbo.biz.infrastructure.gateway; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -18,7 +17,9 @@ import com.xunhong.erp.turbo.api.biz.dto.qry.ShipOrderShowQry; import com.xunhong.erp.turbo.biz.domain.entity.ShipOrder; import com.xunhong.erp.turbo.biz.domain.gateway.ShipOrderGateway; import com.xunhong.erp.turbo.biz.infrastructure.convert.ShipOrderConvert; -import com.xunhong.erp.turbo.biz.infrastructure.entity.*; +import com.xunhong.erp.turbo.biz.infrastructure.entity.ShipOrderDO; +import com.xunhong.erp.turbo.biz.infrastructure.entity.ShipOrderItemDO; +import com.xunhong.erp.turbo.biz.infrastructure.entity.ShipOrderPackageDO; import com.xunhong.erp.turbo.biz.infrastructure.mapper.ShipOrderItemMapper; import com.xunhong.erp.turbo.biz.infrastructure.mapper.ShipOrderMapper; import com.xunhong.erp.turbo.biz.infrastructure.mapper.ShipOrderPackageMapper; diff --git a/erp-turbo-business/erp-turbo-facade/src/main/java/com/xunhong/erp/turbo/facade/app/executor/cmd/VehicleExtractionCmdExe.java b/erp-turbo-business/erp-turbo-facade/src/main/java/com/xunhong/erp/turbo/facade/app/executor/cmd/VehicleExtractionCmdExe.java index c7db658..7dca0d9 100644 --- a/erp-turbo-business/erp-turbo-facade/src/main/java/com/xunhong/erp/turbo/facade/app/executor/cmd/VehicleExtractionCmdExe.java +++ b/erp-turbo-business/erp-turbo-facade/src/main/java/com/xunhong/erp/turbo/facade/app/executor/cmd/VehicleExtractionCmdExe.java @@ -1,6 +1,5 @@ package com.xunhong.erp.turbo.facade.app.executor.cmd; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONObject; import com.xunhong.erp.turbo.api.facade.dto.cmd.VehicleExtractionCmd; import com.xunhong.erp.turbo.api.facade.dto.vo.VehicleExtractionVO; diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/api/CostItemServiceI.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/api/CostItemServiceI.java index 0816450..09c8fd8 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/api/CostItemServiceI.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/api/CostItemServiceI.java @@ -2,8 +2,8 @@ package com.xunhong.erp.turbo.api.biz.api; import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemCreateCmd; import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemDestroyCmd; -import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemUpdateCmd; import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemDragCmd; +import com.xunhong.erp.turbo.api.biz.dto.cmd.CostItemUpdateCmd; import com.xunhong.erp.turbo.api.biz.dto.qry.CostItemListQry; import com.xunhong.erp.turbo.api.biz.dto.qry.CostItemPageQry; import com.xunhong.erp.turbo.api.biz.dto.qry.CostItemShowQry; @@ -29,4 +29,4 @@ public interface CostItemServiceI { void destroy(CostItemDestroyCmd costItemDestroyCmd); void drag(CostItemDragCmd costItemDragCmd); -} \ No newline at end of file +}