xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

石畈站更换地磅，修复PLC配置问题

dev
lisai17@sina.com 2021-03-07 02:04:54 +08:00
parent a00ef0189f
commit f3839eb798
4 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java
View File

@ -195,7 +195,10 @@ public class DeviceThread extends Thread {
scale = new YaoHuaScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port")); scale = new YaoHuaScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port"));
} else if (supermarket_id == 4) { // 石畈用了两个不一样的表头 } else if (supermarket_id == 4) { // 石畈用了两个不一样的表头
if (scaleconf.getIntValue("port") == 10001) { // 根据现场实际接线配置 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 { } else {
scale = new XiShuiScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port")); scale = new XiShuiScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port"));
} }
@ -306,7 +309,25 @@ public class DeviceThread extends Thread {
scale.connect(); 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 { public void print(String printerId, File file) throws IOException {

4
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/InController.java
View File

@ -33,13 +33,13 @@ public class InController extends Controller implements Runnable {
setRod1Up("rodIn1Up"); setRod1Up("rodIn1Up");
} }
if (StrKit.isBlank(rod2Up)) { if (StrKit.isBlank(rod2Up)) {
setRod1Up("rodIn2Up"); setRod2Up("rodIn2Up");
} }
if (StrKit.isBlank(sensor1Reset)) { if (StrKit.isBlank(sensor1Reset)) {
setSensor1Reset("sensorIn1Reset"); setSensor1Reset("sensorIn1Reset");
} }
if (StrKit.isBlank(sensor2Reset)) { if (StrKit.isBlank(sensor2Reset)) {
setSensor1Reset("sensorIn2Reset"); setSensor2Reset("sensorIn2Reset");
} }
if (StrKit.isBlank(sensor1)) { if (StrKit.isBlank(sensor1)) {
setSensor1("sensorIn1"); setSensor1("sensorIn1");

2
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java
View File

@ -47,7 +47,7 @@ public class OutController extends Controller implements Runnable {
setSensor1("sensorOut1"); setSensor1("sensorOut1");
} }
if (StrKit.isBlank(sensor2)) { if (StrKit.isBlank(sensor2)) {
setSensor1("sensorOut2"); setSensor2("sensorOut2");
} }
} }

2
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java
View File

@ -95,7 +95,7 @@ public class Config extends JFinalConfig {
public static DeviceThread deviceThread = new DeviceThread(); public static DeviceThread deviceThread = new DeviceThread();
public static SocketIOService socketio = null; public static SocketIOService socketio = null;
private static boolean client_run = true; private static boolean client_run = true;
public static final String CLINET_VERSION = "20210221"; public static final String CLINET_VERSION = "20210307";
public static String getRootPath() { public static String getRootPath() {
return PathKit.getWebRootPath() return PathKit.getWebRootPath()