From 58d7b0e12ccd92cf3934f6582b51b5fbcecaa39a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 09 五月 2024 09:42:41 +0800
Subject: [PATCH] 修改注入方式
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 161 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 92 insertions(+), 69 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
index 0b9ea37..1fc3c55 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -1,22 +1,24 @@
package com.example.springboot.component;
+import java.sql.SQLException;
import java.time.LocalDateTime;
import java.util.List;
+import java.util.ArrayList;
import org.springframework.beans.factory.annotation.Autowired;
import com.example.springboot.service.JdbcConnections;
import com.example.springboot.service.SpianService;
+import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.north_glass_buffer1;
-import com.example.springboot.mapper.AlarmMapper;
import com.example.springboot.mapper.SpianMapper;
public class PlcHold extends Thread {
- private AlarmMapper alarmMapper;
@Autowired
private JdbcConnections jdbcConnections;
private SpianMapper spianMapper;
private SpianService spianService;
+
int aaa;
@Override
@@ -24,79 +26,76 @@
while (this != null) {
try {
-
- Thread.sleep(100);
- } catch (InterruptedException e) {
- // \\ TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- // if (S7control.getinstance().CheckConnected() == false) {
+ spianService.result=new ArrayList<>();
+ Thread.sleep(300);
+ // if (S7control.getinstance().CheckConnected() == false) {
spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
+
jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
// 鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�,鍗曠嫭鏁版嵁婧�
+
// try {
- // north_glass_buffer1 glass = jdbcConnections.selectGlass(112);
- // // System.out.println(glass.getOrderId());
+ // //spianService.selectAll(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X12345610102GV","",""));
+ // north_glass_buffer1 aa=jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X12345610102GV","","");
+ // spianMapper.UpdataAddCage2("123", "123", aa, 5, 1, 9, 2,2000.00);
// } catch (SQLException e) {
- // // TODO Auto-generated catch block
- // e.printStackTrace();
+ // // TODO Auto-generated catch block
+ // e.printStackTrace();
// }
-
- // 鍑虹墖浠诲姟////////////////////////////////
+ // spianService.selectout2("X21942610602GV");
+
List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖杞︾姸鎬�
List<Short> outlist1 = S7control.getinstance().ReadWord("DB105.18", 1); // 鍑虹墖浠诲姟鏄惁鍚姩
- boolean Plcadd = spianService.listbool("DB106.62"); // 鍑虹墖璇锋眰瀛�
-
- if(Plcadd==false){
- S7control.getinstance().WriteWord("DB105.18", (short) 1);// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负0
- }
+ boolean Plcout = spianService.listbool("DB106.64"); // 鍑虹墖璇锋眰瀛�
+ boolean Plcout2 = spianService.listbool("DB105.18"); // 鍑虹墖鍚姩
+ if (Plcout == false&&Plcout2==true) {
+ S7control.getinstance().WriteWord("DB105.18", (short) 0);// 鍑虹墖浠诲姟鍚姩鏀逛负0
+ System.out.println("鍏抽棴鍑虹墖鍚姩" + LocalDateTime.now());// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负0
+ }
+ boolean Plcadd = spianService.listbool("DB106.24"); // 杩涚墖璇锋眰瀛�
+ boolean Plcadd2 = spianService.listbool("DB105.16"); // 杩涚墖鍚姩
+ if (Plcadd == false&&Plcadd2==true) {
+ S7control.getinstance().WriteWord("DB105.16", (short) 0);//杩涚墖浠诲姟鍚姩鏀逛负0
+ System.out.println("鍏抽棴杩涚墖鍚姩" + LocalDateTime.now());// 杩涚墖浠诲姟鍙戦�佸瓧鏀逛负0
+ }
-
+
// StringBuilder writedstrIdOut = new StringBuilder();
// 鑾峰彇宸蹭笅鍙戠殑鍑虹墖id
byte[] writedglassidbytesOut = S7control.getinstance().ReadByte("DB105.30", 14);
String writedstrIdOut = new String(writedglassidbytesOut);
- boolean outstate = false;// 鍑虹墖杞︾┖闂插垽鏂�
- boolean outstate1 = false;// 鍑虹墖杞︿换鍔℃槸鍚﹀惎鍔�
- if (outlist != null && outlist1 != null) {
-
- outstate = outlist.contains((short) 0);// 鍑虹墖杞︾┖闂插垽鏂� 褰撳嚭鐗囪溅绌洪棽鏃朵负true
- outstate1 = outlist1.contains((short) 1);// 鍑虹墖杞︿换鍔℃槸鍚﹀惎鍔� 褰撳嚭鐗囪溅浠诲姟鍚姩鏃朵负true
-
+
+ if (Plcout == true) {
// 鍒ゆ柇褰撳墠鏄惁鏈夋湭鎵ц鐨勪换鍔�
- int outnum = spianMapper.SelectOutSliceshu();
- int cageoutsum = spianMapper.Selectcageout(3);
+ int outnum = spianMapper.SelectOutSliceshu();//鏄惁鏈夋鍦ㄥ嚭鐗囩殑浠诲姟
+ int cageoutsum = spianMapper.Selectcageout(3);//绗煎瓙鍐呮槸鍚﹁繕鏈夊湪鍑虹墖鐨勭幓鐠�
// 褰撴病鏈変换鍔℃墽琛屽苟涓斿嚭鐗囪溅绌洪棽鏃�
- if (outnum == 0 && outstate == true && Plchome.isAllowQueue == true && cageoutsum == 0) {
+ if (outnum == 0 && Plchome.isAllowQueue == true && cageoutsum == 0) {
// 鍒ゆ柇閾濇鍑虹墖闃熷垪琛ㄦ槸鍚︽湁寰呭嚭鐗囩殑鐜荤拑
String outglassid = spianMapper.SelectOutSlice();
// 褰撴湁寰呭嚭鐗囩殑鐜荤拑鏃�
if (outglassid != null) {
// 鑾峰彇璇ョ幓鐠冩槸鍚﹁绂佺敤
- int glassdisabled = spianMapper.SelectCageGlassState(outglassid);
- // 鏈鐢ㄤ笅鍙戜换鍔�
- if (glassdisabled == 0) {
+ StorageCage glassdisabled = spianMapper.SelectCageGlassState(outglassid);
+ if(glassdisabled!=null){
+ // 鏈鐢ㄤ笅鍙戜换鍔�
+ if (glassdisabled.getDisabled() == 0) {
spianService.selectout2(outglassid);
Plchome.isQueueWarning = false;
- outstate = false;
} else { // 绂佺敤鏇存敼鐘舵�佸脊鍑烘彁绀�
Plchome.isQueueWarning = true;
+ System.out.println("绂佺敤" + outglassid);
}
+ }
+
}
}
- if (outstate == true) {// 褰撳嚭鐗囪溅绌洪棽鏃�,涓斿嚭鐗囧惎鍔ㄤ负1鏃讹紝浠诲姟鍚姩鏀逛负0
- if (outstate1 == true) {
- S7control.getinstance().WriteWord("DB105.18", (short) 0);// 鍑虹墖浠诲姟鍚姩鏀逛负0
- System.out.println("鍏抽棴鍚姩" + LocalDateTime.now());
-
- }
- }
+
}
///////////// 杩涚墖浠诲姟
@@ -105,7 +104,6 @@
List<Short> datas1ListState2 = S7control.getinstance().ReadWord("DB105.16", 1);// 鑾峰彇杩涚墖杞︿换鍔℃槸鍚﹀惎鍔�
boolean B01backs = spianService.listbool("DB106.60");// b01姹囨姤
-
boolean B02backs = spianService.listbool("DB106.62");// b02姹囨姤
StringBuilder B01glassid = spianService.queGlassid("DB103.184", 14);// BO1鐨勭幓鐠僫d
StringBuilder B02glassid = spianService.queGlassid("DB103.212", 14);// B02鐨勭幓鐠僫d
@@ -116,40 +114,43 @@
int HB = spianMapper.SelectHB(B01glassid.toString());
if (HB > 0) {
// 褰揃01灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬� 涓�1
- S7control.getinstance().WriteWord("DB106.60", (short) 0);// 鎭㈠B01灏忚溅搴旂瓟鏀逛负0
- boolean yingda = spianService.listbool("DB106.60");// b01姹囨姤
- if (yingda == false) {
+ S7control.getinstance().WriteWord("DB105.48", (short) 1);// 鎭㈠B01灏忚溅搴旂瓟鏀逛负1
+ boolean yingda = spianService.listbool("DB105.48");// b01搴旂瓟
+ if (yingda == true) {
spianService.overtask(B01glassid.toString());// 瀹屾垚浠诲姟
}
- System.out.println("姹囨姤鏃禕01|绗�" + aaa + "娆�" + B01glassid + "搴旂瓟" + yingda);
- aaa += 1;
+ System.out.println("姹囨姤鏃禕01|" + B01glassid + "搴旂瓟" + yingda);
+ Plchome.feedglassid=B01glassid;
+ }else{
+ S7control.getinstance().WriteWord("DB105.48", (short) 1);// 鎭㈠B01灏忚溅搴旂瓟鏀逛负1
+ System.out.println("HB:|" + HB+"glassid|"+B01glassid);
}
+ }else{
+ S7control.getinstance().WriteWord("DB105.48", (short) 0);// 鎭㈠B01灏忚溅搴旂瓟鏀逛负1
}
// 褰撳嚭鐗囧皬杞﹀畬鎴愪换鍔℃椂
if (B02backs == true) {
// 鍒ゆ柇鏄惁姹囨姤姝ｇ‘鐨刬d
int HB = spianMapper.SelectHB(B02glassid.toString());
- System.out.println("姹囨姤鏃禕02|" + B02glassid);
+ System.out.println("huibaoshiB02ID|" + B02glassid);
if (HB > 0) {
// 褰揃02灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬佷负0
-
- S7control.getinstance().WriteWord("DB106.62", (short) 0);// 鎭㈠B02灏忚溅搴旂瓟鏀逛负0
- System.out.println("姹囨姤鏃禕02|" + B02glassid);
- boolean yingda = spianService.listbool("DB106.62");// b02姹囨姤
- if (yingda == false) {
+ S7control.getinstance().WriteWord("DB105.50", (short) 1);// 鎭㈠B02灏忚溅搴旂瓟鏀逛负1
+ boolean yingda = spianService.listbool("DB105.50");// b02姹囨姤
+ if (yingda == true) {
spianService.overtask(B02glassid.toString());// 瀹屾垚浠诲姟
}
- System.out.println("姹囨姤鏃禕02|绗�" + aaa + "娆�" + B02glassid + "搴旂瓟" + yingda);
+ System.out.println("姹囨姤鏃禕02|" + B02glassid + "搴旂瓟" + yingda);
+ Plchome.feedglassid=B01glassid;
+ }else{
+ S7control.getinstance().WriteWord("DB105.50", (short) 1);// 鎭㈠B02灏忚溅搴旂瓟鏀逛负1
+ System.out.println("HB:|" + HB+"glassid|"+B02glassid);
}
+ }else{
+ S7control.getinstance().WriteWord("DB105.50", (short) 0);// 鎭㈠B02灏忚溅搴旂瓟鏀逛负0
}
-
-
- boolean Plcout = spianService.listbool("DB106.62"); // 杩涚墖璇锋眰瀛�
- if(Plcout==false){
- S7control.getinstance().WriteWord("DB105.18", (short) 0);// 杩涚墖浠诲姟鍙戦�佸瓧鏀逛负0
- }
// 鑾峰彇DO1鏁版嵁
@@ -158,13 +159,30 @@
StringBuilder queueid2 = spianService.queGlassid("DB103.58", 14);
int questate = spianMapper.Selectquecount(queueid1.toString());// 鍒ゆ柇鎵爜浣嶆槸鍚︽湁鐜荤拑宸茬‘璁�
- // queueid1.toString().isEmpty()
- north_glass_buffer1 glass1 = spianMapper.selectGlass(queueid1.toString());// D01鐨勭幓鐠冧俊鎭�
- north_glass_buffer1 glass2 = spianMapper.selectGlass(queueid2.toString());// D02鐜荤拑淇℃伅
+ //queueid1.toString().isEmpty();
+ // north_glass_buffer1 glass1 = spianMapper.selectGlass(queueid1.toString());// D01鐨勭幓鐠冧俊鎭�
+ // north_glass_buffer1 glass2 = spianMapper.selectGlass(queueid2.toString());// D02鐜荤拑淇℃伅
+
+ north_glass_buffer1 glass1 =new north_glass_buffer1();
+ north_glass_buffer1 glass2 =new north_glass_buffer1();
+
+ try {
+ if(Plchome.dbconnected==true){
+ if(queueid1.toString()!=""){
+ glass1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdplchold(queueid1.toString(),"","");// D01鐜荤拑淇℃伅
+ }
+ if(queueid2.toString()!=""){
+ glass2 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdplchold(queueid2.toString(),"","");// D02鐜荤拑淇℃伅
+ }
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+
// 褰撴壂鐮佷綅鐜荤拑id涓虹┖鏃� 瀹藉害涓�0
if (queueid1 != null && questate == 0) {
// 鍐欏叆D01鐨勬暟鎹埌涓婄墖闃熷垪琛�
- if (glass1 == null) { // 褰撴病鏈夊�兼椂浼犵┖
+ if (glass1 == null ||glass1.getordernumber()==null) { // 褰撴病鏈夊�兼椂浼犵┖
spianMapper.Updatequeue(null, null, null, null, 0, null, null, null, null, 1);
} else {
@@ -177,7 +195,7 @@
if (queueid2 != null) {
// 鍐欏叆D02鐨勬暟鎹埌涓婄墖闃熷垪琛�
- if (glass2 == null) {
+ if (glass2 == null ||glass2.getordernumber()==null) {
spianMapper.Updatequeue(null, null, null, null, 0, null, null, null, null, 2);
} else {
spianMapper.Updatequeue(queueid2.toString(), glass2.getordernumber(), glass2.getlistnumber(),
@@ -188,13 +206,18 @@
}
}
-
-
+ // System.out.println(spianService.result);
// 鏌ヨ鏁版嵁搴�
// 鎺ㄩ�佸埌鍓嶇
// }
+ } catch (InterruptedException e) {
+ // \\ TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+
}
}
--
Gitblit v1.8.0