java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
ouyangxq
2026-08-27 11:07:57 +08:00
parent b4c46280de
commit 4612181ab0
19 changed files with 424 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
warehouse/src/main/java/com/baiyue/warehouse/controller/InternalPalletController.java
+14 -6
View File
@@ -1,6 +1,7 @@
package com.baiyue.warehouse.controller;
import com.baiyue.common.core.api.ApiResponse;
import com.baiyue.common.core.api.PageResult;
import com.baiyue.common.core.api.ResultCode;
import com.baiyue.common.core.exception.BizException;
import com.baiyue.warehouse.dto.PalletRequests;
@@ -10,6 +11,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.Resource;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Size;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -21,7 +24,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.List;
/** 内部托盘主数据只读接口。 */
@Validated
@@ -41,7 +43,8 @@ public class InternalPalletController {
}
@GetMapping("/{palletId}/snapshot")
@Operation(summary = "查询托盘只读快照", description = "固定按平台公共作用域校验仓库归属，不返回动态状态或可用性")
@Operation(summary = "查询当前可用于称重的托盘快照",
description = "固定按平台公共作用域校验启用中的国内仓归属；托盘必须当前未删除")
public ApiResponse<PalletRequests.Snapshot> snapshot(
@RequestHeader(value = "X-Internal-Service-Token", required = false) String token,
@PathVariable @Min(1) long palletId, @RequestParam @Min(1) long warehouseId) {
@@ -50,12 +53,17 @@ public class InternalPalletController {
}
@GetMapping("/snapshots")
@Operation(summary = "查询仓库托盘快照列表", description = "返回该仓全部未删除托盘主数据，不按动态状态或占用过滤")
public ApiResponse<List<PalletRequests.Snapshot>> snapshots(
@Operation(summary = "分页查询当前可用于称重的托盘候选",
description = "固定按平台公共作用域、启用中的国内仓和当前未删除资格过滤；托盘可复用，不按预占或占用过滤")
public ApiResponse<PageResult<PalletRequests.Snapshot>> snapshots(
@RequestHeader(value = "X-Internal-Service-Token", required = false) String token,
@RequestParam @Min(1) long warehouseId) {
@RequestParam @Min(1) long warehouseId,
@RequestParam(defaultValue = "1") @Min(1) long page,
@RequestParam(defaultValue = "20") @Min(1) @Max(100) long size,
@RequestParam(required = false) @Size(max = 50) String keyword) {
verify(token);
return ApiResponse.success(service.snapshots(0L, warehouseId));
return ApiResponse.success(service.snapshotCandidates(
0L, warehouseId, new PalletRequests.SnapshotPageQuery(page, size, keyword)));
}
private void verify(String token) {
warehouse/src/main/java/com/baiyue/warehouse/dto/PalletRequests.java
+17
View File
@@ -84,4 +84,21 @@ public final class PalletRequests {
@Schema(description = "皮重，单位kg") BigDecimal tareWeightKg
) {
}
@Schema(name = "InternalPalletCandidatePageQuery", description = "称重托盘候选分页查询")
public record SnapshotPageQuery(
@Min(1) @Schema(description = "页码", defaultValue = "1") long page,
@Min(1) @Max(100) @Schema(description = "每页条数", defaultValue = "20", maximum = "100") long size,
@Size(max = 50) @Schema(description = "关键词；匹配托盘编码或类型") String keyword
) {
public SnapshotPageQuery {
if (page == 0) {
page = 1;
}
if (size == 0) {
size = 20;
}
keyword = keyword == null ? null : keyword.trim();
}
}
}
warehouse/src/main/java/com/baiyue/warehouse/repository/PalletRepository.java
+9 -3
View File
@@ -46,12 +46,18 @@ public class PalletRepository {
return mapper.selectIncludingDeleted(tenantId, warehouseId, id);
}
public List<PalletEntity> findAllByWarehouse(long tenantId, long warehouseId) {
return mapper.selectList(new LambdaQueryWrapper<PalletEntity>()
public PageResult<PalletEntity> candidatePage(long tenantId, long warehouseId,
PalletRequests.SnapshotPageQuery query) {
LambdaQueryWrapper<PalletEntity> wrapper = new LambdaQueryWrapper<PalletEntity>()
.eq(PalletEntity::getTenantId, tenantId)
.eq(PalletEntity::getWarehouseId, warehouseId)
.and(StringUtils.hasText(query.keyword()), nested -> nested
.like(PalletEntity::getPalletCode, query.keyword())
.or()
.like(PalletEntity::getPalletType, query.keyword()))
.orderByAsc(PalletEntity::getPalletCode)
.orderByAsc(PalletEntity::getId));
.orderByAsc(PalletEntity::getId);
return PageResult.from(mapper.selectPage(new Page<>(query.page(), query.size()), wrapper));
}
public boolean existsCode(long tenantId, long warehouseId, String code, Long excludedId) {
warehouse/src/main/java/com/baiyue/warehouse/service/PalletApplicationService.java
+7 -4
View File
@@ -125,16 +125,19 @@ public class PalletApplicationService {
}
public PalletRequests.Snapshot snapshot(long tenantId, long warehouseId, long palletId) {
requireWarehouse(tenantId, warehouseId, true);
PalletEntity entity = owned(tenantId, warehouseId, palletId);
return new PalletRequests.Snapshot(entity.getId(), entity.getPalletCode(), entity.getPalletType(),
entity.getCapacityCbm(), entity.getWeightKg());
}
public List<PalletRequests.Snapshot> snapshots(long tenantId, long warehouseId) {
requireWarehouse(tenantId, warehouseId, false);
return repository.findAllByWarehouse(tenantId, warehouseId).stream()
public PageResult<PalletRequests.Snapshot> snapshotCandidates(
long tenantId, long warehouseId, PalletRequests.SnapshotPageQuery query) {
requireWarehouse(tenantId, warehouseId, true);
PageResult<PalletEntity> source = repository.candidatePage(tenantId, warehouseId, query);
return new PageResult<>(source.records().stream()
.map(entity -> new PalletRequests.Snapshot(entity.getId(), entity.getPalletCode(), entity.getPalletType(),
entity.getCapacityCbm(), entity.getWeightKg()))
.toList();
.toList(), source.page(), source.size(), source.total(), source.pages());
}
}
warehouse/src/main/resources/openapi/pallet-v1.yaml
+21 -9
View File
@@ -2,12 +2,12 @@ openapi: 3.0.3
info:
title: Warehouse Pallet API
version: 1.0.0
description: 托盘是可复用标识和称重主数据，不承载 AVAILABLE、RESERVED 或 OCCUPIED 动态状态。
description: 托盘是可复用标识和称重主数据；称重候选按当前启用国内仓、同仓归属和未删除资格过滤，不按预占或占用过滤。
paths:
/internal/warehouse/v1/pallets/{palletId}/snapshot:
get:
summary: 查询单条托盘主数据快照
description: 固定使用平台公共作用域 tenant_id=0，并按 warehouseId 校验归属；不返回状态或可用性。
summary: 查询单条当前称重可用托盘快照
description: 固定使用平台公共作用域 tenant_id=0，并校验启用国内仓、warehouseId 归属和当前未删除资格。
parameters:
- $ref: '#/components/parameters/InternalToken'
- { in: path, name: palletId, required: true, schema: { type: integer, format: int64, minimum: 1 } }
@@ -18,15 +18,18 @@ paths:
content: { application/json: { schema: { $ref: '#/components/schemas/PalletSnapshotResponse' } } }
/internal/warehouse/v1/pallets/snapshots:
get:
summary: 查询仓库全部托盘主数据快照
description: 固定使用平台公共作用域 tenant_id=0，返回该仓全部未删除主数据，不按状态或占用过滤。
summary: 分页查询仓库当前称重托盘候选
description: 固定使用平台公共作用域 tenant_id=0，按启用国内仓、同仓归属和当前未删除资格过滤；托盘可复用，不按预占或占用过滤。
parameters:
- $ref: '#/components/parameters/InternalToken'
- { in: query, name: warehouseId, required: true, schema: { type: integer, format: int64, minimum: 1 } }
- { in: query, name: page, required: false, schema: { type: integer, format: int64, minimum: 1, default: 1 } }
- { in: query, name: size, required: false, schema: { type: integer, format: int64, minimum: 1, maximum: 100, default: 20 } }
- { in: query, name: keyword, required: false, description: 匹配托盘编码或类型, schema: { type: string, maxLength: 50 } }
responses:
'200':
description: 业务响应
content: { application/json: { schema: { $ref: '#/components/schemas/PalletSnapshotListResponse' } } }
content: { application/json: { schema: { $ref: '#/components/schemas/PalletSnapshotPageResponse' } } }
components:
parameters:
InternalToken:
@@ -61,12 +64,21 @@ components:
required: [data]
properties:
data: { $ref: '#/components/schemas/PalletSnapshot' }
PalletSnapshotListResponse:
PalletSnapshotPageResponse:
allOf:
- { $ref: '#/components/schemas/ApiEnvelope' }
- type: object
required: [data]
properties:
data:
type: array
items: { $ref: '#/components/schemas/PalletSnapshot' }
type: object
required: [records, page, size, total, pages]
properties:
records:
type: array
maxItems: 100
items: { $ref: '#/components/schemas/PalletSnapshot' }
page: { type: integer, format: int64, minimum: 1 }
size: { type: integer, format: int64, minimum: 1, maximum: 100 }
total: { type: integer, format: int64, minimum: 0 }
pages: { type: integer, format: int64, minimum: 0 }