From f824b3f4c9e8394a310a9cab34d37d30230e007d Mon Sep 17 00:00:00 2001 From: xjm Date: Tue, 26 Dec 2023 09:50:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=84=E7=A0=82=E7=AB=99=E8=BF=90=E8=BE=93?= =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1=E8=A1=A8=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9,=20=E8=BF=9B=E7=AB=99=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=96=B0=E5=A2=9E=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cowr/ssjygl/stat/sale/OrderStatService.java | 4 ++-- .../local/ssjygl/devicectrl/controllers/Controller.java | 3 +++ .../local/ssjygl/devicectrl/controllers/InController.java | 6 +++++- .../cowr/local/ssjygl/transport/TransportSyncService.java | 7 +++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java index e65cb2c..8a3263f 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java @@ -2406,13 +2406,13 @@ public class OrderStatService { if (invoice_type != null) { if (sale_type != null && (sale_type == 0 || sale_type == 1)) { - customer_sale_list = Db.find(sql, sale_type, stm, etm, invoice_type, sale_type, stm, etm, invoice_type, sale_type, stm, etm, invoice_type); + customer_sale_list = Db.find(sql, sale_type, invoice_type,stm, etm,sale_type, sale_type,invoice_type, stm, etm, sale_type, sale_type,invoice_type, stm, etm, sale_type); } else { customer_sale_list = Db.find(sql, stm, etm, invoice_type, stm, etm, invoice_type, stm, etm, invoice_type); } } else { if (sale_type != null && (sale_type == 0 || sale_type == 1)) { - customer_sale_list = Db.find(sql, sale_type, stm, etm, sale_type, stm, etm, sale_type, stm, etm); + customer_sale_list = Db.find(sql, sale_type, stm, etm, sale_type, sale_type, stm, etm, sale_type,sale_type, stm, etm, sale_type); } else { customer_sale_list = Db.find(sql, stm, etm, stm, etm, stm, etm); } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/Controller.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/Controller.java index b83518e..9bd6dd1 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/Controller.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/Controller.java @@ -1,5 +1,6 @@ package com.cowr.local.ssjygl.devicectrl.controllers; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.cowr.local.ssjygl.devicectrl.device.AbsScale; import com.cowr.local.ssjygl.devicectrl.device.Camera; @@ -104,6 +105,7 @@ public abstract class Controller implements Runnable { return; } if (licenseQueue.size() > 0) { + log.debug("【%s】 当前车辆队列", JSON.toJSONString(licenseQueue)); return; } long st = System.currentTimeMillis(); @@ -116,6 +118,7 @@ public abstract class Controller implements Runnable { licenseQueue.drainTo(l); licenseQueue.add(new LicenseJPGPair(license, file)); licenseQueue.addAll(l); + log.debug("【%s】 当前车辆队列", JSON.toJSONString(licenseQueue)); } else { licenseQueue.add(new LicenseJPGPair(license, file)); } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/InController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/InController.java index 483a689..ebd725b 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/InController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/InController.java @@ -1,5 +1,6 @@ package com.cowr.local.ssjygl.devicectrl.controllers; +import com.alibaba.fastjson.JSON; import com.cowr.local.ssjygl.devicectrl.device.AbsScale; import com.cowr.local.ssjygl.devicectrl.device.Camera; import com.cowr.local.ssjygl.devicectrl.device.LEDThread; @@ -101,6 +102,8 @@ public class InController extends Controller implements Runnable { // 识别结果加入队列后，在上传之前，需要判断是否有同进同出锁 if (getCtrllock() != null) { + log.debug("【%s】 getCtrllock", JSON.toJSONString(getCtrllock())); + if (getCtrllock().isLocked()) { try { while (getCtrllock().isLocked()) { @@ -118,8 +121,9 @@ public class InController extends Controller implements Runnable { } try { - + log.debug("【%s】 PostLicenseResult", JSON.toJSONString(pair)); PostLicenseResult postLicenseResult = postLicense(CliCacheData.SUP.getId(), pair.license, pair.file, getWhich()); + log.debug("【%s】 PostLicenseResult", JSON.toJSONString(postLicenseResult)); if (postLicenseResult.isUploaded()) { if (postLicenseResult.getLicense() == null) { diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java index 455658d..1ae73f1 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java @@ -127,22 +127,29 @@ public class TransportSyncService { if (!Enums.CtrlFlowEnum.isValid(which)) { deleteImg(file); // 数据无效时，删除图片 + log.debug("删除图片"); return result; } if (which.startsWith(Enums.CtrlFlowEnum.R.name())) { in(supermarket_id, result, file, which); + log.debug("进场成功"); } else if (which.startsWith(Enums.CtrlFlowEnum.C.name())) { out(supermarket_id, result, file, which); + log.debug("出场成功"); } else if (which.startsWith(Enums.CtrlFlowEnum.T.name())) { common(supermarket_id, result, file, which); + log.debug("common() 成功"); } if (result.isAccess()) { Config.socketio.pubRefreshInSup(TransportDeviceService.me.real()); + log.debug("推送成功"); } Config.socketio.pubRefreshReal(TransportDeviceService.me.real()); + log.debug("pubRefreshReal() 推送成功"); + result.setUploaded(true); return result;