From 71333f8fbfc321bced0d7a3916e996de7fdac284 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 15 八月 2020 11:17:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 2 +-
src/main/java/com/zy/asrs/controller/ConsoleController.java | 7 ++++++-
src/main/webapp/views/console.html | 2 +-
src/main/java/com/zy/Boot.java | 7 +++++++
src/main/java/com/zy/core/thread/CrnThread.java | 31 +++++++++++++++++--------------
src/main/java/com/zy/core/thread/DevpThread.java | 2 +-
src/main/resources/application.yml | 2 +-
src/main/java/com/zy/core/ServerBootstrap.java | 3 +--
8 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/Boot.java b/src/main/java/com/zy/Boot.java
index 6f1f7db..a32bf07 100644
--- a/src/main/java/com/zy/Boot.java
+++ b/src/main/java/com/zy/Boot.java
@@ -1,6 +1,8 @@
package com.zy;
+import com.core.common.SpringUtils;
import com.zy.common.utils.RandomValidateCodeUtil;
+import com.zy.core.ServerBootstrap;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -11,6 +13,11 @@
public static void main(String[] args) {
RandomValidateCodeUtil.init();
SpringApplication.run(Boot.class, args);
+ new Thread(()-> {
+ ServerBootstrap serverBootstrap = SpringUtils.getBean(ServerBootstrap.class);
+ serverBootstrap.init();
+ }).start();
+
}
// @Override
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 7d08ab0..983c5da 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -23,6 +23,7 @@
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.CrnThread;
import com.zy.core.thread.DevpThread;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,6 +37,7 @@
* 涓绘帶鍥炬帴鍙�
* Created by vincent on 2020-06-01
*/
+@Slf4j
@RestController
@RequestMapping("/console")
public class ConsoleController {
@@ -107,6 +109,10 @@
for (CrnSlave crn : slaveProperties.getCrn()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ if (crnThread == null) {
+ log.error("{}鍙峰爢鍨涙満杩炴帴澶辫触", crn.getId());
+ continue;
+ }
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
CrnLatestDataVo vo = new CrnLatestDataVo();
vo.setCrnId(crn.getId()); // 鍫嗗灈鏈虹紪鍙�
@@ -166,7 +172,6 @@
if (basDevp == null) {
return R.error("鏁版嵁搴撶淮鎶ゅ紓甯�");
}
-
vo.setSiteId(siteId); // 绔欑偣缂栧彿
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 5797ad0..02129a1 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -12,7 +12,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
/**
@@ -28,7 +27,7 @@
private MainProcess mainProcess;
- @PostConstruct
+// @PostConstruct
public void init(){
// 鍒濆鍖栨秷鎭槦鍒�
initMq();
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 1687b35..2380348 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -28,12 +28,12 @@
public BarcodeThread(Slave slave) {
this.slave = slave;
- connect();
}
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
+ connect();
while (true) {
try {
write("T".getBytes(), "T".length());
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 7b4ef4c..d36adba 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -30,12 +30,12 @@
public CrnThread(CrnSlave slave) {
this.slave = slave;
- this.connect();
}
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
+ this.connect();
while (true) {
try {
int step = 1;
@@ -177,22 +177,25 @@
/*****************************************************************************************/
public static void main(String[] args) {
CrnSlave slave = new CrnSlave();
+ slave.setIp("192.168.2.9");
+ slave.setRack(1);
+ slave.setSlot(0);
CrnThread crnThread = new CrnThread(slave);
crnThread.readStatus();
System.out.println(JSON.toJSONString(crnThread.crnProtocol));
- // 鍐�
- CrnCommand command = new CrnCommand();
- command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
- command.setTaskNo((short) 0); // 宸ヤ綔鍙�
- command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
- command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
- command.setSourcePosX((short)0); // 婧愬簱浣嶆帓
- command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
- command.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
- command.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
- crnThread.write(command);
+// // 鍐�
+// CrnCommand command = new CrnCommand();
+// command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+// command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
+// command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+// command.setSourcePosX((short)0); // 婧愬簱浣嶆帓
+// command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
+// command.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
+// command.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺�
+// command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
+// command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
+// crnThread.write(command);
}
diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index c89b569..be6e10b 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -31,12 +31,12 @@
public DevpThread(Slave slave) {
this.slave = slave;
- connect();
}
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
+ connect();
while (true) {
try {
int step = 1;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 89c53d4..4ee86cb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -38,7 +38,7 @@
# 鍫嗗灈鏈�
crn[0]:
id: 1
- ip: 192.168.6.10
+ ip: 192.168.6.9
port: 102
rack: 0
slot: 2
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 18983af..840a747 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -405,7 +405,7 @@
getCrnInfo();
getSystemRunningStatus();
getBarcodeInfo()
- }, 500);
+ }, 1000);
setInterval(function () {
getSitesInfo();
}, 3000);
--
Gitblit v1.9.1