From d9b5a16b878aef6181c8124c97ff298b0d0adbcd Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 27 十一月 2023 09:22:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 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 cf088ab..60f5831 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,18 +1,10 @@
package com.example.springboot.component;
import cn.hutool.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-
-import org.springframework.web.bind.annotation.PostMapping;
-
-import com.example.springboot.common.Result;
-import com.example.springboot.entity.Glass;
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;
@@ -45,12 +37,18 @@
List<StorageCage> cagelist3 = homeMapper.selectRack3();
List<StorageCage> cagelist4 = homeMapper.selectRack4();
jsonObject.append("cagelist1", cagelist1);
- jsonObject.append("cagelist2", (Object) cagelist2);
+ jsonObject.append("cagelist2", cagelist2);
jsonObject.append("cagelist3", cagelist3);
jsonObject.append("cagelist4", cagelist4);
// 杩涘嚭鐗囦换鍔�
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);
// 鏌ヨ鎶ヨ淇℃伅
@@ -62,17 +60,18 @@
// addressList.add("DB106.0");
// List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
// if (paramlist != null) {
- // jsonObject.append("params", paramlist);
+ // jsonObject.append("params", paramlist);
// }
// // 鑾峰彇杩涚墖杞︾姸鎬�
- // List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 鑾峰彇杩涚墖杞︾姸鎬�
+ // List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
+ // 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)
- // jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
+ // if (inglassInfo.size() > 0)
+ // jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
// }
// 浼� 鑾峰彇杩涙槸鍚︽湁寰呯‘璁ょ殑鐜荤拑id
String queid = spianMapper.Selectqueueid();
@@ -80,8 +79,10 @@
jsonObject.append("queid", queid);
jsonObject.append("state", state);
// 鑾峰彇鎵爜浣嶄笌涓婄墖浣嶇幓鐠冧俊鎭�
- Glass form2 = homeMapper.GetQueueInfo(2);
- Glass form3 = homeMapper.GetQueueInfo(1);
+ 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>();
@@ -91,7 +92,6 @@
// paramlists.add(para2);
// System.out.println(paramlists);
-
dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
boolean dbconnected = false;
try {
--
Gitblit v1.8.0