From 3c74551a7f5d9f2ead6cc4a22fe8a7ec4696d8f5 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 30 十一月 2023 08:16:35 +0800
Subject: [PATCH] 完善主界面功能，添加手动任务到出片队列
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 67 +++++++--------------------------
1 files changed, 15 insertions(+), 52 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..64216cd 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
@@ -2,19 +2,18 @@
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;
+
public class Plchome extends Thread {
@@ -24,6 +23,10 @@
private JdbcConnections dbserve;
private JdbcConnections jdbcConnections;
+
+ public static Boolean isAllowQueue=true;
+ // public static Map b=new HashMap<>();
+ // b.put()
@Override
public void run() {
while (this != null) {
@@ -53,30 +56,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);
// 鏌ヨ鎶ヨ淇℃伅
@@ -107,39 +86,23 @@
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", isAllowQueue);
+
dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
boolean dbconnected = false;
--
Gitblit v1.8.0