From 800f3b71efdb0a9d2fb2c1f688cc194c88960d25 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 07 十二月 2023 09:41:32 +0800
Subject: [PATCH] 更换新图片
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 126 +++++++++++++++++++++++------------------
1 files changed, 71 insertions(+), 55 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
index 0d53465..de38cb9 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -1,29 +1,38 @@
package com.example.springboot.component;
import cn.hutool.json.JSONObject;
-
-import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import com.example.springboot.entity.Out_slice;
+import com.example.springboot.entity.Queue;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
-import com.example.springboot.entity.north_glass_buffer1;
import com.example.springboot.mapper.HomeMapper;
import com.example.springboot.mapper.SpianMapper;
import com.example.springboot.service.JdbcConnections;
+import com.example.springboot.service.North_Glass_Buffer1Service;
+import com.example.springboot.service.SpianService;
+
public class Plchome extends Thread {
@Autowired
private HomeMapper homeMapper;
private SpianMapper spianMapper;
+ private SpianService spianService;
+ private North_Glass_Buffer1Service north_Glass_Buffer1Service;
private JdbcConnections dbserve;
- private JdbcConnections jdbcConnections;
-
+ //鍑虹墖闃熷垪鏄惁鍏佽鍑虹墖
+ public static Boolean isAllowQueue=true;
+ //閾濇id
+ public static String FrameNo;
+ //鏄惁闇�瑕佹墜鍔ㄧ‘璁ょ幓鐠�
+ public static Boolean isConfirm=false;
+ // public static Map b=new HashMap<>();
+ // b.put()
@Override
public void run() {
while (this != null) {
@@ -37,7 +46,8 @@
// 娉ㄥ叆mapper
homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
- jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
+ spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
+ north_Glass_Buffer1Service = WebSocketServer.applicationContext.getBean(North_Glass_Buffer1Service.class);
// 绗煎瓙浣跨敤鎯呭喌
List<StorageCage> tableData = homeMapper.selectAll();
jsonObject.append("tableData", tableData);
@@ -53,30 +63,6 @@
// 杩涘嚭鐗囦换鍔�
List<StorageCage> tasklist1 = homeMapper.selectinout(3);
List<StorageCage> tasklist2 = homeMapper.selectinout(2);
- for (StorageCage storageCage : tasklist1) {
- // storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
- try {
- storageCage.setnorth_glass_buffer1s(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("", "", ""));
- } catch (SQLException e) {
- e.printStackTrace();
- }
- try {
- storageCage.setnorth_glass_buffer1s(
- jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(storageCage.getGlassId(), "", ""));
- } catch (SQLException e) {
- e.printStackTrace();
- }
- }
- for (StorageCage storageCage : tasklist2) {
- // storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
- try {
- storageCage.setnorth_glass_buffer1s(
- jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(storageCage.getGlassId(), "", ""));
- } catch (SQLException e) {
- e.printStackTrace();
- }
-
- }
jsonObject.append("tasklist1", tasklist1);
jsonObject.append("tasklist2", tasklist2);
// 鏌ヨ鎶ヨ淇℃伅
@@ -101,46 +87,74 @@
// if (inglassInfo.size() > 0)
// jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
// }
+
// 浼� 鑾峰彇杩涙槸鍚︽湁寰呯‘璁ょ殑鐜荤拑id
String queid = spianMapper.Selectqueueid();
int state = spianMapper.Selectqueuestate();
jsonObject.append("queid", queid);
jsonObject.append("state", state);
// 鑾峰彇鎵爜浣嶄笌涓婄墖浣嶇幓鐠冧俊鎭�
- String queueglassid2 = homeMapper.GetQueueInfo(2);
- String queueglassid1 = homeMapper.GetQueueInfo(1);
- // north_glass_buffer1 form2 = homeMapper.SelectGlassByGlassID(queueglassid2);
- // north_glass_buffer1 form3 = homeMapper.SelectGlassByGlassID(queueglassid1);
-
- north_glass_buffer1 form2;
- if(queueglassid2.length()!=0){
- try {
- form2 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(queueglassid2, "", "");
- jsonObject.append("form2", form2);
- } catch (SQLException e) {
- e.printStackTrace();
- }
+ Queue form2 = homeMapper.GetQueueInfo(2);
+ Queue form3 = homeMapper.GetQueueInfo(1);
+ if(form2.getglassId()!=null&&form2.getglassId()!=""){
+ jsonObject.append("form2", form2);
}
-
- north_glass_buffer1 form3;
- if(queueglassid1.length()!=0){
- try {
- form3 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(queueglassid1, "", "");
- jsonObject.append("form3", form3);
- } catch (SQLException e) {
- e.printStackTrace();
- }
+ if(form3.getglassId()!=null&&form3.getglassId()!=""){
+ jsonObject.append("form3", form3);
}
-
-
// 鑾峰彇鍑虹墖闃熷垪淇℃伅
List<Out_slice> listoutslice = homeMapper.SelectProductionqueue();
for (Out_slice out_slice : listoutslice) {
- out_slice.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(out_slice.getGlassId()));
out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
}
jsonObject.append("listoutslice", listoutslice);
+ //鑾峰彇褰撳墠鍑虹墖闃熷垪鐘舵��
+ jsonObject.append("isAllowQueue",Plchome.isAllowQueue);
+ //鑾峰彇閾濇idDB106.DBW64
+ // String frameno=spianService.queGlassid("DB106.24",14).toString();
+ // if(frameno!=Plchome.FrameNo){
+ // Plchome.FrameNo=frameno;
+ // }
+ // Plchome.FrameNo="123";
+ // try {
+ // north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
+ // } catch (SQLException e) {
+ // // TODO Auto-generated catch block
+ // e.printStackTrace();
+ // }
+ //鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
+ jsonObject.append("isConfirm", isConfirm);
+
+ //閾濇绾夸氦浜�
+
+ // //閾濇id璇锋眰瀛�
+ // List<Short> framerequest = S7control.getinstance().ReadWord("閾濇id璇锋眰瀛楀湴鍧�", 1);
+ // if(framerequest!=null){
+ // //閾濇id
+ // String franmeno= spianService.queGlassid("閾濇id鍦板潃", 14).toString();
+ // String position;
+ // try {
+ // position=dbserve.SelectPositionByFrameBarcode(franmeno);
+ // } catch (SQLException e) {
+ // // TODO Auto-generated catch block
+ // position="0";
+ // e.printStackTrace();
+ // }
+ // Short send;
+ // if(position=="0"){
+ // send=0;
+ // }else{
+ // send=1;
+ // }
+ // S7control.getinstance().WriteWord("閾濇缈昏浆鍙戦�佸湴鍧�", (short)send);
+ // }
+
+
+
+
+
+
dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
boolean dbconnected = false;
try {
@@ -157,6 +171,8 @@
sendwServer.sendMessage(jsonObject.toString());
}
+
+
}
}
}
--
Gitblit v1.8.0