From 426c2fbeaf634d21db08fc996b433ddd7da43881 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 13 三月 2025 14:01:49 +0800
Subject: [PATCH] 配置信息
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 22 +++++-----
src/main/resources/application-prod.yml | 49 ++++++++++++++++++++----
src/main/java/com/zy/core/properties/SlaveProductProperties.java | 45 ++++++++++++++++++++++
src/main/resources/application.yml | 4 +-
4 files changed, 99 insertions(+), 21 deletions(-)
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 f3b0695..c1ef8ba 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -35,7 +35,7 @@
import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.StaProtocol;
-import com.zy.core.properties.SlaveProperties;
+import com.zy.core.properties.SlaveProductProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.SiemensDevpThread;
import com.zy.system.entity.Config;
@@ -65,7 +65,7 @@
public static final long COMMAND_TIMEOUT = 5 * 1000;
@Autowired
- private SlaveProperties slaveProperties;
+ private SlaveProductProperties slaveProductProperties;
@Autowired
private WrkMastMapper wrkMastMapper;
@Autowired
@@ -116,7 +116,7 @@
public void generateStoreWrkFile1() throws IOException, InterruptedException {
try {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
- for (DevpSlave devp : slaveProperties.getDevp()) {
+ for (DevpSlave devp : slaveProductProperties.getDevp()) {
// 閬嶅巻鍏ュ簱鍙�
for (DevpSlave.Sta inSta : devp.getInSta()) {
StorageEscalationParam storageEscalationParam = new StorageEscalationParam();
@@ -300,7 +300,7 @@
public void generateStoreWrkFile() throws IOException, InterruptedException {
try {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
- for (DevpSlave devp : slaveProperties.getDevp()) {
+ for (DevpSlave devp : slaveProductProperties.getDevp()) {
// 閬嶅巻鍏ュ簱鍙�
for (DevpSlave.Sta inSta : devp.getInSta()) {
// 鑾峰彇鍏ュ簱绔欎俊鎭�
@@ -575,7 +575,7 @@
* 鍫嗗灈鏈虹珯鍑哄簱鍒板嚭搴撶珯
*/
public void crnStnToOutStn() {
- for (CrnSlave crnSlave : slaveProperties.getCrn()) {
+ for (CrnSlave crnSlave : slaveProductProperties.getCrn()) {
// 閬嶅巻鍫嗗灈鏈哄嚭搴撶珯
for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", crnSlave.getId()).eq("crn_stn", crnStn.getStaNo()));
@@ -631,7 +631,7 @@
* 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
*/
public synchronized void crnIoExecute() throws IOException {
- for (CrnSlave crn : slaveProperties.getCrn()) {
+ for (CrnSlave crn : slaveProductProperties.getCrn()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
@@ -944,8 +944,8 @@
for (TaskWrk taskWrk : taskWrks) {
// 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
-// if (Utils.isDeepLoc(slaveProperties, taskWrk.getStartPoint())) {
-// String shallowLocNo = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint());
+// if (Utils.isDeepLoc(slaveProductProperties, taskWrk.getStartPoint())) {
+// String shallowLocNo = Utils.getShallowLoc(slaveProductProperties, taskWrk.getStartPoint());
// TaskWrk hallowLocNoTask = taskWrkMapper.selectByStartPoint(shallowLocNo);
// if (!Cools.isEmpty(hallowLocNoTask)){
// continue;
@@ -1033,7 +1033,7 @@
* 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
*/
// public void storeFinished() {
-// for (CrnSlave crn : slaveProperties.getCrn()) {
+// for (CrnSlave crn : slaveProductProperties.getCrn()) {
// // 鑾峰彇鍫嗗灈鏈轰俊鎭�
// CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
// CrnProtocol crnProtocol = crnThread.getCrnProtocol();
@@ -1081,7 +1081,7 @@
* 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
*/
public void storeFinished() throws InterruptedException {
- for (CrnSlave crn : slaveProperties.getCrn()) {
+ for (CrnSlave crn : slaveProductProperties.getCrn()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
@@ -1156,7 +1156,7 @@
*/
public void recCrnErr() {
Date now = new Date();
- for (CrnSlave crn : slaveProperties.getCrn()) {
+ for (CrnSlave crn : slaveProductProperties.getCrn()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
diff --git a/src/main/java/com/zy/core/properties/SlaveProductProperties.java b/src/main/java/com/zy/core/properties/SlaveProductProperties.java
new file mode 100644
index 0000000..1abf98a
--- /dev/null
+++ b/src/main/java/com/zy/core/properties/SlaveProductProperties.java
@@ -0,0 +1,45 @@
+package com.zy.core.properties;
+
+import com.zy.core.Slave;
+import com.zy.core.model.CrnSlave;
+import com.zy.core.model.DevpSlave;
+import com.zy.core.model.LedSlave;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/8/4
+ *
+ */
+
+/**
+ * 璇ョ被鏁翠釜灏辨槸涓�涓�氳繃閰嶇疆鏂囦欢鏉ュ疄浣撳寲瀵硅薄绫�
+ */
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "wcs-slave-product")
+public class SlaveProductProperties {
+
+ private boolean doubleDeep;
+
+ private List<Integer> doubleLocs = new ArrayList<>();
+
+ private int groupCount;
+
+ private List<CrnSlave> crn = new ArrayList<>();
+
+ private List<DevpSlave> devp = new ArrayList<>();
+
+ private List<Slave> barcode = new ArrayList<>();
+
+ private List<LedSlave> led = new ArrayList<>();
+
+ private List<Slave> scale = new ArrayList<>();
+
+ private List<Slave> car = new ArrayList<>();
+
+}
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index c775615..70a485f 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -44,26 +44,56 @@
lev: 2
backSta: 106
devpPlcId: ${wcs-slave.devp[0].id}
- crn[2]: #鍫嗗灈鏈�3
- id: 3
- ip: 10.10.10.130
+ devp[0]: #杈撻�佺嚎
+ id: 1
+ ip: 10.10.10.140
+ rack: 0
+ port: 102
+ slot: 0
+ emptyInSta[0]: #绌烘澘鍏ュ簱鍙�0
+ staNo: 116
+ inSta[0]: #鍏ュ簱鍙�1
+ staNo: 116
+ backSta: 110
+ barcode: ${wcs-slave.barcode[0].id}
+ outSta[0]: #鍑哄簱鍙�1
+ staNo: 105
+ outSta[1]: #鍑哄簱鍙�2
+ staNo: 107
+ outSta[2]: #鍑哄簱鍙�2
+ staNo: 109
+ outSta[3]: #鍑哄簱鍙�1
+ staNo: 110
+ barcode[0]: #鏉＄爜鎵弿浠�
+ port: 51236
+ ip: 172.17.91.39
+ id: 1
+
+
+wcs-slave-product:
+ doubleDeep: false #鍙屾繁
+ doubleLocs: 1,4,5,8 #鍙屾繁搴撲綅鎺掑彿 1,4,5,8
+ groupCount: 4 #涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ crn[0]: #鍫嗗灈鏈�1
+ id: 1
+ ip: 10.10.10.110
slot: 0
demo: false
rack: 0
offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
port: 102
crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 115
- row: 7
+ staNo: 125
+ row: 3
bay: 1
lev: 2
devpPlcId: ${wcs-slave.devp[0].id}
crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 120
- row: 6
+ staNo: 100
+ row: 2
bay: 1
lev: 2
- backSta: 106
+ backSta: 102
devpPlcId: ${wcs-slave.devp[0].id}
devp[0]: #杈撻�佺嚎
id: 1
@@ -229,3 +259,6 @@
# demo: false
+
+
+
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2b4789e..3873d19 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=ynhfasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=czscgkwcs
username: sa
password: sa@123
mvc:
@@ -37,7 +37,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: ynhfwcs
+ subject: czscgkwcs
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
--
Gitblit v1.9.1