From 209a57aecbf26911f6a3ae0692b51ed0289f5b1a Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 14 九月 2023 17:04:56 +0800
Subject: [PATCH] 优化理片笼逻辑

---
 springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java |  118 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 96 insertions(+), 22 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
index abf3fff..542e0df 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -1,36 +1,110 @@
 package com.example.springboot.component;
 
+import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.List;
 
-import javax.websocket.Session;
+import org.springframework.beans.factory.annotation.Autowired;
 
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
+import com.example.springboot.service.JdbcConnections;
+import com.example.springboot.service.SpianService;
+import com.example.springboot.entity.Glass;
+import com.example.springboot.mapper.AlarmMapper;
+import com.example.springboot.mapper.SpianMapper;
 
 public class PlcHold extends Thread {
-    @Override
-    public void run() {
-        while (this != null) {
-            try {
 
-                Thread.sleep(15000);
-            } catch (InterruptedException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-            List<Boolean> bitlist = S7control.getinstance().ReadBits("DB2.0.0", 100);
+  private AlarmMapper alarmMapper;
 
-            List<Short> paramlist = S7control.getinstance().ReadWord("DB100.6", 1);
+  @Autowired
+  private JdbcConnections jdbcConnections;
+  private SpianMapper spianMapper;
+  private SpianService spianService;
 
-            //鏌ヨ鏁版嵁搴�
-            //鎺ㄩ�佸埌鍓嶇
 
-            JSONObject jsonObject = new JSONObject();
-            jsonObject.append("params", new short[] { 0, 1, 2, 3, 4, 5, });
-            WebSocketServer sendwServer = WebSocketServer.sessionMap.get("talkvue");
-            if (sendwServer != null) {
-                sendwServer.sendMessage(jsonObject.toString());
-            }
+  @Override
+  public void run() {
+    
+    while (this != null) {
+      try {
+
+        Thread.sleep(500);
+      } catch (InterruptedException e) {
+        //\\ TODO Auto-generated catch block
+        e.printStackTrace();
+      }
+      spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
+      spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
+      jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
+      
+      //鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�
+      try {
+          Glass glass=jdbcConnections.selectGlass(112);
+
+          //System.out.println(glass.getOrderId());
+        } catch (SQLException e) {
+          // TODO Auto-generated catch block
+          e.printStackTrace();
         }
+
+    
+      //spianService.selectout("11");  
+      //鍒ゆ柇杩涚墖璇锋眰 
+       List<Short> datas1List=S7control.getinstance().ReadWord("DB106.24", 1);
+       List<Short> datas1ListState=S7control.getinstance().ReadWord("DB106.8", 1);
+
+      if(datas1List!=null &&datas1ListState!=null){
+          //鑾峰彇prc杩涚墖璇锋眰鏁版嵁
+       boolean exist = datas1List.contains((short)1); 
+       //鑾峰彇杩涚墖杞︾姸鎬�
+       boolean exist1 = datas1ListState.contains((short)0); 
+      //杩涚墖璇锋眰涓�1鏃�
+       if(exist=true){
+        //褰撹繘鐗囪溅绌洪棽鏃�
+        if(exist1=true){
+        //鑾峰彇杩涚墖id
+        List<Short> datas1ListID=S7control.getinstance().ReadWord("DB106.26", 13);
+        //鑾峰彇鐜荤拑id    
+        for(Short list1:datas1ListID){
+
+            spianService.selectAll((short)list1);
+         }
+        }
+        //System.out.println(exist);
+       }
+     }
+
+     List<Short> outlist=S7control.getinstance().ReadWord("DB106.20", 1); //鍑虹墖杞︾姸鎬�
+     List<Short> outlist2=S7control.getinstance().ReadWord("DB106.20", 1); //鍑虹墖浠诲姟瀹屾垚
+
+
+     List<Short>ceshi1=new ArrayList<Short>();//鍑虹墖杞︾姸鎬�
+     List<Short>ceshi2=new ArrayList<Short>();//鍑虹墖浠诲姟瀹屾垚
+     ceshi1.add((short)0);
+     ceshi2.add((short)1);
+     if(outlist!=null && outlist2!=null){
+      //鍒ゆ柇鎸夎鍗曞嚭鐗�
+      boolean outstate = outlist.contains((short)0); 
+      boolean outstate2 = outlist2.contains((short)1); 
+      if(outstate=true){ //鍑虹墖杞︾姸鎬佺┖闂叉椂
+        if(outstate2=true){  //鍑虹墖杞︿换鍔″畬鎴愭椂
+           String orderid=spianMapper.SelectOrderout();
+           if(orderid!=null){
+           spianService.selectout(orderid);
+        }
+       
+        }
+      }
+      
+     }
+     
+          
+
+      
+      // 鏌ヨ鏁版嵁搴�
+      // 鎺ㄩ�佸埌鍓嶇
+
     }
+  }
+  
 }

--
Gitblit v1.8.0