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

巴河新磅调试修改

dev
wany 2025-08-21 09:15:16 +08:00
parent 3f0e44b12e
commit 8d715678dd
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java
View File

@ -400,8 +400,8 @@ public class DeviceThread extends Thread {
return; 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(); which = Enums.WhichEnum.R01.name();
if (num == 1) { if (num == 1) {

4
ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/CameraController.java
View File

@ -120,7 +120,6 @@ public class CameraController extends Controller {
String romid = null; String romid = null;
String sn = null; String sn = null;
String ipaddr = null; String ipaddr = null;
if (json.containsKey("KeepAlive")) { // 心跳数据 if (json.containsKey("KeepAlive")) { // 心跳数据
JSONObject keepAlive = json.getJSONObject("KeepAlive"); JSONObject keepAlive = json.getJSONObject("KeepAlive");
@ -169,7 +168,7 @@ public class CameraController extends Controller {
boolean ret = ImageUtil.generateImage(imageFile, jpgFile); boolean ret = ImageUtil.generateImage(imageFile, jpgFile);
if (!ret) { if (!ret) {
log.error("数据解析失败：%s", str); // log.error("数据解析失败：%s", str);
renderJson(new JSONObject().fluentPut("ret", false).fluentPut("msg", "解析图片失败")); renderJson(new JSONObject().fluentPut("ret", false).fluentPut("msg", "解析图片失败"));
return; return;
} }
@ -180,7 +179,6 @@ public class CameraController extends Controller {
Camera camera = Config.deviceThread.getCameraByIp(ipaddr); Camera camera = Config.deviceThread.getCameraByIp(ipaddr);
log.debug("识别成功：%s, %s", license, jpgFile); log.debug("识别成功：%s, %s", license, jpgFile);
if (camera != null) { if (camera != null) {
camera.getController().onLicenseResult(license, jpgFile); // 识别到图片，回调 camera.getController().onLicenseResult(license, jpgFile); // 识别到图片，回调
} else { } else {