donglang 4 сар өмнө
parent
commit
c43848e2f8

+ 10 - 2
iot-platform-manager/src/main/java/com/platform/api/controller/WeighbridgeController.java

@@ -61,7 +61,15 @@ public class WeighbridgeController {
      */
     @Operation(summary = "车牌验证", description = "用于验证车牌是否合法,允许上磅")
     @PostMapping("/validateLicensePlate")
-    public LicensePlateValidateResponse validateLicensePlate(@RequestParam @Validated LicensePlateValidateRequest request, @RequestHeader("uuid") String uuid) {
-        return weighbridgeRecordManage.handleValidateLicensePlate(request, uuid);
+    public LicensePlateValidateResponse validateLicensePlate(@RequestParam("licensePlate") String licensePlate,
+                                                             @RequestParam("weighbridgeCode") String weighbridgeCode,
+                                                             @RequestParam("timestamp") Integer timestamp,
+                                                             @RequestHeader("uuid") String uuid) {
+
+        LicensePlateValidateRequest request = new LicensePlateValidateRequest();
+        request.setLicensePlate(licensePlate);
+        request.setWeighbridgeCode(weighbridgeCode);
+        request.setTimestamp(timestamp);
+        return weighbridgeRecordManage.handleValidateLicensePlate(request);
     }
 }

+ 7 - 0
iot-platform-manager/src/main/java/com/platform/api/request/LicensePlateValidateRequest.java

@@ -1,5 +1,6 @@
 package com.platform.api.request;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -31,4 +32,10 @@ public class LicensePlateValidateRequest {
     @NotNull(message = "时间不能为空")
     private Integer timestamp;
 
+    /**
+     * 厂商来源标识
+     */
+    @NotNull(message = "厂商来源标识不能为空")
+    private String uuid;
+
 }

+ 2 - 2
iot-platform-manager/src/main/java/com/platform/manage/WeighbridgeRecordManage.java

@@ -158,11 +158,11 @@ public class WeighbridgeRecordManage {
      * @param request 地磅上报请求参数
      * @return 是否保存成功
      */
-    public LicensePlateValidateResponse handleValidateLicensePlate(LicensePlateValidateRequest request, String uuid) {
+    public LicensePlateValidateResponse handleValidateLicensePlate(LicensePlateValidateRequest request) {
         log.info("车牌验证, 车牌:{}, 地磅编号:{}, 时间戳:{}", request.getLicensePlate(), request.getWeighbridgeCode(), request.getTimestamp());
         LicensePlateValidateResponse response = new LicensePlateValidateResponse();
         //查询车牌是不存在
-        ValidateLicensePlate validateLicensePlate = validateLicensePlateService.queryByLicensePlate(request.getLicensePlate(), uuid);
+        ValidateLicensePlate validateLicensePlate = validateLicensePlateService.queryByLicensePlate(request.getLicensePlate(), request.getUuid());
         if (validateLicensePlate != null) {
             response.setStatus(Boolean.TRUE);
             response.setCode(200);

+ 1 - 1
iot-platform-manager/src/main/java/com/platform/service/impl/ValidateLicensePlateServiceImpl.java

@@ -20,7 +20,7 @@ public class ValidateLicensePlateServiceImpl extends ServiceImpl<ValidateLicense
     public ValidateLicensePlate queryByLicensePlate(String licensePlate, String uuid) {
         return getOne(Wrappers.<ValidateLicensePlate>lambdaQuery()
                 .eq(ValidateLicensePlate::getLicensePlate, licensePlate)
-                .eq(ValidateLicensePlate::getUuid, licensePlate)
+                .eq(ValidateLicensePlate::getUuid, uuid)
                 .eq(ValidateLicensePlate::getStatus, 0)
                 .last("limit 1"));
     }