From 4fa61294a6f15871f14980dff2781afb1e485709 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 12 九月 2024 14:53:32 +0800
Subject: [PATCH] #fs
---
src/main/java/com/zy/asrs/controller/RgvController.java | 2
src/main/webapp/views/index.html | 14 +
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 601 ------------------------------------------------------
3 files changed, 14 insertions(+), 603 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 07d6cb9..a13e3e2 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -345,7 +345,7 @@
public R ringThroughRgv(){
List<RingThroughParam> result = new ArrayList<>();
// for (RgvSlave rgv : slaveProperties.getRgv()) {
- for (int i = 1;i<100;i++) {
+ for (int i = 1;i<10;i++) {
// // 鑾峰彇RGV淇℃伅
// RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
// if (rgvThread == null) {
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 23ec040..d2c5ffb 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -183,32 +183,6 @@
case 2:
write((StaProtocol)task.getData());
break;
- // 鍐欐暟鎹� ID+鐩爣绔� 鐮佸灈瀹屾垚 缁欒緭閫佺嚎鍐欎换鍔″畬鎴�
- case 3:
- write3((StaProtocol)task.getData());
- break;
- // 鍐欐暟鎹� ID+鐩爣绔� 鐮佸灈瀹屾垚 缁欒緭閫佺嚎鍐欎换鍔″畬鎴愬浣�
- case 4:
- write4((StaProtocol)task.getData());
- break;
- case 5:
- write3((StaProtocol)task.getData());
- Thread.sleep(400);
- write4((StaProtocol)task.getData());
- Thread.sleep(400);
- write((StaProtocol)task.getData());
- break;
- case 9:
- write9((StaProtocol)task.getData());
- break;
- case 10:
- write10((StaProtocol)task.getData());
- break;
- case 11:
- write11((StaProtocol)task.getData());
- break;
- case 99:
- write99((Integer) task.getData());
default:
break;
}
@@ -245,8 +219,6 @@
* 璇诲彇鐘舵�� ====> 鏁村潡plc
*/
private void read() throws InterruptedException {
-// // 鏇存柊鍏ュ嚭搴撴ā寮�
-// updateIoMode();
ArrayList<Integer> staNos = getStaNo();
int staNoSize = staNos.size();
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize*8));
@@ -378,548 +350,6 @@
}
}
-
- /**
- * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏� 鐮佸灈瀹屾垚 缁欒緭閫佺嚎鍐欎换鍔″畬鎴�
- */
- private void write3(StaProtocol staProtocol) throws InterruptedException {
- if (null == staProtocol) {
- return;
- }
- Integer siteId = staProtocol.getSiteId();
- Integer index =0;
- switch (siteId){
- case 607:
- index=0;
- break;
- default:
- return;
- }
-
- OperateResult write = null;
- //浠诲姟涓嬪彂娆℃暟
- int writeCount = 0;
- do {
- write = siemensS7Net.Write("DB100.1872", (short) 1); // 浠诲姟瀹屾垚
- if(write.IsSuccess){
- writeCount=6;
- }else {
- writeCount++;
- log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
- }
- }while (writeCount<5);
-
- if (!write.IsSuccess) {
- staProtocol = station.get(staProtocol.getSiteId());
- if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
- staProtocol.setPakMk(true);
- }
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
- log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
- } else {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
- log.info("杈撻�佺嚎鍛戒护涓嬪彂鐮佸灈瀹屾垚 缁欒緭閫佺嚎鍐欎换鍔″畬鎴� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
- }
- }
-
- private void write4(StaProtocol staProtocol) throws InterruptedException {
- if (null == staProtocol) {
- return;
- }
- Integer siteId = staProtocol.getSiteId();
- Integer index =0;
- switch (siteId){
- case 607:
- index=0;
- break;
- default:
- return;
- }
-
- OperateResult write = null;
- //浠诲姟涓嬪彂娆℃暟
- int writeCount = 0;
- do {
- write = siemensS7Net.Write("DB100.1872", (short) 0); // 浠诲姟瀹屾垚澶嶄綅
- if(write.IsSuccess){
- writeCount=6;
- } else {
- writeCount++;
- log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
- }
- }while (writeCount<5);
-
- if (!write.IsSuccess) {
- staProtocol = station.get(staProtocol.getSiteId());
- if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
- staProtocol.setPakMk(true);
- }
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
- log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
- } else {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
- log.info("杈撻�佺嚎鍛戒护涓嬪彂瀹屾垚 缁欒緭閫佸浣� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSONString(staProtocol));
- }
- }
-
- /**
- * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
- */
- private void write11(StaProtocol staProtocol) throws InterruptedException {
- if (null == staProtocol) {
- return;
- }
- News.error("RGV鍐欏叆鍛戒护"+JSON.toJSONString(staProtocol));
-
- boolean rgv6 = staProtocol.isRGV6();
- OperateResult result1 = null;
- OperateResult result2 = null;
- String resultV1 = "";
- String resultV2 = "";
- String resultV3 = "";
- short resultS1 = 1;
- short resultS2 = 2;
- switch (staProtocol.getSiteId()){
- case 623:
- resultV1 = "DB100.1830";
- resultV2 = "DB100.1826";
- resultV3 = "DB100.1828";
- break;
- case 624:
- resultV1 = "DB100.1842";
- resultV2 = "DB100.1838";
- resultV3 = "DB100.1840";
- break;
- case 625:
- resultV1 = "DB100.1854";
- resultV2 = "DB100.1850";
- resultV3 = "DB100.1852";
- break;
- case 626:
- resultV1 = "DB100.1866";
- resultV2 = "DB100.1862";
- resultV3 = "DB100.1864";
- break;
- default:
- return;
- }
- siemensS7Net.Write(resultV2, (short) 0);
- siemensS7Net.Write(resultV3, (short) 0);
- result1 = siemensS7Net.Write(resultV1, resultS1);
-
- //纭寲缃愪换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
- try {
- Thread.sleep(200);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
-
- int writeCount = 1;
- do {
- try{
- if(!result1.IsSuccess){
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
- result1 = siemensS7Net.Write(resultV1, resultS1);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read(resultV1, (short) 2);
- if (resultRead1.IsSuccess) {
- short status = siemensS7Net.getByteTransform().TransInt16(resultRead1.Content, 0);
- if (status == 1){
- break;
- } else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
- result1 = siemensS7Net.Write(resultV1, resultS1);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- } else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
- result1 = siemensS7Net.Write(resultV1, resultS1);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- }catch (Exception e){
- log.error("鍐欏叆RGV鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
- }
- writeCount++;
- } while (writeCount<6);
-
- result2 = siemensS7Net.Write(resultV1, resultS2);
-
- //纭寲缃愪换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
- try {
- Thread.sleep(200);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
-
- writeCount = 1;
- do {
- try{
- if(!result2.IsSuccess){
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
- result2 = siemensS7Net.Write(resultV1, resultS2);
-
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read(resultV1, (short) 2);
- if (resultRead1.IsSuccess) {
- short status = siemensS7Net.getByteTransform().TransInt16(resultRead1.Content, 0);
- if (status == resultS2){
- break;
- } else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
- result2 = siemensS7Net.Write(resultV1, resultS2);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- } else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
- result2 = siemensS7Net.Write(resultV1, resultS2);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- }catch (Exception e){
- log.error("鍐欏叆RGV鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
- }
- writeCount++;
- } while (writeCount<6);
- }
-
- private void write10(StaProtocol staProtocol) throws InterruptedException {
- if (null == staProtocol) {
- return;
- }
- News.error("RGV鍐欏叆鍛戒护"+JSON.toJSONString(staProtocol));
-
- boolean rgv4 = staProtocol.isRGV4();
- boolean rgv5 = staProtocol.isRGV5();
- OperateResult result1 = null;
- OperateResult result2 = null;
- String resultV1 = "";
- String resultV2 = "";
- short resultS1 = 1;
- short resultS2 = 2;
- if (rgv4){
- switch (staProtocol.getSiteId()){
- case 623:
- resultV1 = "DB100.1826";
- resultV2 = "DB100.1830";
- break;
- case 624:
- resultV1 = "DB100.1838";
- resultV2 = "DB100.1842";
- break;
- case 625:
- resultV1 = "DB100.1850";
- resultV2 = "DB100.1854";
- break;
- case 626:
- resultV1 = "DB100.1862";
- resultV2 = "DB100.1866";
- break;
- default:
- return;
- }
- } else if (rgv5){
- switch (staProtocol.getSiteId()){
- case 623:
- resultV1 = "DB100.1828";
- resultV2 = "DB100.1830";
- break;
- case 624:
- resultV1 = "DB100.1840";
- resultV2 = "DB100.1842";
- break;
- case 625:
- resultV1 = "DB100.1852";
- resultV2 = "DB100.1854";
- break;
- case 626:
- resultV1 = "DB100.1864";
- resultV2 = "DB100.1866";
- break;
- default:
- return;
- }
- }
- siemensS7Net.Write(resultV2, (short) 0);
- result1 = siemensS7Net.Write(resultV1, resultS1);
- //纭寲缃愪换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
- try {
- Thread.sleep(200);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- int writeCount = 1;
- do {
- try{
- if(!result1.IsSuccess){
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
- result1 = siemensS7Net.Write(resultV1, resultS1);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read(resultV1, (short) 2);
- if (resultRead1.IsSuccess) {
-// boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRead1.Content, 0, 1);
- short statusR1 = siemensS7Net.getByteTransform().TransInt16(resultRead1.Content, 0);
- if (statusR1 == resultS1){
- break;
- } else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
- result1 = siemensS7Net.Write(resultV1, resultS1);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- } else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
- result1 = siemensS7Net.Write(resultV1, resultS1);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- }catch (Exception e){
- log.error("鍐欏叆RGV鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
- }
- writeCount++;
- } while (writeCount<6);
-
-
- result2 = siemensS7Net.Write(resultV1, resultS2);
-
- writeCount = 1;
- do {
- try{
- if(!result2.IsSuccess){
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
- result2 = siemensS7Net.Write(resultV1, resultS2);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read(resultV1, (short) 2);
- if (resultRead1.IsSuccess) {
-// boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRead1.Content, 0, 1);
- short statusR1 = siemensS7Net.getByteTransform().TransInt16(resultRead1.Content, 0);
- if (statusR1 == resultS2){
- break;
- } else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
- result2 = siemensS7Net.Write(resultV1, resultS2);
-
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- } else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
- result2 = siemensS7Net.Write(resultV1, resultS2);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- }catch (Exception e){
- log.error("鍐欏叆RGV鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
- }
- writeCount++;
- } while (writeCount<6);
- }
-
- private void write9(StaProtocol staProtocol) throws InterruptedException {
- if (null == staProtocol) {
- return;
- }
- short resultS1 = staProtocol.getEndRow();
- OperateResult result1 = null;
- OperateResult result2 = null;
- String resultV1 = "";
- String resultV2 = "";
- News.error("RGV鍐欏叆鍛戒护"+JSON.toJSONString(staProtocol));
-
- switch (staProtocol.getSiteId()){
- case 623:
- resultV1 = "DB100.1824";
- resultV2 = "DB100.1848";
- break;
- case 624:
- resultV1 = "DB100.1836";
- resultV2 = "DB100.1860";
- break;
- case 625:
- resultV1 = "DB100.1848";
- resultV2 = "DB100.1824";
- break;
- case 626:
- resultV1 = "DB100.1860";
- resultV2 = "DB100.1836";
- break;
- default:
- return;
- }
- result1 = siemensS7Net.Write(resultV1, resultS1);
- result2 = siemensS7Net.Write(resultV2, resultS1);
- //纭寲缃愪换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
- try {
- Thread.sleep(200);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
-
- int writeCount = 1;
- do {
- try{
- if(!result1.IsSuccess){
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
- result1 = siemensS7Net.Write(resultV1, resultS1);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read(resultV1, (short) 2);
- if (resultRead1.IsSuccess) {
- short transInt16 = siemensS7Net.getByteTransform().TransInt16(resultRead1.Content, 0);
- if (transInt16 == resultS1){
- break;
- } else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
- result1 = siemensS7Net.Write(resultV1, resultS1);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- } else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
- result1 = siemensS7Net.Write(resultV1, resultS1);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- }catch (Exception e){
- log.error("鍐欏叆RGV鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
- }
- writeCount++;
- } while (writeCount<6);
-
- writeCount = 1;
- do {
- try{
- if(!result2.IsSuccess){
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
- result2 = siemensS7Net.Write(resultV2, resultS1);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- OperateResultExOne<byte[]> resultRead2 = siemensS7Net.Read(resultV2, (short) 2);
- if (resultRead2.IsSuccess) {
- short transInt16 = siemensS7Net.getByteTransform().TransInt16(resultRead2.Content, 0);
- if (transInt16 == resultS1){
- break;
- } else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
- result2 = siemensS7Net.Write(resultV2, resultS1);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- } else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
- result2 = siemensS7Net.Write(resultV2, resultS1);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- }catch (Exception e){
- log.error("鍐欏叆RGV鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
- }
- writeCount++;
- } while (writeCount<6);
-
- if (!result1.IsSuccess) {
- staProtocol = station.get(staProtocol.getSiteId());
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSONString(staProtocol)));
- log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSONString(staProtocol));
- } else {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(staProtocol)));
- log.info("杈撻�佺嚎鍛戒护涓嬪彂瀹屾垚 缁欒緭閫佸浣� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSONString(staProtocol));
- }
- }
-
- private void write99(Integer devNo) throws InterruptedException {
- String resultV1 = "";
- switch (devNo){
- case 1:
- resultV1 = "DB500.0.0";
- break;
- case 2:
- resultV1 = "DB500.0.1";
- break;
- case 3:
- resultV1 = "DB500.0.2";
- break;
- default:
- return;
- }
- OperateResult result = siemensS7Net.Write(resultV1, true);
- Integer writeCount = 0;
- do {
- try{
- if(!result.IsSuccess){
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
- result = siemensS7Net.Write(resultV1, true);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read("resultV1", (short) 1);
- if (resultRead1.IsSuccess) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRead1.Content, 0, 1);
- if (status[devNo-1]){
- break;
- } else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
- result = siemensS7Net.Write(resultV1, true);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- } else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
- result = siemensS7Net.Write(resultV1, true);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- }catch (Exception e){
- log.error("鍐欏叆鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
- }
- writeCount++;
- } while (writeCount<6);
- }
-
-
- // 鏇存柊鍏ュ嚭搴撴ā寮�
- private void updateIoMode() throws InterruptedException {
- if (this.ioModeOf2F != IoModeType.NONE) {
- if (!siemensS7Net.Write("DB100.180", this.ioModeOf2F.id).IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
- log.error("鍐欏叆杈撻�佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
- }
- }
- }
-
/**
* 蹇冭烦
*/
@@ -952,37 +382,8 @@
}
public static void main(String[] args) {
- System.out.println(staNos1.indexOf(129));
- System.out.println(staNos1.size());
- for (int i = 0; i<staNos1.size(); i++) {
-// System.out.println(i*2);
-// System.out.println(i*2 + 200);
-// System.out.println(i);
- }
- int index = staNos1.indexOf(128);
- System.out.println(index*2);
- System.out.println(index*2 + 200);
+
}
-// public static void main(String[] args) throws Exception {
-// DevpSlave slave = new DevpSlave();
-// slave.setIp("192.168.2.125");
-// SiemensDevpThread devpThread = new SiemensDevpThread(slave);
-// devpThread.connect();
-// devpThread.read();
-// // 鍐�
-// StaProtocol staProtocol = devpThread.getStation().get(1);
-// staProtocol.setWorkNo((short) 232);
-// staProtocol.setStaNo((short) 6);
-// staProtocol.setAutoing(true);
-// staProtocol.setEmptyMk(true);
-// staProtocol.setInEnable(true);
-// devpThread.write(staProtocol);
-// System.out.println("----------------------------------------");
-// // 璇�
-// devpThread.read();
-// System.out.println(JSON.toJSONString(devpThread.station));
-//
-// }
}
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index b1fc25e..777671e 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -54,7 +54,17 @@
border: 4px solid #00E676;
box-shadow: inset 0 0 30px rgba(0, 230, 118, 0.5), 0 0 20px rgba(0, 230, 118, 0.5);
}
- .station, .bus {
+ .station {
+ position: absolute;
+ width: 40px;
+ height: 24px;
+ /*border-radius: 50%;*/
+ text-align: center;
+ line-height: 24px;
+ font-weight: bold;
+ transition: transform 0.3s ease;
+ }
+ .bus {
position: absolute;
width: 24px;
height: 24px;
@@ -86,7 +96,7 @@
<div class="outer-ring"></div>
<!-- Stations on outer ring -->
-<!-- <div class="station" style="top: 49%; left: 99%;">1000</div>-->
+<!-- <div class="station" style="top: 49%; left: 99%;">1</div>-->
<!-- <div class="station" style="top: 30%; left: 100%;">2</div>-->
<!-- <div class="station" style="top: 70%; left: 100%;">3</div>-->
<!-- <div class="station" style="top: 110%; left: 50%;">4</div>-->
--
Gitblit v1.9.1