From ad71edbf0f9d2cf2bc46cd2ba1e0239f80949e68 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 21 十二月 2023 15:12:56 +0800
Subject: [PATCH] 增加清除id调用终止出片任务

---
 springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java |  364 ++++++++++++++++++++++++++++-----------------------
 1 files changed, 202 insertions(+), 162 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..66b3252 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,162 +1,202 @@
-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.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;
-    private JdbcConnections jdbcConnections;
-
-    @Override
-    public void run() {
-        while (this != null) {
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            JSONObject jsonObject = new JSONObject();
-
-            // 娉ㄥ叆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);
-            // 鏍肩悊鐗囩鏍煎瓙鐘舵��
-            List<StorageCage> cagelist1 = homeMapper.selectRack1();
-            List<StorageCage> cagelist2 = homeMapper.selectRack2();
-            List<StorageCage> cagelist3 = homeMapper.selectRack3();
-            List<StorageCage> cagelist4 = homeMapper.selectRack4();
-            jsonObject.append("cagelist1", cagelist1);
-            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()));
-                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);
-            // 鏌ヨ鎶ヨ淇℃伅
-            List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
-            jsonObject.append("alarmmg", alarmmg);
-            // 璇诲幓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);
-            // }
-            // // 鑾峰彇杩涚墖杞︾姸鎬�
-            // 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);
-            // }
-            // 浼� 鑾峰彇杩涙槸鍚︽湁寰呯‘璁ょ殑鐜荤拑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();
-                }
-            }
-                
-            north_glass_buffer1 form3;
-            if(queueglassid1.length()!=0){
-                try {
-                    form3 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(queueglassid1, "", "");
-                    jsonObject.append("form3", form3);
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-            }
-                
-
-            // 鑾峰彇鍑虹墖闃熷垪淇℃伅
-            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);
-
-            dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
-            boolean dbconnected = false;
-            try {
-                dbserve.getConn();
-                dbconnected = true;
-            } catch (Exception e) {
-                // TODO: handle exception
-                dbconnected = false;
-            }
-            jsonObject.append("dbconnected", dbconnected);
-            // jsonObject.append("params", new short[] { 30, 40, });
-            WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Home");
-            if (sendwServer != null) {
-                sendwServer.sendMessage(jsonObject.toString());
-            }
-
-        }
-    }
-}
+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.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.OutSliceServive;
+import com.example.springboot.service.SpianService;
+
+public class Plchome extends Thread {
+
+    @Autowired
+    private HomeMapper homeMapper;
+    private OutSliceServive outSliceServive;
+    private SpianMapper spianMapper;
+    private SpianService spianService;
+    private North_Glass_Buffer1Service north_Glass_Buffer1Service;
+    private JdbcConnections dbserve;
+    // 鍑虹墖闃熷垪鏄惁鍏佽鍑虹墖
+    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) {
+            try {
+                Thread.sleep(1000);
+
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            JSONObject jsonObject = new JSONObject();
+
+            // 娉ㄥ叆mapper
+            homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
+            spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
+            spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
+            outSliceServive = WebSocketServer.applicationContext.getBean(OutSliceServive.class);
+            north_Glass_Buffer1Service = WebSocketServer.applicationContext.getBean(North_Glass_Buffer1Service.class);
+            // 绗煎瓙浣跨敤鎯呭喌
+            List<StorageCage> tableData = homeMapper.selectAll();
+            jsonObject.append("tableData", tableData);
+            // 鏍肩悊鐗囩鏍煎瓙鐘舵��
+            List<StorageCage> cagelist1 = homeMapper.selectRack1();
+            List<StorageCage> cagelist2 = homeMapper.selectRack2();
+            List<StorageCage> cagelist3 = homeMapper.selectRack3();
+            List<StorageCage> cagelist4 = homeMapper.selectRack4();
+            jsonObject.append("cagelist1", cagelist1);
+            jsonObject.append("cagelist2", cagelist2);
+            jsonObject.append("cagelist3", cagelist3);
+            jsonObject.append("cagelist4", cagelist4);
+            // 杩涘嚭鐗囦换鍔�
+            List<StorageCage> tasklist1 = homeMapper.selectinout(3);
+            List<StorageCage> tasklist2 = homeMapper.selectinout(2);
+            jsonObject.append("tasklist1", tasklist1);
+            jsonObject.append("tasklist2", tasklist2);
+            // 鏌ヨ鎶ヨ淇℃伅
+            List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
+            jsonObject.append("alarmmg", alarmmg);
+
+            // 浼� 鑾峰彇杩涙槸鍚︽湁寰呯‘璁ょ殑鐜荤拑id
+            String queid = spianMapper.Selectqueueid();
+            int state = spianMapper.Selectqueuestate();
+            jsonObject.append("queid", queid);
+            jsonObject.append("state", state);
+            // 鑾峰彇鎵爜浣嶄笌涓婄墖浣嶇幓鐠冧俊鎭�
+            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 = outSliceServive.SelectProductionqueue();
+            jsonObject.append("listoutslice", listoutslice);
+            // 鑾峰彇褰撳墠鍑虹墖闃熷垪鐘舵��
+            jsonObject.append("isAllowQueue", Plchome.isAllowQueue);
+            // 鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
+            jsonObject.append("isConfirm", isConfirm);
+
+            // // 璇诲幓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);
+            // }
+            // // 鑾峰彇杩涚墖杞︾姸鎬�
+            // 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);
+            // }
+
+            // // 鑾峰彇閾濇idDB106.DBW64
+            // String frameno = spianService.queGlassid("DB103.270", 14).toString();
+            // // String frameno="X12345611002GV";
+            // if (!frameno.equals(Plchome.FrameNo)) {
+            //     Plchome.FrameNo = frameno;
+            //     try {
+            //         north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
+            //     } catch (SQLException e) {
+            //         // TODO Auto-generated catch block
+            //         e.printStackTrace();
+            //     }
+            // }
+
+            // // 鑾峰彇杩涚墖璇锋眰鐘舵��
+            // List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
+            // boolean D01RequestState = D01Request.contains((short) 1);
+            // // boolean D01RequestState =true;
+            // jsonObject.append("D01RequestState", D01RequestState);
+
+            // // 澶嶄綅鍊掕鏃�
+            // // 鍦板潃104.9.6
+            // List<Boolean> countdown = S7control.getinstance().ReadBits("DB104.9.6", 1);
+            // for (Boolean countdowns : countdown) {
+            //     jsonObject.append("countdown", countdowns);
+            // }
+            // // jsonObject.append("countdown", true);
+            // // 澶嶄綅瀹屾垚淇″彿
+            // List<Boolean> resets = S7control.getinstance().ReadBits("DB103.284", 1);
+            // for (Boolean reset : resets) {
+            //     jsonObject.append("reset", reset);
+            // }
+
+            // // 鏄惁鎬ュ仠
+            // List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1", 1);
+            // for (Boolean emergencystop : emergencystops) {
+            //     jsonObject.append("emergencystop", emergencystop);
+            // }
+
+            // 閾濇绾夸氦浜�
+
+            // //閾濇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 {
+                dbserve.getConn();
+                dbconnected = true;
+            } catch (Exception e) {
+                // TODO: handle exception
+                dbconnected = false;
+            }
+            jsonObject.append("dbconnected", dbconnected);
+            // jsonObject.append("params", new short[] { 30, 40, });
+            ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
+            if (sendwServer != null) {
+                for (WebSocketServer webserver : sendwServer) {
+                    webserver.sendMessage(jsonObject.toString());
+                }
+            }
+
+        }
+    }
+}

--
Gitblit v1.8.0