根据客户需求修改复位倒计时，修改手动页面英文显示

ZengTao

2024-05-06 dae61fa269844f76ccc9edf9eb316ef5c3dd0798

 springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java

@@ -1,31 +1,25 @@
package com.example.springboot.component;



import cn.hutool.json.JSONArray;

import cn.hutool.json.JSONObject;

import lombok.extern.slf4j.Slf4j;



import java.io.IOException;

import java.sql.SQLException;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



import com.example.springboot.service.*;



import org.apache.ibatis.annotations.Result;

import org.springframework.beans.factory.annotation.Autowired;



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.entity.north_glass_buffer1;

import com.example.springboot.entity.device.PlcParameterObject;

import com.example.springboot.mapper.HomeMapper;

import com.example.springboot.mapper.SpianMapper;



@Slf4j

public class Plchome extends Thread {



    @Autowired

@@ -39,11 +33,11 @@
    public static Boolean isAllowQueue = true;

    public static Boolean isAllowReordering = true;

    // 出片队列警告

    public static Boolean isQueueWarning = true;

    public static Boolean isQueueWarning = false;

    // 铝框id

    public static String FrameNo = "";

    // 是否需要手动确认玻璃

    public static Boolean isConfirm = false;

    public static Boolean isConfirm = true;

    // 待确认的出片队列

    public static List<north_glass_buffer1> AluminumFrame;



@@ -64,6 +58,7 @@
    @Override

