From a5ba96bea69ffca37f985c9503c654bf79cf9ef8 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 30 十一月 2023 16:57:37 +0800
Subject: [PATCH] 完善主界面，添加笼子表分页与根据玻璃id查询
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 58 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 22 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 60f5831..2098ce0 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,20 +1,32 @@
package com.example.springboot.component;
import cn.hutool.json.JSONObject;
+
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 {
+ @Autowired
private HomeMapper homeMapper;
private SpianMapper spianMapper;
private JdbcConnections dbserve;
+
+ public static Boolean isAllowQueue=true;
+ public static String FrameNo="";
+ // public static Map b=new HashMap<>();
+ // b.put()
@Override
public void run() {
while (this != null) {
@@ -43,18 +55,12 @@
// 杩涘嚭鐗囦换鍔�
List<StorageCage> tasklist1 = homeMapper.selectinout(3);
List<StorageCage> tasklist2 = homeMapper.selectinout(2);
- for (StorageCage storageCage : tasklist1) {
- storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
- }
- for (StorageCage storageCage : tasklist2) {
- storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
- }
jsonObject.append("tasklist1", tasklist1);
jsonObject.append("tasklist2", tasklist2);
// 鏌ヨ鎶ヨ淇℃伅
List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
jsonObject.append("alarmmg", alarmmg);
- // // 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
+ // 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
// List<String> addressList = new ArrayList<String>();
// addressList.add("DB106.12");
// addressList.add("DB106.0");
@@ -67,7 +73,7 @@
// 1);// 鑾峰彇杩涚墖杞︾姸鎬�
// boolean exist1 = datas1ListState.contains((short) 0);
// jsonObject.append("zhuangtai", exist1);
- // 鑾峰彇杩涚墖鐜荤拑淇℃伅
+ // //鑾峰彇杩涚墖鐜荤拑淇℃伅
// List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
// if (inglassInfo != null) {
// if (inglassInfo.size() > 0)
@@ -75,22 +81,30 @@
// }
// 浼� 鑾峰彇杩涙槸鍚︽湁寰呯‘璁ょ殑鐜荤拑id
String queid = spianMapper.Selectqueueid();
- String state = spianMapper.Selectqueuestate();
+ 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);
- jsonObject.append("form2", form2);
- jsonObject.append("form3", form3);
- // List<Short> paramlists = new ArrayList<Short>();
- // short para1 = 11111;
- // short para2 = 32000;
- // paramlists.add(para1);
- // paramlists.add(para2);
- // System.out.println(paramlists);
+ Queue form2 = homeMapper.GetQueueInfo(2);
+ Queue form3 = homeMapper.GetQueueInfo(1);
+ if(form2.getglassId()!=null&&form2.getglassId()!=""){
+ jsonObject.append("form2", form2);
+ }
+ if(form3.getglassId()!=null&&form3.getglassId()!=""){
+ jsonObject.append("form3", form3);
+ }
+ // 鑾峰彇鍑虹墖闃熷垪淇℃伅
+ List<Out_slice> listoutslice = homeMapper.SelectProductionqueue();
+ for (Out_slice out_slice : listoutslice) {
+ out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
+ }
+ jsonObject.append("listoutslice", listoutslice);
+ //鑾峰彇褰撳墠鍑虹墖闃熷垪鐘舵��
+ jsonObject.append("isAllowQueue",Plchome.isAllowQueue);
+ //鑾峰彇閾濇idDB106.DBW64
+ // List<Short> frameno = S7control.getinstance().ReadWord("DB106.24", 1);
+
+
dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
boolean dbconnected = false;
--
Gitblit v1.8.0