优化

lastleg-service/src/main/java/com/baiyue/lastleg/inventory/query/controller/InventoryQueryController.java

@@ -87,28 +87,6 @@ public class InventoryQueryController {
         return ApiResponse.success(service.ledgers(platformScope(user, customerId), query));
     }
 
-    @GetMapping(value = BASE_PATH + "/balances/export", produces = "text/csv")
-    @PreAuthorize("hasAuthority('" + OverseasPermissions.INVENTORY_EXPORT + "')")
-    @Operation(summary = "Export filtered inbound-order inventory as UTF-8 CSV", description = "Uses the same non-zero balance filter and frozen receiving warehouse snapshots as the page API. Required authority: " + OverseasPermissions.INVENTORY_EXPORT)
-    public ResponseEntity<byte[]> exportBalances(
-        @AuthenticationPrincipal AuthenticatedUser user,
-        @RequestParam(required = false) String customerId,
-        @Valid InventoryQueryRequests.BalanceQuery query) {
-        String scope = platformScope(user, customerId);
-        return csv(service.exportBalances(scope, query), "inventory-balances.csv");
-    }
-
-    @GetMapping(value = BASE_PATH + "/ledger/export", produces = "text/csv")
-    @PreAuthorize("hasAuthority('" + OverseasPermissions.INVENTORY_EXPORT + "')")
-    @Operation(summary = "Export filtered inventory movements as UTF-8 CSV", description = "Required authority: " + OverseasPermissions.INVENTORY_EXPORT)
-    public ResponseEntity<byte[]> exportLedgers(
-        @AuthenticationPrincipal AuthenticatedUser user,
-        @RequestParam(required = false) String customerId,
-        @Valid InventoryQueryRequests.LedgerQuery query) {
-        String scope = platformScope(user, customerId);
-        return csv(service.exportLedgers(scope, query), "inventory-ledger.csv");
-    }
-
     private static ResponseEntity<byte[]> csv(byte[] content, String filename) {
         return ResponseEntity.ok()
             .contentType(new MediaType("text", "csv", StandardCharsets.UTF_8))

lastleg-service/src/main/java/com/baiyue/lastleg/inventory/query/dto/InventoryQueryRequests.java

@@ -50,7 +50,8 @@ public final class InventoryQueryRequests {
         String skuCode,
         String warehouseLocationCode,
         LocalDateTime occurredFrom,
-        LocalDateTime occurredTo
+        LocalDateTime occurredTo,
+        String customerName
     ) {
         public LedgerQuery {
             if (page == null || page == 0) page = 1L;

lastleg-service/src/main/java/com/baiyue/lastleg/inventory/query/mapper/InventoryQueryMapper.java

@@ -91,6 +91,9 @@ public interface InventoryQueryMapper {
     long countBalances(@Param("customerId") String customerId,
                        @Param("q") InventoryQueryRequests.BalanceQuery query);
 
+    @Select("<script>SELECT COUNT(*) FROM ll_inventory_balance" + BALANCE_FILTER + "</script>")
+    long countSourceBalances(@Param("customerId") String customerId, @Param("q") InventoryQueryRequests.BalanceQuery query);
+
     @Select("<script>SELECT * FROM ll_inventory_balance" + BALANCE_FILTER +
         " ORDER BY updated_at DESC,id DESC LIMIT #{limit} OFFSET #{offset}</script>")
     List<InventoryBalance> sourceBalances(@Param("customerId") String customerId,
@@ -148,6 +151,7 @@ public interface InventoryQueryMapper {
     InventoryBalance visibleBalance(@Param("balanceId") long balanceId);
 
     String LEDGER_FILTER = " WHERE 1=1" +
+        "<if test='q.customerName != null and q.customerName != &quot;&quot;'> AND customer_name LIKE CONCAT('%',#{q.customerName},'%')</if>" +
         "<if test='customerId != null and customerId != \"\"'> AND customer_id=#{customerId}</if>" +
         "<if test='q.overseasWarehouseId != null and q.overseasWarehouseId != \"\"'> AND overseas_warehouse_id=#{q.overseasWarehouseId}</if>" +
         "<if test='q.destinationWarehouseCode != null and q.destinationWarehouseCode != \"\"'> AND destination_warehouse_code=#{q.destinationWarehouseCode}</if>" +

lastleg-service/src/main/java/com/baiyue/lastleg/inventory/query/service/InventoryQueryService.java

@@ -89,65 +89,12 @@ public class InventoryQueryService {
         return page(records, query.page(), query.size(), total);
     }
 
-    public byte[] exportBalances(String customerId, InventoryQueryRequests.BalanceQuery query) {
-        try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {
-            writeBalancesCsv(customerId, query, output);
-            return output.toByteArray();
-        } catch (IOException e) { throw new IllegalStateException("Unable to export inventory balances", e); }
-    }
-
-    public void writeBalancesCsv(String customerId, InventoryQueryRequests.BalanceQuery query, OutputStream output)
-        throws IOException {
+    public PageResult<InventoryBalanceView> exportBalancePage(String customerId, InventoryQueryRequests.BalanceQuery query) {
         validateStatus(query.inventoryStatus(), BALANCE_STATUSES);
-        output.write(("\uFEFFcustomerId,customerName,overseasWarehouseCode,overseasWarehouseName,destinationWarehouseCode," +
-            "destinationWarehouseName,inboundOrderId,inboundOrderNo,inboundCode,skuCode,productNameZh,productNameEn,totalPackages,availablePackages," +
-            "holdPackages,allocatedPackages,pickedPackages,inTransitPackages,receivingPackages,procurementPackages\r\n").getBytes(StandardCharsets.UTF_8));
-        final int batchSize = 1000;
-        long offset = 0;
-        while (true) {
-            List<InventoryBalanceView> batch = mapper.sourceBalances(customerId, query, offset, batchSize).stream().map(this::balanceView).toList();
-            if (batch.isEmpty()) break;
-            for (InventoryBalanceView v : batch) output.write((
-            String.join(",", csv(v.customerId()), csv(v.customerName()), csv(v.overseasWarehouseCode()), csv(v.overseasWarehouseName()),
-                csv(v.destinationWarehouseCode()), csv(v.destinationWarehouseName()), csv(v.inboundOrderId()),
-                csv(v.inboundOrderNo()), csv(v.inboundCode()), csv(v.skuCode()), csv(v.productNameZh()), csv(v.productNameEn()),
-                csv(v.totalPackages()), csv(v.availablePackages()), csv(v.holdPackages()), csv(v.allocatedPackages()),
-                csv(v.pickedPackages()), csv(v.inTransitPackages()), csv(v.receivingPackages()),
-                csv(v.procurementPackages())) + "\r\n").getBytes(StandardCharsets.UTF_8));
-            output.flush();
-            if (batch.size() < batchSize) break;
-            offset += batchSize;
-        }
-    }
-
-    public byte[] exportLedgers(String customerId, InventoryQueryRequests.LedgerQuery query) {
-        try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {
-            writeLedgersCsv(customerId, query, output);
-            return output.toByteArray();
-        } catch (IOException e) { throw new IllegalStateException("Unable to export inventory ledger", e); }
-    }
-
-    public void writeLedgersCsv(String customerId, InventoryQueryRequests.LedgerQuery query, OutputStream output)
-        throws IOException {
-        validateDateRange(query);
-        output.write(("\uFEFFoccurredAt,customerId,customerName,overseasWarehouseId,destinationWarehouseCode,inboundOrderId,inboundOrderNo," +
-            "inboundCode,businessType,businessOrderNo,outboundOrderNo,palletNo,batchNo,statusFrom,statusTo," +
-            "beforePackages,deltaPackages,afterPackages,operatorId,remark\r\n").getBytes(StandardCharsets.UTF_8));
-        final int batchSize = 1000;
-        long offset = 0;
-        while (true) {
-            List<InventoryLedgerView> batch = mapper.ledgers(customerId, query, offset, batchSize).stream().map(this::ledgerView).toList();
-            if (batch.isEmpty()) break;
-            for (InventoryLedgerView v : batch) output.write((
-            String.join(",", csv(v.occurredAt()), csv(v.customerId()), csv(v.customerName()), csv(v.overseasWarehouseId()),
-                csv(v.destinationWarehouseCode()), csv(v.inboundOrderId()), csv(v.inboundOrderNo()), csv(v.inboundCode()),
-                csv(v.businessType()), csv(v.businessOrderNo()), csv(v.outboundOrderNo()), csv(v.palletNo()), csv(v.batchNo()),
-                csv(v.statusFrom()), csv(v.statusTo()), csv(v.beforePackages()), csv(v.deltaPackages()),
-                csv(v.afterPackages()), csv(v.operatorId()), csv(v.remark())) + "\r\n").getBytes(StandardCharsets.UTF_8));
-            output.flush();
-            if (batch.size() < batchSize) break;
-            offset += batchSize;
-        }
+        long total = mapper.countSourceBalances(customerId, query);
+        var rows = mapper.sourceBalances(customerId, query, offset(query.page(), query.size()), query.size())
+            .stream().map(this::balanceView).toList();
+        return page(rows, query.page(), query.size(), total);
     }
 
     private InventoryBalanceView balanceView(InventoryBalance value) {
@@ -220,10 +167,4 @@ public class InventoryQueryService {
         return new PageResult<>(records, page, size, total, pages);
     }
 
-    private static String csv(Object value) {
-        if (value == null) return "";
-        String text = String.valueOf(value);
-        if (!text.isEmpty() && "=+-@".indexOf(text.charAt(0)) >= 0) text = "'" + text;
-        return '"' + text.replace("\"", "\"\"") + '"';
-    }
 }