From 8c53606ba281d8b13890564f7e4684c4a20dadb1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 06 八月 2020 10:49:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 10 -
src/main/java/com/zy/asrs/controller/SiteController.java | 6
src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java | 2
src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java | 2
src/main/java/com/zy/asrs/service/MainService.java | 4 +
src/main/java/com/zy/asrs/domain/param/SystemSwitchParam.java | 2
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 34 ++++++++
src/main/java/com/zy/core/MainProcess.java | 8 +
src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java | 2
src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java | 2
src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java | 2
src/main/java/com/zy/asrs/domain/vo/CommandLogVo.java | 2
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 54 +++++++++++++
src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java | 2
src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java | 4
src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java | 2
src/main/java/com/zy/asrs/controller/CrnController.java | 12 +-
src/main/java/com/zy/core/thread/DevpThread.java | 5 +
src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java | 4
src/main/java/com/zy/core/properties/SlaveProperties.java | 3
src/main/java/com/zy/asrs/controller/ConsoleController.java | 8 +-
src/main/java/com/zy/core/model/DevpSlave.java | 28 +++++++
src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java | 2
src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java | 2
src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java | 2
src/main/resources/application.yml | 4 +
26 files changed, 169 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/zy/client/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
similarity index 96%
rename from src/main/java/com/zy/client/controller/ConsoleController.java
rename to src/main/java/com/zy/asrs/controller/ConsoleController.java
index bc6601a..1607c01 100644
--- a/src/main/java/com/zy/client/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -1,12 +1,12 @@
-package com.zy.client.controller;
+package com.zy.asrs.controller;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.core.properties.SystemProperties;
-import com.zy.client.domain.enums.SiteStatusType;
-import com.zy.client.domain.param.SystemSwitchParam;
-import com.zy.client.domain.vo.*;
+import com.zy.asrs.domain.enums.SiteStatusType;
+import com.zy.asrs.domain.param.SystemSwitchParam;
+import com.zy.asrs.domain.vo.*;
import com.zy.common.CodeRes;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/src/main/java/com/zy/client/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
similarity index 94%
rename from src/main/java/com/zy/client/controller/CrnController.java
rename to src/main/java/com/zy/asrs/controller/CrnController.java
index b00e6d0..dd1872d 100644
--- a/src/main/java/com/zy/client/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -1,12 +1,12 @@
-package com.zy.client.controller;
+package com.zy.asrs.controller;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
-import com.zy.client.domain.enums.CrnStatusType;
-import com.zy.client.domain.param.CrnOperatorParam;
-import com.zy.client.domain.vo.CommandLogVo;
-import com.zy.client.domain.vo.CrnMsgTableVo;
-import com.zy.client.domain.vo.CrnStateTableVo;
+import com.zy.asrs.domain.enums.CrnStatusType;
+import com.zy.asrs.domain.param.CrnOperatorParam;
+import com.zy.asrs.domain.vo.CommandLogVo;
+import com.zy.asrs.domain.vo.CrnMsgTableVo;
+import com.zy.asrs.domain.vo.CrnStateTableVo;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/src/main/java/com/zy/client/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
similarity index 94%
rename from src/main/java/com/zy/client/controller/SiteController.java
rename to src/main/java/com/zy/asrs/controller/SiteController.java
index 5dfca41..5679e8f 100644
--- a/src/main/java/com/zy/client/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -1,9 +1,9 @@
-package com.zy.client.controller;
+package com.zy.asrs.controller;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
-import com.zy.client.domain.vo.PlcErrorTableVo;
-import com.zy.client.domain.vo.SiteTableVo;
+import com.zy.asrs.domain.vo.PlcErrorTableVo;
+import com.zy.asrs.domain.vo.SiteTableVo;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/src/main/java/com/zy/client/domain/enums/CrnStatusType.java b/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
similarity index 94%
rename from src/main/java/com/zy/client/domain/enums/CrnStatusType.java
rename to src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
index 2c242b3..7b56ef6 100644
--- a/src/main/java/com/zy/client/domain/enums/CrnStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
@@ -1,4 +1,4 @@
-package com.zy.client.domain.enums;
+package com.zy.asrs.domain.enums;
/**
* 鍫嗗灈鏈虹姸鎬佹灇涓�
diff --git a/src/main/java/com/zy/client/domain/enums/SiteStatusType.java b/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
similarity index 88%
rename from src/main/java/com/zy/client/domain/enums/SiteStatusType.java
rename to src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
index d44ec2f..bc00e16 100644
--- a/src/main/java/com/zy/client/domain/enums/SiteStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
@@ -1,4 +1,4 @@
-package com.zy.client.domain.enums;
+package com.zy.asrs.domain.enums;
/**
diff --git a/src/main/java/com/zy/client/domain/param/CrnOperatorParam.java b/src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java
similarity index 97%
rename from src/main/java/com/zy/client/domain/param/CrnOperatorParam.java
rename to src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java
index 972284f..a808a6a 100644
--- a/src/main/java/com/zy/client/domain/param/CrnOperatorParam.java
+++ b/src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java
@@ -1,4 +1,4 @@
-package com.zy.client.domain.param;
+package com.zy.asrs.domain.param;
/**
* Created by vincent on 2020-06-02
diff --git a/src/main/java/com/zy/client/domain/param/SystemSwitchParam.java b/src/main/java/com/zy/asrs/domain/param/SystemSwitchParam.java
similarity index 93%
rename from src/main/java/com/zy/client/domain/param/SystemSwitchParam.java
rename to src/main/java/com/zy/asrs/domain/param/SystemSwitchParam.java
index 8d20e6e..02bec5a 100644
--- a/src/main/java/com/zy/client/domain/param/SystemSwitchParam.java
+++ b/src/main/java/com/zy/asrs/domain/param/SystemSwitchParam.java
@@ -1,4 +1,4 @@
-package com.zy.client.domain.param;
+package com.zy.asrs.domain.param;
/**
* 绯荤粺杩愯鐘舵�佹搷浣滃叆鍙�
diff --git a/src/main/java/com/zy/client/domain/vo/BarcodeDataVo.java b/src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java
similarity index 94%
rename from src/main/java/com/zy/client/domain/vo/BarcodeDataVo.java
rename to src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java
index f6e8669..c6bbc0b 100644
--- a/src/main/java/com/zy/client/domain/vo/BarcodeDataVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java
@@ -1,4 +1,4 @@
-package com.zy.client.domain.vo;
+package com.zy.asrs.domain.vo;
/**
* 鎵爜鍣ㄥ疄鏃舵暟鎹鍥惧璞�
diff --git a/src/main/java/com/zy/client/domain/vo/CommandLogVo.java b/src/main/java/com/zy/asrs/domain/vo/CommandLogVo.java
similarity index 94%
rename from src/main/java/com/zy/client/domain/vo/CommandLogVo.java
rename to src/main/java/com/zy/asrs/domain/vo/CommandLogVo.java
index e0b1646..9673fc4 100644
--- a/src/main/java/com/zy/client/domain/vo/CommandLogVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CommandLogVo.java
@@ -1,4 +1,4 @@
-package com.zy.client.domain.vo;
+package com.zy.asrs.domain.vo;
/**
* Created by vincent on 2020-06-02
diff --git a/src/main/java/com/zy/client/domain/vo/CrnDetailVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java
similarity index 98%
rename from src/main/java/com/zy/client/domain/vo/CrnDetailVo.java
rename to src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java
index a2abd16..40d80f9 100644
--- a/src/main/java/com/zy/client/domain/vo/CrnDetailVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java
@@ -1,4 +1,4 @@
-package com.zy.client.domain.vo;
+package com.zy.asrs.domain.vo;
/**
* 鍫嗗灈鏈鸿鎯呰鍥惧璞�
diff --git a/src/main/java/com/zy/client/domain/vo/CrnLatestDataVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
similarity index 93%
rename from src/main/java/com/zy/client/domain/vo/CrnLatestDataVo.java
rename to src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
index 6c6de4f..b961f73 100644
--- a/src/main/java/com/zy/client/domain/vo/CrnLatestDataVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
@@ -1,4 +1,4 @@
-package com.zy.client.domain.vo;
+package com.zy.asrs.domain.vo;
/**
* 鍫嗗灈鏈烘渶鏂版暟鎹鍥惧璞�
diff --git a/src/main/java/com/zy/client/domain/vo/CrnMsgTableVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
similarity index 98%
rename from src/main/java/com/zy/client/domain/vo/CrnMsgTableVo.java
rename to src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
index e4354e9..35e96c8 100644
--- a/src/main/java/com/zy/client/domain/vo/CrnMsgTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
@@ -1,4 +1,4 @@
-package com.zy.client.domain.vo;
+package com.zy.asrs.domain.vo;
/**
* Created by vincent on 2020-06-02
diff --git a/src/main/java/com/zy/client/domain/vo/CrnStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
similarity index 97%
rename from src/main/java/com/zy/client/domain/vo/CrnStateTableVo.java
rename to src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
index 8fdbcb7..8303186 100644
--- a/src/main/java/com/zy/client/domain/vo/CrnStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
@@ -1,6 +1,6 @@
-package com.zy.client.domain.vo;
+package com.zy.asrs.domain.vo;
-import com.zy.client.domain.enums.CrnStatusType;
+import com.zy.asrs.domain.enums.CrnStatusType;
/**
* Created by vincent on 2020-06-02
diff --git a/src/main/java/com/zy/client/domain/vo/PlcErrorTableVo.java b/src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java
similarity index 94%
rename from src/main/java/com/zy/client/domain/vo/PlcErrorTableVo.java
rename to src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java
index 4eaaa97..43e408e 100644
--- a/src/main/java/com/zy/client/domain/vo/PlcErrorTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java
@@ -1,4 +1,4 @@
-package com.zy.client.domain.vo;
+package com.zy.asrs.domain.vo;
/**
* Created by vincent on 2020-06-02
diff --git a/src/main/java/com/zy/client/domain/vo/SiteDetailVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java
similarity index 98%
rename from src/main/java/com/zy/client/domain/vo/SiteDetailVo.java
rename to src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java
index 02e24ce..1d061bb 100644
--- a/src/main/java/com/zy/client/domain/vo/SiteDetailVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java
@@ -1,4 +1,4 @@
-package com.zy.client.domain.vo;
+package com.zy.asrs.domain.vo;
/**
* 杈撻�佽澶囪鎯呰鍥惧璞�
diff --git a/src/main/java/com/zy/client/domain/vo/SiteLatestDataVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java
similarity index 90%
rename from src/main/java/com/zy/client/domain/vo/SiteLatestDataVo.java
rename to src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java
index 94b46dc..f599804 100644
--- a/src/main/java/com/zy/client/domain/vo/SiteLatestDataVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java
@@ -1,6 +1,6 @@
-package com.zy.client.domain.vo;
+package com.zy.asrs.domain.vo;
-import com.zy.client.domain.enums.SiteStatusType;
+import com.zy.asrs.domain.enums.SiteStatusType;
/**
* 绔欑偣鏈�鏂版暟鎹鍥惧璞�
diff --git a/src/main/java/com/zy/client/domain/vo/SiteTableVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
similarity index 98%
rename from src/main/java/com/zy/client/domain/vo/SiteTableVo.java
rename to src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
index 207d113..e4ff581 100644
--- a/src/main/java/com/zy/client/domain/vo/SiteTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
@@ -1,4 +1,4 @@
-package com.zy.client.domain.vo;
+package com.zy.asrs.domain.vo;
/**
* Created by vincent on 2020-06-02
diff --git a/src/main/java/com/zy/asrs/service/MainService.java b/src/main/java/com/zy/asrs/service/MainService.java
new file mode 100644
index 0000000..a2f8ca1
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/MainService.java
@@ -0,0 +1,4 @@
+package com.zy.asrs.service;
+
+public interface MainService {
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
new file mode 100644
index 0000000..8ccdcaa
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -0,0 +1,54 @@
+package com.zy.asrs.service.impl;
+
+import com.core.common.Cools;
+import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.DevpSlave;
+import com.zy.core.model.protocol.StaProtocol;
+import com.zy.core.properties.SlaveProperties;
+import com.zy.core.thread.BarcodeThread;
+import com.zy.core.thread.DevpThread;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Created by vincent on 2020/8/6
+ */
+@Service("mainService")
+public class MainServiceImpl {
+
+ @Autowired
+ private SlaveProperties slaveProperties;
+
+ /**
+ * 鍏ュ簱绔欙紝鏍规嵁鏉＄爜鎵弿鐢熸垚鍏ュ簱宸ヤ綔妗ｏ紝宸ヤ綔鐘舵��1
+ */
+ @Transactional
+ public void generateStoreWrkFile() {
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ // 閬嶅巻鍏ュ簱鍙�
+ for (DevpSlave.InSta inSta : devp.getInSta()) {
+ // 鑾峰彇鏉＄爜
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
+ String barcode = barcodeThread.getBarcode();
+ // 鑾峰彇鍏ュ簱绔欎俊鎭�
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
+ // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInreq1()
+ && !staProtocol.isEmptyMk() && staProtocol.isInreq1() && staProtocol.getWorkNO() ==0
+ && !Cools.isEmpty(barcode)) {
+ // 鐢熸垚宸ヤ綔妗�
+
+ }
+
+
+ }
+
+ }
+
+ }
+
+}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 3dbda62..58f36e8 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -1,8 +1,10 @@
package com.zy.core;
+import com.zy.asrs.service.impl.MainServiceImpl;
import com.zy.core.properties.SystemProperties;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.PreDestroy;
@@ -16,6 +18,8 @@
@Component
public class MainProcess {
+ @Autowired
+ private MainServiceImpl mainService;
// 鎵�灞炵嚎绋�
private Thread thread;
@@ -30,8 +34,8 @@
if (SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
-
-
+ // 鍏ュ簱绔欙紝鏍规嵁鏉＄爜鎵弿鐢熸垚鍏ュ簱宸ヤ綔妗ｏ紝宸ヤ綔鐘舵��1锛屾棤璁惧鍛戒护涓嬪彂
+ mainService.generateStoreWrkFile();
diff --git a/src/main/java/com/zy/core/model/DevpSlave.java b/src/main/java/com/zy/core/model/DevpSlave.java
new file mode 100644
index 0000000..6b0b563
--- /dev/null
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -0,0 +1,28 @@
+package com.zy.core.model;
+
+import com.zy.core.Slave;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/8/6
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class DevpSlave extends Slave {
+
+ private List<InSta> inSta = new ArrayList<>();
+
+ @Data
+ public static class InSta {
+
+ private Integer staNo;
+
+ private Integer barcode;
+
+ }
+
+}
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
new file mode 100644
index 0000000..5b99cee
--- /dev/null
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -0,0 +1,34 @@
+package com.zy.core.model.protocol;
+
+import lombok.Data;
+
+/**
+ * 杈撻�佺嚎plc鍗曚釜绔欑偣璇︾粏淇℃伅
+ * Created by vincent on 2020/8/6
+ */
+@Data
+public class StaProtocol {
+
+ // 鑷姩
+ private boolean autoing;
+
+ // 鏈夌墿
+ private boolean loading;
+
+ // 鍙叆
+ private boolean inEnable;
+
+ // 鍙嚭
+ private boolean outEnable;
+
+ // 绌烘澘淇″彿
+ private boolean emptyMk;
+
+ // 闇�姹�1
+ private boolean inreq1;
+
+ // 宸ヤ綔鍙�
+ private Integer workNO;
+
+
+}
diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java
index e691c45..a03469f 100644
--- a/src/main/java/com/zy/core/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -1,6 +1,7 @@
package com.zy.core.properties;
import com.zy.core.Slave;
+import com.zy.core.model.DevpSlave;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@@ -18,7 +19,7 @@
private List<Slave> crn = new ArrayList<>();
- private List<Slave> devp = new ArrayList<>();
+ private List<DevpSlave> devp = new ArrayList<>();
private List<Slave> barcode = new ArrayList<>();
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 6c4a7eb..a2122c0 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -2,9 +2,6 @@
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
-import com.zy.core.cache.MessageQueue;
-import com.zy.core.enums.SlaveType;
-import com.zy.core.model.Task;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -17,6 +14,7 @@
public class BarcodeThread implements Runnable, ThreadHandler {
private Slave slave;
+ private String barcode;
public BarcodeThread(Slave slave) {
this.slave = slave;
@@ -28,10 +26,8 @@
public void run() {
while (true) {
try {
- Task task = MessageQueue.poll(SlaveType.Barcode, slave.getId());
- if (task != null) {
- System.out.println("浠诲姟"+task.getId());
- }
+// Task task = MessageQueue.poll(SlaveType.Barcode, slave.getId());
+ barcode = "10001136";
Thread.sleep(3000);
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index 8debfbc..030e98b 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -8,8 +8,12 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.Task;
+import com.zy.core.model.protocol.StaProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/**
* 杈撻�佺嚎绾跨▼
@@ -21,6 +25,7 @@
private Slave slave;
private SiemensS7Net siemensS7Net;
+ private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
public DevpThread(Slave slave) {
this.slave = slave;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index aca5257..51a6c51 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -45,6 +45,10 @@
id: 1
ip: 192.168.1.1
port: 8888
+ # 鍏ュ簱鍙�
+ inSta[0]:
+ staNo: 2
+ barcode: ${wcs-slave.barcode[0].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
--
Gitblit v1.9.1