Merge branch 'dev_20260131' of http://git.sckaiwu.cn/service/iot-platform into dev_20260131

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

@@ -42,8 +42,8 @@ public class WeighbridgeController {
     @Operation(summary = "车牌验证", description = "用于验证车牌是否合法，允许上磅")
     @PostMapping("/validateLicensePlate")
     public LicensePlateValidateResponse validateLicensePlate(
-            @Parameter(description = "车牌号", required = true) @RequestParam("licensePlate") String licensePlate,
-            @Parameter(description = "厂商来源标识", required = true) @RequestHeader("uuid") String uuid
+            @Parameter(description = "车牌号") @RequestParam("licensePlate") String licensePlate,
+            @Parameter(description = "厂商来源标识") @RequestHeader("uuid") String uuid
     ) {
         LicensePlateValidateRequest request = new LicensePlateValidateRequest();
         request.setLicensePlate(licensePlate);

iot-platform-manager/src/main/java/com/platform/api/manager/WeighbridgeRecordManage.java

@@ -237,7 +237,7 @@ public class WeighbridgeRecordManage {
             validateLicensePlate = validateLicensePlateService.queryByLicensePlate(request.getLicensePlate(), request.getUuid());
         } catch (Exception e) {
             log.error("车牌验证失败，请重新识别或联系管理员", e);
-            throw new IotException(ErrorCodeEnum.SYSTEM_ERROR, "车牌验证失败，请重新识别或联系管理员: " + e.getMessage());
+            return getValidateLicensePlateError(response);
         }
 
         if (validateLicensePlate != null) {
@@ -251,18 +251,24 @@ public class WeighbridgeRecordManage {
             response.getData().setScreen_message("车牌验证成功");
             response.getData().setVoice_message("车牌验证成功");
             response.getData().setWarning(null);
+            return response;
         } else {
-            log.info("车牌验证失败");
-            response.setStatus(Boolean.FALSE);
-            response.setCode(400);
-            response.setMessage("车牌验证异常");
-
-            response.setData(new LicensePlateValidateResponse.Data());
-            response.getData().setTimestamp(System.currentTimeMillis());
-            response.getData().setScreen_message("车牌验证失败");
-            response.getData().setVoice_message("车牌验证失败");
-            response.getData().setWarning(null);
+            return getValidateLicensePlateError(response);
         }
+
+    }
+
+    private LicensePlateValidateResponse getValidateLicensePlateError(LicensePlateValidateResponse response) {
+        log.info("车牌验证失败");
+        response.setStatus(Boolean.FALSE);
+        response.setCode(400);
+        response.setMessage("车牌验证异常");
+
+        response.setData(new LicensePlateValidateResponse.Data());
+        response.getData().setTimestamp(System.currentTimeMillis());
+        response.getData().setScreen_message("车牌验证失败");
+        response.getData().setVoice_message("车牌验证失败");
+        response.getData().setWarning(null);
         return response;
     }