root/yongYuJiaJu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
gengby
2023-02-18 16:24:19 +08:00
parent 78aff07101
commit 2e70333818
3 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paint_conveyor/PaintConveyorDeviceDriver.java
View File

@@ -134,7 +134,7 @@ public class PaintConveyorDeviceDriver extends AbstractOpcDeviceDriver implement
message = "有报警"; message = "有报警";
//无报警 //无报警
} else { } else {
System.out.println("进入到else。。。。。"); System.out.println("进入到else。。。。。设备号:" + device_code + ",mode = " + mode);
this.setIsonline(true); this.setIsonline(true);
this.setIserror(false); this.setIserror(false);
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();
@@ -155,6 +155,7 @@ public class PaintConveyorDeviceDriver extends AbstractOpcDeviceDriver implement
requireSucess = true; requireSucess = true;
} }
} }
break;
case 6: case 6:
//下料位满拖申请 //下料位满拖申请
logServer.deviceExecuteLog(this.device_code, "", "", "下料位满拖申请,此时:move == " + move + "，请求标记为:" + requireSucess); logServer.deviceExecuteLog(this.device_code, "", "", "下料位满拖申请,此时:move == " + move + "，请求标记为:" + requireSucess);
@@ -168,7 +169,9 @@ public class PaintConveyorDeviceDriver extends AbstractOpcDeviceDriver implement
requireSucess = true; requireSucess = true;
} }
} }
break;
case 7: case 7:
logServer.deviceExecuteLog(this.device_code, "", "", "上料位满拖申请,此时:move == " + move + "，请求标记为:" + requireSucess);
//上料位满拖申请 //上料位满拖申请
if (move == 0 && !requireSucess) { if (move == 0 && !requireSucess) {
//向LMS发送请求，发送起点 //向LMS发送请求，发送起点
@@ -182,6 +185,7 @@ public class PaintConveyorDeviceDriver extends AbstractOpcDeviceDriver implement
} }
break; break;
case 8: case 8:
logServer.deviceExecuteLog(this.device_code, "", "", "上料位空托入库,此时:move == " + move + "，请求标记为:" + requireSucess);
if (move == 1 && !requireSucess) { if (move == 1 && !requireSucess) {
//上料位空托入库 //上料位空托入库
jo.put("type", "5"); jo.put("type", "5");
@@ -195,6 +199,7 @@ public class PaintConveyorDeviceDriver extends AbstractOpcDeviceDriver implement
break; break;
} }
case 9: case 9:
logServer.deviceExecuteLog(this.device_code, "", "", "强制满垛入库,此时:move == " + move + "，请求标记为:" + requireSucess);
if (move == 1 && !requireSucess) { if (move == 1 && !requireSucess) {
//强制满垛入库 //强制满垛入库
jo.put("type", "5"); jo.put("type", "5");

6
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/ExecutableDeviceDriver.java
View File

@@ -6,11 +6,13 @@ public interface ExecutableDeviceDriver extends DeviceDriver {
default void executeAuto() { default void executeAuto() {
try { try {
this.execute(); this.execute();
} catch (Throwable var6) { } catch (Exception e) {
String message = "线程调用异常:" + var6.getMessage(); String message = "线程调用异常:" + e.getMessage();
e.printStackTrace();
} finally { } finally {
} }
} }
void execute() throws Exception; void execute() throws Exception;

2
acs/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -144,7 +144,7 @@ https://juejin.cn/post/6844903775631572999
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>
<appender-ref ref="lokiAppender" /> <appender-ref ref="lokiAppender" />
</logger> </logger>
<logger name="org.nl.acs.log.service.impl.DeviceExecuteLogServiceImpl" level="ERROR" additivity="false"> <logger name="org.nl.acs.log.service.impl.DeviceExecuteLogServiceImpl" level="INFO" additivity="false">
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>
<appender-ref ref="lokiAppender" /> <appender-ref ref="lokiAppender" />
</logger> </logger>