From b9ce32de751e3c02f653a93ebce5cfad5323b64d Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Tue, 22 Sep 2020 21:34:03 +0800 Subject: [PATCH] . --- .../devicectrl/common/DeviceThread.java | 4 ++++ .../devicectrl/controllers/InController.java | 20 +++++++++++++++++-- .../devicectrl/controllers/OutController.java | 20 +++++++++++++++++-- .../local/ssjygl/devicectrl/device/PLC.java | 6 +++--- .../devicectrl/printer/CellAddresses.java | 4 ++-- .../com/cowr/local/ssjygl/main/Config.java | 2 +- .../src/main/resources/dev/config.properties | 2 +- .../src/main/resources/dev/db.properties | 2 +- .../src/main/resources/prod/config.properties | 2 +- 9 files changed, 49 insertions(+), 13 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 95b291a..3e9e544 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 @@ -303,6 +303,8 @@ public class DeviceThread extends Thread { public boolean cmdResetFlow(String which) { for (Controller controller : controllers) { + log.error("查找重置流程 %s", controller.getWhich()); + if (controller.getWhich().equals(which)) { controller.setResetFlow(true); controller.resetCurrentLicense(); @@ -311,6 +313,8 @@ public class DeviceThread extends Thread { } } + log.error("未找到对应流程 %s", which); + return false; } 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 dace67d..6b1c749 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 @@ -62,6 +62,8 @@ public class InController extends Controller implements Runnable { // 出现错位等情况时，需要重置流程，重新开始 if (getResetFlow()) { + log.debug("%s 【%s】 重置流程", getWhich(), getCurrentLicense()); + try { getPlc().write(plcSensor1Reset()); // 重置地感状态 } catch (IOException e) { @@ -69,8 +71,10 @@ public class InController extends Controller implements Runnable { } setResetFlow(false); // 重置流程 resetCurrentLicense(); // 重置当前流程中的车辆 - log.debug("%s 【%s】 重置流程", getWhich(), pair.license); - continue; + + // 2020-09-22 + // 如果流程处理完成后，已经再等待车牌的时候点击了重置流程，实质上是没有进重置的 + // 所以这里将旧的重置，但是流程继续 } // 将识别的到的车牌加入服务端队列 @@ -271,6 +275,18 @@ public class InController extends Controller implements Runnable { resetCurrentLicense(); log.debug("%s 【%s】流程处理完毕", getWhich(), pair.license); + + if (getResetFlow()) { + try { + getPlc().write("sensorIn2Reset"); + } catch (IOException e) { + log.debug("%s 【%s】 重置地感线圈状态失败", getWhich(), pair.license); + log.error(e.getMessage(), e); + } + setResetFlow(false); + resetCurrentLicense(); + continue; + } } catch (Exception e) { log.error(e.getMessage(), e); } 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 b00de9b..aa6124c 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 @@ -62,6 +62,8 @@ public class OutController extends Controller implements Runnable { // 出现错位等情况时，需要重置流程，重新开始 if (getResetFlow()) { + log.debug("%s 【%s】 重置流程", getWhich(), getCurrentLicense()); + try { getPlc().write(plcSensor1Reset()); // 重置地感状态 } catch (IOException e) { @@ -69,8 +71,10 @@ public class OutController extends Controller implements Runnable { } setResetFlow(false); // 重置流程 resetCurrentLicense(); // 重置当前流程中的车辆 - log.debug("%s 【%s】 重置流程", getWhich(), pair.license); - continue; + + // 2020-09-22 + // 如果流程处理完成后，已经再等待车牌的时候点击了重置流程，实质上是没有进重置的 + // 所以这里将旧的重置，但是流程继续 } // 将识别的到的车牌加入服务端队列 @@ -270,6 +274,18 @@ public class OutController extends Controller implements Runnable { resetCurrentLicense(); log.debug("%s 【%s】流程处理完毕", getWhich(), pair.license); + + if (getResetFlow()) { + try { + getPlc().write("sensorOut2Reset"); + } catch (IOException e) { + log.debug("%s 【%s】 重置地感线圈状态失败", getWhich(), pair.license); + log.error(e.getMessage(), e); + } + setResetFlow(false); + resetCurrentLicense(); + continue; + } } catch (Exception e) { log.error(e.getMessage(), e); } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/PLC.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/PLC.java index 6022de0..2cfa02e 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/PLC.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/PLC.java @@ -98,7 +98,7 @@ public class PLC extends Device { try { boolean f = this.socket != null && this.socket.isConnected() && !this.socket.isClosed(); if (!f) { - log.debug("PLC 未连接或者连接已断开, %s", f); + log.debug("PLC 未连接或者连接已断开, %s %s", this.getId(), this.getIp()); return false; } plcWrite("ping", (byte) 1, presetRead); @@ -256,10 +256,10 @@ public class PLC extends Device { public static void main(String[] args) { try { - PLC plc = new PLC("_plc", "192.168.20.20", 502, com.cowr.local.ssjygl.devicectrl.common.DeviceThread.defaultAddressTable); + PLC plc = new PLC("_plc", "192.168.20.21", 502, com.cowr.local.ssjygl.devicectrl.common.DeviceThread.defaultAddressTable); plc.connect(); plc.isConnected(); - plc.write("rodIn1Down"); + plc.write("rodOut2Down"); // plc.write("rodOut2Up"); // plc.write("sensorIn2Reset"); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/CellAddresses.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/CellAddresses.java index f1c8eee..54f470f 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/CellAddresses.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/CellAddresses.java @@ -70,7 +70,7 @@ public class CellAddresses { // 车牌号 public static final CellAddress truckLicense = makeCellAddress("m11"); // 机打发票号码 - public static final CellAddress invoiceCode = makeCellAddress("o7"); +// public static final CellAddress invoiceCode = makeCellAddress("o7"); public static Map addrMap = new HashMap<>(); @@ -104,7 +104,7 @@ public class CellAddresses { addrMap.put("remark", remark); addrMap.put("drawer", drawer); addrMap.put("truck_license", truckLicense); - addrMap.put("invoice_code", invoiceCode); +// addrMap.put("invoice_code", invoiceCode); // addrMap.put("haulerCo", haulerCo); } 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 da25e4a..02baad9 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 @@ -381,7 +381,7 @@ public class Config extends JFinalConfig { // 这边将 生产 环境运行目录写死，只有在这个目录下运行时，才算 生产 环境 String path = PathKit.getWebRootPath(); log.debug("WebRootPath:", path); - String linux_dev_dir = "/home/a/ssjy_xsx"; + String linux_dev_dir = "/home/a/ssjy_xsx/ssjygl-xsx-local-release"; if (linux_dev_dir.equals(path)) { ENV = "prod"; diff --git a/ssjygl-xsx-local/src/main/resources/dev/config.properties b/ssjygl-xsx-local/src/main/resources/dev/config.properties index b339445..8161eb6 100644 --- a/ssjygl-xsx-local/src/main/resources/dev/config.properties +++ b/ssjygl-xsx-local/src/main/resources/dev/config.properties @@ -10,7 +10,7 @@ socketserver.port=21002 socketio.port=12002 #当前部署本地程序的砂站id -current.supermarket_id=1 +current.supermarket_id=6 #打印用到的配置信息 print.vendor=浠水县长投环保有限公司 diff --git a/ssjygl-xsx-local/src/main/resources/dev/db.properties b/ssjygl-xsx-local/src/main/resources/dev/db.properties index d1f34a1..ff03ab6 100644 --- a/ssjygl-xsx-local/src/main/resources/dev/db.properties +++ b/ssjygl-xsx-local/src/main/resources/dev/db.properties @@ -4,7 +4,7 @@ jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsx user=dev_ssjy_xsx password=Ssjy_xs_890 -#jdbcUrl=jdbc:mysql://localhost:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true +#jdbcUrl=jdbc:mysql://192.168.20.2:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true #user=root #password=Ssjy_xsx_890 diff --git a/ssjygl-xsx-local/src/main/resources/prod/config.properties b/ssjygl-xsx-local/src/main/resources/prod/config.properties index 6bf7a66..7d52ba4 100644 --- a/ssjygl-xsx-local/src/main/resources/prod/config.properties +++ b/ssjygl-xsx-local/src/main/resources/prod/config.properties @@ -10,7 +10,7 @@ socketserver.port=21002 socketio.port=12002 #当前部署本地程序的砂站id -current.supermarket_id=2 +current.supermarket_id=6 #打印用到的配置信息 print.vendor=浠水县长投环保有限公司