    public void run() {

        while (this != null) {

            Short zhi = 0;

            JSONObject jsonObject = new JSONObject();

            jsonObject.append("feedglassid", feedglassid);

            try {

@@ -77,6 +72,41 @@
                        .getBean(North_Glass_Buffer1Service.class);

                storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);

                dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);



                boolean dbconnected = false;

                try {

                    dbserve.getConn();

                    dbconnected = true;

                } catch (Exception e) {

                    e.printStackTrace();

                    dbconnected = false;

                }

                log.info("dbconnected:"+dbconnected);

                jsonObject.append("dbconnected", dbconnected);

                // // 获取当前扫码枪玻璃id

                // String CurrrentGlassId = "X22595911002GV";

                // if (CurrrentGlassId.toString() != "" && CurrrentGlassId.toString() != null) {

                // north_glass_buffer1 form6 =

                // dbserve.SelectGlassByGlassIdOrderIdFrameIdouts(CurrrentGlassId, "",

                // "");

                // if (form6.getbarcode() != null) {

                // jsonObject.append("form6", form6);

                // double width = 0;

                // double height = 0;

                // if (form6.getglassheightmm() < form6.getglasslengthmm()) {

                // height = form6.getglassheightmm();

                // width = form6.getglasslengthmm();

                // } else {

                // height = form6.getglasslengthmm();

                // width = form6.getglassheightmm();

                // }

                // if (height < 380 || width < 380 || height > 1810 || width > 2760) {

                // zhi = 600;

                // } else {

                // zhi = spianService.selectAlls(form6);

                // }

                // }

                // }



                // 笼子使用情况

                List<StorageCage> tableData = homeMapper.selectAll();

@@ -134,16 +164,18 @@
                if (S7control.getinstance().CheckConnected() == true) {



                    // 铝框线交互

                    if (S7controlLK.getinstance().CheckConnected() == true) {

                        if (CurrentFrame != null) {

                    // if (S7controlLK.getinstance().CheckConnected() == true) {

                        // E02玻璃id

                        String E02id = S7controlLK.getinstance().readStrings("DB17.40");

                        // log.info("E02id"+E02id);

                        outSliceServive.FrameStateUpdate(E02id);

                        if (CurrentFrame.getBarCode() != null) {

                            S7controlLK.getinstance().writeStrings(CurrentFrame.getBarCode(), "DB17.0");

                        }

                        String E01id = S7controlLK.getinstance().readStrings("DB17.0");

                        String J01id = S7controlLK.getinstance().readStrings("DB17.22");



                        List<Short> liststates = S7controlLK.getinstance().ReadWord("DB17.38", 1);

                        List<Short> liststate = S7controlLK.getinstance().ReadWord("DB17.20", 1);

                        Short framerequest = liststate.get(0);

                        // log.info("liststate:" + liststate);

                        if (framerequest == 1) {

                            // 铝框id

                            String position;

@@ -156,13 +188,25 @@
                            }

                            Short send;

                            if (position.equals("0")) {

                                send = 0;

                                send = 2;

                            } else {

                                send = 1;

                            }

                            if (J01id != null) {

                                int barcodeState = spianMapper.SelectOverState(J01id);// 获取该铝框的状态

                                if (barcodeState == 0) {// 当该铝框所有的玻璃都是完成状态时删除在出片队列的数据

                                    spianMapper.DeleteQueue(J01id);

                                    // log.info("deleteoutslice:" + J01id);

                                }

                            }

                            S7controlLK.getinstance().WriteWord("DB17.38", (short) send);

                        }

                    }

                        
                        String E01id = S7controlLK.getinstance().readStrings("DB17.0");

                        // log.info("frameno:" + E01id);

                        List<Short> liststates = S7controlLK.getinstance().ReadWord("DB17.38", 1);

                        // log.info("frameflip:" + liststates);

                    // }



                    // 获取当前扫码方式

                    List<Boolean> Scanningmethods = S7control.getinstance().ReadBits("DB101.11.4", 1);

@@ -173,6 +217,28 @@
                    }

                    // 获取当前扫码枪玻璃id

                    String CurrrentGlassId = spianService.queGlassid("DB103.256", 14).toString();

                    if (CurrrentGlassId.toString() != "" && CurrrentGlassId.toString() != null) {

                        north_glass_buffer1 form6 = dbserve.SelectGlassByGlassIdOrderIdFrameIdouts(CurrrentGlassId, "",

                                "");

                        if (form6.getbarcode() != null) {

                            jsonObject.append("form6", form6);

                            double width = 0;

                            double height = 0;

                            if (form6.getglassheightmm() < form6.getglasslengthmm()) {

                                height = form6.getglassheightmm();

                                width = form6.getglasslengthmm();

                            } else {

                                height = form6.getglasslengthmm();

                                width = form6.getglassheightmm();

                            }

                            if (height < 380 || width < 380 || height > 1810 || width > 2760) {

                                zhi = 600;

                            } else {

                                zhi = spianService.selectAlls(form6);

                            }

                        }

                    }



                    jsonObject.append("CurrrentGlassId", CurrrentGlassId);



                    // 获取D01-D06,A01,A02,B01,B02状态

@@ -287,42 +353,30 @@
                            width = form3.getglassheight();

                        }

                        if (height < 380 || width < 380 || height > 1810 || width > 2760) {

                            FeedState = true;

                            jsonObject.append("FeedState", FeedState);

                            FeedState = false;

                            zhi = 600;

                        } else {

                            if (D01RequestState == true && D01ResponseState != true) {

                                storageCageService.InsertQueueGlassId((short) 1, form3);

                                zhi = storageCageService.InsertQueueGlassIds((short) 1, form3);

                            }

                        }

                    }

                }

                boolean dbconnected = false;

                try {

                    dbserve.getConn();

                    dbconnected = true;

                } catch (Exception e) {

                    // TODO: handle exception

                    dbconnected = false;

                }

                jsonObject.append("dbconnected", dbconnected);

                jsonObject.append("zhi", zhi);

                
                // 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());



                        if (webserver != null) {



                        if (webserver != null && webserver.session.isOpen()) {

                            webserver.sendMessage(jsonObject.toString());

                            List<String> messages = webserver.getMessages();



                            if (!messages.isEmpty()) {

                                // // 将最后一个消息转换为整数类型的列表

                                webserver.clearMessages();

                            }



                        } else {

                            log.info("Home is closed");

                        }



                    }

                }

            } catch (InterruptedException | SQLException e) {