From 9072592272b040439d2da8db79d56aa3f57b1d1c Mon Sep 17 00:00:00 2001 From: Junjie <xjj@123> Date: 星期六, 07 六月 2025 09:00:38 +0800 Subject: [PATCH] # --- src/main/webapp/views/crn.html | 6 ++ src/main/resources/application.yml | 139 ++++++++++++++++++++++++++++++++++++++++++++-- src/main/java/com/zy/core/ServerBootstrap.java | 2 3 files changed, 140 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java index d548941..9ae32c6 100644 --- a/src/main/java/com/zy/core/ServerBootstrap.java +++ b/src/main/java/com/zy/core/ServerBootstrap.java @@ -84,7 +84,7 @@ // 鍒濆鍖栧爢鍨涙満绾跨▼ News.info("鍒濆鍖栧爢鍨涙満绾跨▼..................................................."); for (CrnSlave crn : slaveProperties.getCrn()) { - CrnThread crnThread = new MelsecCrnThread(crn); + CrnThread crnThread = new SiemensCrnThread(crn); Thread thread = new Thread((Runnable) crnThread); thread.start(); map.put(crnThread, thread); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f65290b..55135ea 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -48,8 +48,8 @@ # 鍫嗗灈鏈�1 crn[0]: id: 1 - ip: 10.10.11.7 - port: 6000 + ip: 172.17.60.10 + port: 102 rack: 0 slot: 0 # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 @@ -58,15 +58,142 @@ # 鍫嗗灈鏈哄叆搴撶珯鐐� crnInStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 102 - row: 33 + staNo: 1020 + row: 6 bay: 1 lev: 1 # 鍫嗗灈鏈哄嚭搴撶珯鐐� crnOutStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 102 - row: 33 + staNo: 1013 + row: 3 + bay: 1 + lev: 1 + # 鍫嗗灈鏈哄嚭搴撶珯鐐� + crnOutStn[1]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 1016 + row: 5 + bay: 1 + lev: 1 + # 鍫嗗灈鏈�2 + crn[1]: + id: 2 + ip: 172.17.60.20 + port: 102 + rack: 0 + slot: 0 + # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 + offset: 2 + demo: false + # 鍫嗗灈鏈哄叆搴撶珯鐐� + crnInStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 1023 + row: 8 + bay: 1 + lev: 1 + # 鍫嗗灈鏈哄嚭搴撶珯鐐� + crnOutStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 1026 + row: 9 + bay: 1 + lev: 1 + # 鍫嗗灈鏈�3 + crn[2]: + id: 3 + ip: 172.17.60.30 + port: 102 + rack: 0 + slot: 0 + # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 + offset: 2 + demo: false + # 鍫嗗灈鏈哄叆搴撶珯鐐� + crnInStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 1029 + row: 12 + bay: 1 + lev: 1 + # 鍫嗗灈鏈哄嚭搴撶珯鐐� + crnOutStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 1032 + row: 13 + bay: 1 + lev: 1 + # 鍫嗗灈鏈�4 + crn[3]: + id: 4 + ip: 172.17.60.40 + port: 102 + rack: 0 + slot: 0 + # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 + offset: 2 + demo: false + # 鍫嗗灈鏈哄叆搴撶珯鐐� + crnInStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 1036 + row: 2 + bay: 1 + lev: 1 + # 鍫嗗灈鏈哄嚭搴撶珯鐐� + crnOutStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 1039 + row: 3 + bay: 1 + lev: 1 + # 鍫嗗灈鏈�5 + crn[4]: + id: 5 + ip: 172.17.60.50 + port: 102 + rack: 0 + slot: 0 + # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 + offset: 2 + demo: false + # 鍫嗗灈鏈哄叆搴撶珯鐐� + crnInStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 1042 + row: 6 + bay: 1 + lev: 1 + # 鍫嗗灈鏈哄嚭搴撶珯鐐� + crnOutStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 1045 + row: 7 + bay: 1 + lev: 1 + # 鍫嗗灈鏈�6 + crn[5]: + id: 6 + ip: 172.17.60.60 + port: 102 + rack: 0 + slot: 0 + # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 + offset: 2 + demo: false + # 鍫嗗灈鏈哄叆搴撶珯鐐� + crnInStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 1049 + row: 2 + bay: 1 + lev: 1 + # 鍫嗗灈鏈哄嚭搴撶珯鐐� + crnOutStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 1052 + row: 3 bay: 1 lev: 1 # 杈撻�佺嚎1 diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html index c1012c7..ea6ca3b 100644 --- a/src/main/webapp/views/crn.html +++ b/src/main/webapp/views/crn.html @@ -83,6 +83,12 @@ <!-- <span> </span>--> <input id="crn5" disabled="disabled"> </div> + <div class="crn-command-item"> + <label>6#</label> + <button id="demoBtn-6" class="demoBtn" onclick="demoSwitch(this.id)"> - </button> + <!-- <span> </span>--> + <input id="crn6" disabled="disabled"> + </div> </div> <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 --> <div class="crn-state"> -- Gitblit v1.9.1