From f3839eb798ed0c2a1f1055426b25d7edef497076 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Sun, 7 Mar 2021 02:04:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=B3=E7=95=88=E7=AB=99=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E5=9C=B0=E7=A3=85=EF=BC=8C=E4=BF=AE=E5=A4=8DPLC=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devicectrl/common/DeviceThread.java | 25 +++++++++++++++++-- .../devicectrl/controllers/InController.java | 4 +-- .../devicectrl/controllers/OutController.java | 2 +- .../com/cowr/local/ssjygl/main/Config.java | 2 +- 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java index 68bd03b..c250416 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java @@ -195,7 +195,10 @@ public class DeviceThread extends Thread { scale = new YaoHuaScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port")); } else if (supermarket_id == 4) { // 石畈用了两个不一样的表头 if (scaleconf.getIntValue("port") == 10001) { // 根据现场实际接线配置 - scale = new YaoHuaScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port")); +// scale = new YaoHuaScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port")); + + // 2021-03-07 原来地方1号传感器故障，让二期地磅厂家更换传感器 + scale = new DingsongScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port")); } else { scale = new XiShuiScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port")); } @@ -306,7 +309,25 @@ public class DeviceThread extends Thread { scale.connect(); } - return scale.weigh15(); + try { + return scale.weigh15(); + }catch (Exception e){ + log.error(e.getMessage(), e); + + try { + scale.disconnect(); + Thread.sleep(500); + scale.connect(); + } catch (Exception e1) { + log.error(e1.getMessage(), e1); + } + + if (!scale.isConnected()) { + return null; + } + + return scale.weigh15(); + } } public void print(String printerId, File file) throws IOException { 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 cacf78a..483a689 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 @@ -33,13 +33,13 @@ public class InController extends Controller implements Runnable { setRod1Up("rodIn1Up"); } if (StrKit.isBlank(rod2Up)) { - setRod1Up("rodIn2Up"); + setRod2Up("rodIn2Up"); } if (StrKit.isBlank(sensor1Reset)) { setSensor1Reset("sensorIn1Reset"); } if (StrKit.isBlank(sensor2Reset)) { - setSensor1Reset("sensorIn2Reset"); + setSensor2Reset("sensorIn2Reset"); } if (StrKit.isBlank(sensor1)) { setSensor1("sensorIn1"); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java index 8061d18..fb0d734 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java @@ -47,7 +47,7 @@ public class OutController extends Controller implements Runnable { setSensor1("sensorOut1"); } if (StrKit.isBlank(sensor2)) { - setSensor1("sensorOut2"); + setSensor2("sensorOut2"); } } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java index 62d29e4..2e5f524 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java @@ -95,7 +95,7 @@ public class Config extends JFinalConfig { public static DeviceThread deviceThread = new DeviceThread(); public static SocketIOService socketio = null; private static boolean client_run = true; - public static final String CLINET_VERSION = "20210221"; + public static final String CLINET_VERSION = "20210307"; public static String getRootPath() { return PathKit.getWebRootPath()