CanadaMes-ui/src/configuration/ManualJog.json
@@ -4,6 +4,7 @@ "button": { "name": "D01输送", "value": 0, "value2": 0, "address": "DB10.0", "state": 0 }, @@ -13,6 +14,7 @@ "button": { "name": "D02输送", "value": 0, "value2": 0, "address": "DB10.0", "state": 0 }, @@ -22,6 +24,7 @@ "button": { "name": "D03输送", "value": 0, "value2": 0, "address": "DB10.0", "state": 1 }, @@ -31,6 +34,7 @@ "button": { "name": "D04输送", "value": 0, "value2": 0, "address": "DB10.0", "state": 1 }, @@ -40,6 +44,7 @@ "button": { "name": "D05输送", "value": 0, "value2": 0, "address": "DB10.0", "state": 1 }, @@ -49,6 +54,7 @@ "button": { "name": "D06输送", "value": 0, "value2": 0, "address": "DB10.0", "state": 1 }, @@ -58,6 +64,7 @@ "button": { "name": "A01输送正向", "value": 0, "value2": 0, "address": "DB10.0", "state": 0 }, @@ -67,6 +74,7 @@ "button": { "name": "A01输送反向", "value": 0, "value2": 0, "address": "DB10.0", "state": 1 }, @@ -77,6 +85,7 @@ "button": { "name": "A01行走点动", "value": 0, "value2": 0, "address": "DB10.0", "state": 0 }, @@ -86,6 +95,7 @@ "button": { "name": "A01翻转", "value": 0, "value2": 0, "address": "DB10.0", "state": 1 }, @@ -95,6 +105,7 @@ "button": { "name": "A01注电泵", "value": 0, "value2": 0, "address": "DB10.0", "state": 0 }, @@ -104,6 +115,7 @@ "button": { "name": "A02输送正向", "value": 0, "value2": 0, "address": "DB10.0", "state": 0 }, @@ -113,6 +125,7 @@ "button": { "name": "A02输送反向", "value": 0, "value2": 0, "address": "DB10.0", "state": 1 }, @@ -122,6 +135,7 @@ "button": { "name": "A02行走点动", "value": 0, "value2": 0, "address": "DB10.0", "state": 0 }, @@ -131,6 +145,7 @@ "button": { "name": "A02翻转", "value": 0, "value2": 0, "address": "DB10.0", "state": 1 }, @@ -143,6 +158,7 @@ "button": { "name": "A02注电泵", "value": 0, "value2": 0, "address": "DB10.0", "state": 0 }, @@ -152,6 +168,7 @@ "button": { "name": "B01输送", "value": 0, "value2": 0, "address": "DB10.0", "state": 1 }, @@ -161,6 +178,7 @@ "button": { "name": "B01行走点动", "value": 0, "value2": 0, "address": "DB10.0", "state": 1 }, @@ -171,6 +189,7 @@ "button": { "name": "B01翻转气缸", "value": 0, "value2": 0, "address": "DB10.0", "state": 0 }, @@ -180,6 +199,7 @@ "button": { "name": "B01升降气缸", "value": 0, "value2": 0, "address": "DB10.0", "state": 0 }, @@ -188,6 +208,7 @@ "button": { "name": "B01吹气", "value": 0, "value2": 0, "address": "DB10.0", "state": 1 }, @@ -197,6 +218,7 @@ "button": { "name": "B02输送", "value": 0, "value2": 0, "address": "DB10.0", "state": 1 }, @@ -210,6 +232,7 @@ "button": { "name": "B02行走点动", "value": 0, "value2": 0, "address": "DB10.0", "state": 1 }, @@ -219,6 +242,7 @@ "button": { "name": "B02翻转气缸", "value": 0, "value2": 0, "address": "DB10.0", "state": 0 }, @@ -228,6 +252,7 @@ "button": { "name": "B02升降气缸", "value": 0, "value2": 0, "address": "DB10.0", "state": 0 }, @@ -237,6 +262,7 @@ "button": { "name": "B02吹气", "value": 0, "value2": 0, "address": "DB10.0", "state": 1 }, CanadaMes-ui/src/views/Electrical/Action.vue
@@ -6,8 +6,8 @@ }}</router-link> <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> --> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
@@ -5,8 +5,8 @@ }}</router-link> <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> --> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') @@ -60,11 +60,18 @@ <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container"> <div class="item-row"> <span class="name" style="width:250px;">{{ item.name }}</span> <el-input v-if="item.type === '0'" <!-- <el-input v-if="item.type === '0'" v-model="item.value" class="input-box" :oninput="`value=value.replace(/^0|[^0-9]/g,'');if(value<`+item.min+`){value=`+item.value+`}else if(value>`+item.max+`){value=`+item.value+`}`" @keyup.enter.native="submitDataToBackend"> </el-input> --> <el-input v-if="item.type === '0'" v-model="item.value" class="input-box" @keyup.enter.native="submitDataToBackend"> </el-input> <span v-if="item.unit" :name="item.unit" >{{ item.unit }}</span> CanadaMes-ui/src/views/Electrical/ManualJog.vue
@@ -5,8 +5,8 @@ }}</router-link> <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> --> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') @@ -55,8 +55,8 @@ <div class="button-row" style="display: flex; justify-content: flex-start;flex-wrap:wrap;"> <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" style="margin: 10px;"> <el-button v-if="item.button" :name="item.button.name" style='width:200px;' :class="{ 'dow': false, 'op': item.button.value === 1 }" class="action-button" <el-button v-if="item.button" v-model="item.button.value" :name="item.button.name" style='width:200px;' :class="{ 'dow': item.button.value === 0, 'op': item.button.value === 1 }" class="action-button" @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend();">{{ item.button.name }}</el-button> @@ -89,7 +89,7 @@ if (language === 'en-US') { this.replaceChineseWithEnglish(); } this.$forceUpdate(); // this.$forceUpdate(); }, @@ -99,19 +99,19 @@ socket.close(); }, updateButtonValue (dataGroup, itemIndex) { if (dataGroup[itemIndex].button.value === 1) { if (dataGroup[itemIndex].button.value2 === 0) { // 如果当前按钮的值是 0，将其设为 1 this.$set(dataGroup[itemIndex].button, 'value', 0); this.$set(dataGroup[itemIndex].button, 'value2', 1); } else { // 否则将其设为 0 this.$set(dataGroup[itemIndex].button, 'value', 1); this.$set(dataGroup[itemIndex].button, 'value2', 0); } }, submitDataToBackend () { const inputData = this.jsonData.map(dataGroup => { return dataGroup.map(item => { if (item.type === '3') { return { value: item.button.value }; return { value: item.button.value2 }; } return null; }); @@ -168,16 +168,14 @@ let obj = JSON.parse(msg.data); const jsonData2 = this.jsonData; const parms = obj.params; console.log(obj) if(parms){ // 如果鼠标不在输入框内，更新输入框的值 // this.submitDataToBackend() const parms = obj.params; // const xiaoche = obj.params[3]; // console.log(parms); if(obj.params){ for (let i = 0; i < jsonData2.length; i++) { let arr = jsonData2[i]; for (let j = 0; j < arr.length; j++) { CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
@@ -5,8 +5,8 @@ }}</router-link> <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> --> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') CanadaMes-ui/src/views/Electrical/Parameter1.vue
@@ -5,8 +5,8 @@ }}</router-link> <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> --> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') CanadaMes-ui/src/views/Electrical/Parameter2.vue
@@ -15,13 +15,13 @@ active-class="blue-button" >{{ $t("State") }}</router-link > <router-link <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button" >{{ $t("Action") }}</router-link > >{{ $t("Action") }}</router-link --> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link CanadaMes-ui/src/views/Electrical/Positioning1.vue
@@ -15,13 +15,13 @@ active-class="blue-button" >{{ $t("State") }}</router-link > <router-link <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button" >{{ $t("Action") }}</router-link > > --> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link CanadaMes-ui/src/views/Electrical/Positioning2.vue
@@ -5,8 +5,8 @@ }}</router-link> <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> --> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') CanadaMes-ui/src/views/Electrical/ServoManualone.vue
@@ -5,8 +5,8 @@ }}</router-link> <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> --> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') @@ -215,6 +215,10 @@ submitDataToBackend(currentButtonName) { const data = []; let jsonObject; if (currentButtonName === '故障' || currentButtonName === 'Fault') { return false; } if (currentButtonName === 'A01半自动启动' || currentButtonName === 'A01 Semi-Auto Start') { const values = [this.jsonData[0][10].button.value]; @@ -428,7 +432,7 @@ } let obj = JSON.parse(msg.data); // console.log(obj) // console.log(obj) const weihuiling=obj.weihuiling; const jsonData2 = this.jsonData;
@@ -5,8 +5,8 @@ }}</router-link> <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> --> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') CanadaMes-ui/src/views/Electrical/Sign.vue
@@ -7,8 +7,8 @@ }}</router-link> <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> --> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') CanadaMes-ui/src/views/Electrical/State.vue
@@ -7,8 +7,8 @@ }}</router-link> <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> --> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') CanadaMes-ui/src/views/Electrical/alarm.vue
@@ -5,7 +5,7 @@ <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link> <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> --> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link> <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -1,191 +1,187 @@ 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); // 读去Plc进片车与出片车位置W 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); // 获取扫码位与上片位玻璃信息 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); // 获取铝框idDB106.DBW64 // String frameno=spianService.queGlassid("DB103.270",14).toString(); // if(frameno!=Plchome.FrameNo&&frameno!=""){ // Plchome.FrameNo=frameno; // } // try { // north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo); // } catch (SQLException e) { // // TODO Auto-generated catch block // e.printStackTrace(); // } // 是否需要人工确认上片玻璃 jsonObject.append("isConfirm", isConfirm); //获取进片请求状态 List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1); boolean D01RequestState = D01Request.contains((short) 1); // boolean D01RequestState =true; jsonObject.append("D01RequestState", D01RequestState); //复位倒计时 List<Boolean> countdown = S7control.getinstance().ReadBits("DB104.9.6", 1); for (Boolean countdowns : countdown) { jsonObject.append("countdown", countdowns); } //是否急停 List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1", 1); for (Boolean emergencystop : emergencystops) { jsonObject.append("emergencystop", emergencystop); } // jsonObject.append("countdown", true); // 铝框线交互 // //铝框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()); } } } } } 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); // 读去Plc进片车与出片车位置W 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); // 获取扫码位与上片位玻璃信息 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); // 获取铝框idDB106.DBW64 // String frameno=spianService.queGlassid("DB103.270",14).toString(); // if(frameno!=Plchome.FrameNo&&frameno!=""){ // Plchome.FrameNo=frameno; // } // try { // north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo); // } catch (SQLException e) { // // TODO Auto-generated catch block // e.printStackTrace(); // } // 是否需要人工确认上片玻璃 jsonObject.append("isConfirm", isConfirm); //获取进片请求状态 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); // 铝框线交互 // //铝框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()); } } } } } springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -17,25 +17,25 @@ // System.out.println("启动完成"); // new PlcHold().start(); // new PlcHold().start(); new Plchome().start(); new Plcalarm().start(); new Plcalarm().start(); new Plcsign().start(); new Plcsign().start(); new Plcaction().start(); new Plcstate().start(); new PlcPositioning1().start(); new Plcstate().start(); new PlcPositioning1().start(); new PlcParameter2().start(); new PlcParameter2().start(); new PLCAutomaticParameterSetting().start(); new PLCAutomaticParameterSetting().start(); new PlcManualonePosition().start(); new PlcManualonePosition2().start(); new PlcServoManualone().start(); new PLCManualJog().start(); new PlcManualonePosition().start(); new PlcManualonePosition2().start(); new PlcServoManualone().start(); new PLCManualJog().start(); } } springboot-vue3/src/main/resources/config.properties
@@ -54,8 +54,6 @@ #Parameter2-------------------------- #id
