From 3bed56034d0a79b2748edb747b463a2cf42bc5a5 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 04 十二月 2023 09:04:11 +0800
Subject: [PATCH] 更新测试后电气管理
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 62 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 25 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 e1b1b2d..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,27 +2,31 @@
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 org.springframework.beans.factory.annotation.Autowired;
-import com.example.springboot.common.Result;
-import com.example.springboot.entity.Glass;
+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.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;
+ private JdbcConnections jdbcConnections;
+
+ public static Boolean isAllowQueue=true;
+ // public static Map b=new HashMap<>();
+ // b.put()
@Override
public void run() {
while (this != null) {
@@ -36,6 +40,7 @@
// 娉ㄥ叆mapper
homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
+ jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
// 绗煎瓙浣跨敤鎯呭喌
List<StorageCage> tableData = homeMapper.selectAll();
jsonObject.append("tableData", tableData);
@@ -45,7 +50,7 @@
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);
// 杩涘嚭鐗囦换鍔�
@@ -56,42 +61,49 @@
// 鏌ヨ鎶ヨ淇℃伅
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");
// 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();
- String state = spianMapper.Selectqueuestate();
+ int state = spianMapper.Selectqueuestate();
jsonObject.append("queid", queid);
jsonObject.append("state", state);
// 鑾峰彇鎵爜浣嶄笌涓婄墖浣嶇幓鐠冧俊鎭�
- Glass form2 = homeMapper.GetQueueInfo(1);
- Glass form3 = homeMapper.GetQueueInfo(2);
- 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", isAllowQueue);
+
dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
boolean dbconnected = false;
try {
--
Gitblit v1.8.0