From 8d715678dd10e75f9909e92dd75b5dec10677c90 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Thu, 21 Aug 2025 09:15:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B4=E6=B2=B3=E6=96=B0=E7=A3=85=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java | 4 ++--
 .../cowr/local/ssjygl/devicectrl/device/CameraController.java | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java
index 7a53dcb..ef894ba 100644
--- a/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java
+++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java
@@ -400,8 +400,8 @@ public class DeviceThread extends Thread {
             return;
         }
 
-        // 永安砂站只有一个磅，同进同出，出入口共用道闸
-        if (CliCacheData.SUP.getId() == 4 && Enums.WhichEnum.C01.name().equals(which)) {
+        // 巴河两个砂站只有一个磅，同进同出，出入口共用道闸
+        if ((CliCacheData.SUP.getId() == 4 || CliCacheData.SUP.getId() == 5) && Enums.WhichEnum.C01.name().equals(which)) {
             which = Enums.WhichEnum.R01.name();
 
             if (num == 1) {
diff --git a/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/CameraController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/CameraController.java
index b187efc..9b1db1b 100644
--- a/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/CameraController.java
+++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/CameraController.java
@@ -120,7 +120,6 @@ public class CameraController extends Controller {
             String romid  = null;
             String sn     = null;
             String ipaddr = null;
-
             if (json.containsKey("KeepAlive")) { // 心跳数据
                 JSONObject keepAlive = json.getJSONObject("KeepAlive");
 
@@ -169,7 +168,7 @@ public class CameraController extends Controller {
                 boolean ret = ImageUtil.generateImage(imageFile, jpgFile);
 
                 if (!ret) {
-                    log.error("数据解析失败：%s", str);
+//                    log.error("数据解析失败：%s", str);
                     renderJson(new JSONObject().fluentPut("ret", false).fluentPut("msg", "解析图片失败"));
                     return;
                 }
@@ -180,7 +179,6 @@ public class CameraController extends Controller {
                 Camera camera = Config.deviceThread.getCameraByIp(ipaddr);
 
                 log.debug("识别成功：%s, %s", license, jpgFile);
-
                 if (camera != null) {
                     camera.getController().onLicenseResult(license, jpgFile); // 识别到图片，回调
                 } else {