donglang před 1 týdnem
rodič
revize
1870bcdd54

+ 16 - 1
iot-platform-manager/src/main/java/com/platform/api/controller/WeighbridgeV2Controller.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.util.Arrays;
 
 
 
 
 /**
 /**
@@ -118,8 +119,22 @@ public class WeighbridgeV2Controller {
                     name = SIGNATURE,
                     name = SIGNATURE,
                     in = ParameterIn.HEADER)
                     in = ParameterIn.HEADER)
             @RequestHeader(value = SIGNATURE, required = false)  String printReceiptAuthSn,
             @RequestHeader(value = SIGNATURE, required = false)  String printReceiptAuthSn,
-            @ModelAttribute WeighbridgeRecordReq req
+            @Parameter(description = "车牌号") @RequestParam("licensePlate") String licensePlate,
+            @Parameter(description = "地磅编号") @RequestParam("weighbridgeCode") String weighbridgeCode,
+            @Parameter(description = "称重重量(吨)") @RequestParam("grossWeight") String grossWeight,
+            @Parameter(description = "时间戳(秒或毫秒)") @RequestParam("timestamp") String timestamp,
+            @Parameter(description = "处理标签") @RequestParam(value = "tag", required = false) String tag,
+            @Parameter(description = "车辆照片") @RequestParam(value = "images[]", required = false) MultipartFile[] images
+
     ) {
     ) {
+        WeighbridgeRecordReq req = new WeighbridgeRecordReq();
+        req.setLicensePlate(licensePlate);
+        req.setWeighbridgeCode(weighbridgeCode);
+        req.setGrossWeight(grossWeight);
+        req.setTimestamp(timestamp);
+        req.setTag(tag);
+        req.setImages(images);
+
         log.info("[地磅过磅数据上报]开始地磅过磅数据上报,入参参数:{}", JSON.toJSONString(req));
         log.info("[地磅过磅数据上报]开始地磅过磅数据上报,入参参数:{}", JSON.toJSONString(req));
         assertPrintReceiptAuthorized(printReceiptAuthSn);
         assertPrintReceiptAuthorized(printReceiptAuthSn);
         // 构建请求对象
         // 构建请求对象

+ 5 - 1
iot-platform-manager/src/main/java/com/platform/external/request/WeighbridgeRecordReq.java

@@ -3,6 +3,8 @@ package com.platform.external.request;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
 import java.util.List;
 import java.util.List;
 
 
 @Data
 @Data
@@ -36,5 +38,7 @@ public class WeighbridgeRecordReq {
 
 
     // 【非必填】车辆照片列表
     // 【非必填】车辆照片列表
     @Schema(description = "车辆照片", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @Schema(description = "车辆照片", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    private List<String> images;
+//    private List<String> images;
+
+    private MultipartFile[] images;
 }
 }