From 6914066d08d3aeee4f1092668d6a125ae21a4def Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 26 十月 2024 11:43:02 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 11 ++++++-----
src/main/resources/logback-spring.xml | 8 ++++----
src/main/java/com/zy/asrs/controller/MonitorController.java | 2 +-
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 15 ++++++++++++---
src/main/resources/application.yml | 18 +++++++++---------
5 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 35e0eae..a09a096 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -270,7 +270,7 @@
public R monitorLedError(@RequestParam("ledId") Integer ledId) {
String errorMsg = "";
for (LedSlave slave : slaveProperties.getLed()) {
- if (slave.getStaArr().contains(ledId)) {
+ if (slave.getId().equals(ledId)) {
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
if (null != ledThread) {
errorMsg = ledThread.getErrorMsg().toString();
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 6a7a9fb..5a82ad9 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -310,16 +310,17 @@
staProtocol.setWorkNo((short) 9999);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- if (!result) {
- throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
- }
-
// led 寮傚父鏄剧ず
if (ledThread != null) {
String errorMsg = jsonObject.getString("msg");
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
}
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ if (!result) {
+ throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+ }
+
+
}
} catch (Exception e) {
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 3a35ec5..76aa674 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -373,7 +373,6 @@
log.error("鍐欏叆宸ヤ綔鍙峰懡浠ゅけ璐ャ�傚爢鍨涙満plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
}
}
- Thread.sleep(200);
if (!staNoFlag) {
write1 = siemensS7Net.Write("DB100." + (index * 6 + 4), staProtocol.getStaNo()); // 鐩爣绔�
if (write1.IsSuccess) {
@@ -401,6 +400,7 @@
if (wrkNoFlag && staNoFlag) {
break;
}
+ Thread.sleep(200);
} while (writeCount < 20);
if (!write.IsSuccess) {
@@ -470,10 +470,19 @@
}
public static void main(String[] args) {
+ int i=1;
+ do {
+ System.out.println(i);
+ i++;
+ if (i==4){
+ break;
+ }
+
+ }while (i<6);
StaProtocol staProtocol = new StaProtocol();
staProtocol.setWorkNo((short) 6071);
- short i = (short) 6071;
- System.out.println(staProtocol.getWorkNo().equals(i));
+ //short i = (short) 6071;
+ //System.out.println(staProtocol.getWorkNo().equals(i));
// System.out.println(staNos1.indexOf(129));
// System.out.println(staNos1.size());
// for (int i = 0; i < staNos1.size(); i++) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1949e48..9cc07b5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -26,7 +26,7 @@
# field-strategy: 0
logging:
- path: /stock/out/@pom.build.finalName@/logs
+ path: stock/out/@pom.build.finalName@/logs
super:
pwd: xltys1995
@@ -184,7 +184,7 @@
ip: 10.10.10.248
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 108
+ staArr: 101
# LED3
led[2]:
id: 3
@@ -192,13 +192,13 @@
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 117
- # LED4
- led[3]:
- id: 4
- ip: 10.10.10.246
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 126
+# # LED4
+# led[3]:
+# id: 4
+# ip: 10.10.10.246
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 126
# # LED5
# led[4]:
# id: 5
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 9d48072..3cb7892 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -24,9 +24,9 @@
<!--info绾у埆-->
<appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${LOG_PATH}/${datetime}/info.log</file>
+ <file>${LOG_PATH}/info.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <FileNamePattern>${LOG_PATH}/${datetime}/info_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+ <FileNamePattern>${LOG_PATH}/info_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
<maxHistory>3600</maxHistory>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>10MB</maxFileSize>
@@ -43,9 +43,9 @@
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>ERROR</level>
</filter>
- <file>${LOG_PATH}/${datetime}/error.log</file>
+ <file>${LOG_PATH}/error.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <FileNamePattern>${LOG_PATH}/${datetime}/error_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+ <FileNamePattern>${LOG_PATH}/error_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
<maxHistory>3600</maxHistory>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>10MB</maxFileSize>
--
Gitblit v1.9.1