From 7b2b0e91680b842e5f1598c8cd6ba89d074da371 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期五, 24 五月 2024 16:49:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java | 21 +
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 207 +++---------
UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue | 42 ++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/S7object.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/WebSocketConfig.java | 16 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterObject.java | 43 ++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml | 2
UI-Project/src/views/UnLoadGlass/Landingindication.vue | 42 ++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java | 2
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 90 +++--
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java | 8
UI-Project/src/utils/constants.js | 1
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java | 7
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 68 ++++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/S7control.java | 222 ++++--------
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/common/S7object.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java | 47 ++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 8
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java | 7
hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml | 5
UI-Project/src/utils/WebSocketService.js | 39 ++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/WebSocketServer.java | 50 ++-
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java | 3
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/S7object.java | 2
28 files changed, 548 insertions(+), 396 deletions(-)
diff --git a/UI-Project/src/utils/WebSocketService.js b/UI-Project/src/utils/WebSocketService.js
new file mode 100644
index 0000000..432bd9c
--- /dev/null
+++ b/UI-Project/src/utils/WebSocketService.js
@@ -0,0 +1,39 @@
+// WebSocketService.js
+
+let socket = null;
+
+export const initializeWebSocket = (socketUrl, messageHandler) => {
+ if (typeof WebSocket === "undefined") {
+ console.log("Your browser does not support WebSocket");
+ return null;
+ }
+
+ const socket = new WebSocket(socketUrl);
+
+ socket.onopen = function () {
+ console.log("WebSocket is now open");
+ };
+
+ socket.onmessage = (msg) => {
+ if (!msg.data) {
+ return;
+ }
+
+ const obj = JSON.parse(msg.data);
+
+ // 璋冪敤娑堟伅澶勭悊鍑芥暟锛屽皢鏁版嵁浼犻�掔粰 Vue 缁勪欢
+ if (messageHandler) {
+ messageHandler(obj);
+ }
+ };
+
+ return socket;
+ };
+
+
+ export const closeWebSocket = (socket) => {
+ if (socket && socket.readyState === WebSocket.OPEN) {
+ socket.close();
+ console.log("WebSocket connection closed");
+ }
+};
\ No newline at end of file
diff --git a/UI-Project/src/utils/constants.js b/UI-Project/src/utils/constants.js
new file mode 100644
index 0000000..8a665eb
--- /dev/null
+++ b/UI-Project/src/utils/constants.js
@@ -0,0 +1 @@
+export const WebSocketHost = "localhost";
\ No newline at end of file
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindication.vue b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
index bf305e6..a55acb0 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindication.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
@@ -32,9 +32,12 @@
</template>
<script setup>
-import { ref, watchEffect } from 'vue';
+import { ref, watchEffect ,onMounted} from 'vue';
+
import Swal from 'sweetalert2'
import request from "@/utils/request";
+import { initializeWebSocket } from '@/utils/WebSocketService';
+ import { WebSocketHost } from '@/utils/constants';
const racks = ref([
{ x: 50, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: 'NG123456' } },
@@ -110,9 +113,40 @@
}
};
-fetchFlowCardId()
-// setTimeout(fetchFlowCardId(),1000);
-//setInterval(fetchFlowCardId, 2000)
+const socketUrl = `ws://${WebSocketHost}:8085/api/talk/unloadglass2`;
+// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
+const handleMessage = (data) => {
+
+ // 鏇存柊 tableData 鐨勬暟鎹�
+
+ data.glassinfo[0].forEach((itemData, index) => {
+ if (index < racks.value.length) {
+ const rack = racks.value[index];
+ const newItem = {
+ content: itemData.item.content,
+ fillColor: itemData.item.fillColor,
+ width: itemData.item.width === 0 ? "" : 10,
+ height: itemData.item.height === 0 ? "" : 90
+ };
+
+ if (index === 2 && itemData.item.width > 0) {
+ newItem.width = 100;
+ newItem.height = 20;
+ }
+
+ rack.item = newItem;
+
+ // console.log("鏄剧ず鍥�1",racks.value); // 鎵撳嵃鏇存柊鍚庣殑 racks 鍊�
+ }
+});
+};
+
+// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
+
+onMounted(() => {
+ fetchFlowCardId(); // 鑾峰彇鏁版嵁
+ initializeWebSocket(socketUrl, handleMessage);
+});
const showCustomAlert = (content) => {
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
index e5f562f..cf75a2e 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
@@ -32,10 +32,12 @@
</template>
<script setup>
-import { ref, watchEffect } from 'vue';
+import { ref, watchEffect ,onMounted} from 'vue';
+
import Swal from 'sweetalert2'
import request from "@/utils/request";
-
+import { initializeWebSocket } from '@/utils/WebSocketService';
+ import { WebSocketHost } from '@/utils/constants';
const racks = ref([
{ x: 50, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: 'NG123456' } },
@@ -110,7 +112,41 @@
}
};
-fetchFlowCardId()
+const socketUrl = `ws://${WebSocketHost}:8085/api/talk/unloadglass3`;
+// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
+const handleMessage = (data) => {
+
+ // 鏇存柊 tableData 鐨勬暟鎹�
+
+ data.glassinfo2[0].forEach((itemData, index) => {
+ if (index < racks.value.length) {
+ const rack = racks.value[index];
+ const newItem = {
+ content: itemData.item.content,
+ fillColor: itemData.item.fillColor,
+ width: itemData.item.width === 0 ? "" : 10,
+ height: itemData.item.height === 0 ? "" : 90
+ };
+
+ if (index === 2 && itemData.item.width > 0) {
+ newItem.width = 100;
+ newItem.height = 20;
+ }
+
+ rack.item = newItem;
+
+ //console.log("鏄剧ず鍥�2",racks.value); // 鎵撳嵃鏇存柊鍚庣殑 racks 鍊�
+ }
+});
+};
+
+// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
+
+onMounted(() => {
+ fetchFlowCardId(); // 鑾峰彇鏁版嵁
+ initializeWebSocket(socketUrl, handleMessage);
+});
+
// const showCustomAlert = (content) => {
// var str="鏋跺彿 : 111\n" +
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index d4a17c1..d53fe3c 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -1,6 +1,7 @@
<script setup>
import {Search} from "@element-plus/icons-vue";
-import {reactive, onMounted} from "vue";
+import {reactive, onMounted, onBeforeUnmount} from "vue";
+
import {useRouter} from "vue-router"
const router = useRouter()
@@ -9,75 +10,24 @@
import Landingindication from "./Landingindication.vue";
import Landingindicationtwo from "./Landingindicationtwo.vue";
import request from "@/utils/request";
+import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
+ import { WebSocketHost } from '@/utils/constants';
+
const dialogFormVisiblea = ref(false)
-
-
const dialogFormVisiblea2 = ref(false)
-
-
-
-
-
-let socket;
-
-
-const initWebSocket = (token) =>{ //鍒濆鍖杦e
-
-let viewname = "unloadglass";
-
-if (typeof WebSocket === "undefined") {
- console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
-} else {
- let socketUrl = "ws://" + "localhost"+":88" + "/api/talk/" + viewname;
- if (socket != null) {
- socket.close();
- socket = null;
- }
-
- // 寮�鍚竴涓獁ebsocket鏈嶅姟
- socket = new WebSocket(socketUrl);
-
- // 鎵撳紑浜嬩欢
- socket.onopen = function () {
- console.log("websocket宸叉墦寮�");
- };
-
-
-
-socket.onmessage = (msg) => {
-if (!msg.data) {
-return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
-}
-
- let obj = JSON.parse(msg.data);
-
-
- console.log('鏀跺埌娑堟伅锛�', obj.data);
-
- }
-
- }
- }
-
-
-
// 鏁版嵁
const loading = ref(false);
-
// 寮规鏄剧ず鎺у埗
-
const dialogFormVisible = ref(false);
-
// 琛ㄥ崟鏁版嵁
const workstationId = ref('');
const flowCardId = ref('');
const flowCardOptions = ref([]);
const tableData = reactive([]);
-
// 鏂规硶
const handleSelectionChange = () => {
// 澶勭悊琛ㄦ牸琛岄�夋嫨浜嬩欢
@@ -85,15 +35,10 @@
const handleBindRack = (row) => {
workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
-
// 鍙戣捣鎺ュ彛璇锋眰鑾峰彇娴佺▼鍗″彿
fetchFlowCardId();
-
-
dialogFormVisiblea.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
};
-
-
//鑾峰彇娴佺▼鍗″彿
const fetchFlowCardId = async () => {
@@ -101,9 +46,12 @@
const response = await request.get('unLoadGlass/downWorkStation/getflowCardId');
console.log(response)
if (response.code === 200) {
- flowCardOptions.value = response.data.map(item => ({ flowcard_id: item.flow_card_Id }));
- console.log(flowCardOptions.value)
- } else {
+ flowCardOptions.value = response.data
+ .filter(item => item !== null)
+ .map(item => ({ flowcard_id: item.flow_card_Id }));
+ console.log(flowCardOptions.value);
+}
+ else {
ElMessage.error(response.msg);
}
} catch (error) {
@@ -141,19 +89,12 @@
// 鍋囪浣犵殑椤甸潰涓婃湁涓�涓悕涓� tableData 鐨� Vue 缁勪欢
// 浣犲彲浠ョ洿鎺ユ洿鏂� tableData 鐨勬暟鎹�
fetchTableData()
-
// 浣跨敤 $forceUpdate() 寮哄埗鏇存柊缁勪欢
-
+
};
-
-
const handleBindRack2 = (row) => {
workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
-
-
-
-
dialogFormVisiblea2.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
};
//娓呴櫎鍐呭
@@ -185,9 +126,6 @@
};
-
-
-
// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰
const fetchTableData = async () => {
try {
@@ -210,89 +148,36 @@
};
+const socketUrl = `ws://${WebSocketHost}:8085/api/talk/unloadglass`;
+// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
+const handleMessage = (data) => {
+
+ // 鏇存柊 tableData 鐨勬暟鎹�
+
+ tableData.splice(0, tableData.length, ...data.params[0]);
+ // console.log("鏇存柊鍚庢暟鎹�", tableData);
+
+};
+
+// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
+
+onMounted(() => {
+ fetchFlowCardId();
+ fetchTableData(); // 鑾峰彇鏁版嵁
+ initializeWebSocket(socketUrl, handleMessage);
+});
+
+onBeforeUnmount(() => {
+ console.log("鍏抽棴浜�")
+ closeWebSocket();
+});
+
+// beforeUnmount(() => {
+// closeWebSocket();
+// });
-// initWebSocket();
-onMounted(fetchTableData);
// setInterval(fetchTableData, 2000)
-
-const open = () => {
- ElMessageBox.confirm(
- '鏄惁鍒犻櫎璇ユ潯淇℃伅?',
- '鎻愮ず',
- {
- confirmButtonText: '鏄�',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- }
- )
- .then(() => {
- ElMessage({
- type: 'success',
- message: '鍒犻櫎鎴愬姛锛�',
- })
- })
- .catch(() => {
- ElMessage({
- type: 'info',
- message: '鍒犻櫎澶辫触',
- })
- })
-}
-const getTableRow = (row,type) =>{
- switch (type) {
- case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/returns/createReturns', query: { ReturnID: 'TH24010101' }})
- break
- }
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
- }
-}
-
-const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
- keepSource: true,//淇濇寔婧愭暟鎹�
- align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
- showFooter: true,//鏄剧ず鑴�
- printConfig: {},
- importConfig: {},
- exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
- showOverflow:true,
- columnConfig: {
- resizable: true,
- useKey: true
- },
- filterConfig: { //绛涢�夐厤缃」
- remote: true
- },
- customConfig: {
- storage: true
- },
- editConfig: {
- trigger: 'click',
- mode: 'row',
- showStatus: true
- },
- data: [
- {
- 'id': '1',
- 'long': '5',
- 'wide': '1005',
- 'thick': '183.6',
- }
- ],
-})
-
-
-
</script>
@@ -311,7 +196,19 @@
<el-table-column prop="racksnumber" align="center" label="宸茶惤鏋舵暟閲�" min-width="120" />
<el-table-column prop="work_state" align="center" label="鐘舵��" min-width="120" />
<el-table-column prop="deviceId" align="center" label="璁惧鍙�" min-width="120" />
- <el-table-column prop="enableState" align="center" label="鍚敤鐘舵��" min-width="120" />
+
+
+
+ <el-table-column
+ align="center"
+ label="鍚敤鐘舵��"
+ min-width="80"
+ prop="enableState"
+ >
+ <template #default="scope">
+ <el-tag type="success" >{{ scope.row.enableState==1?"鍚敤":"鏈惎鐢�" }}</el-tag>
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" align="center" width="200">
<template #default="scope">
<el-button size="mini" type="text" plain v-show="scope.row.enableState !== '宸插惎鐢�' " @click="handleBindRack(scope.row)">缁戝畾鏋跺瓙</el-button>
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterObject.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterObject.java
index b32c593..dae4ca1 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterObject.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterObject.java
@@ -1,5 +1,8 @@
package com.mes.device;
+import com.github.xingshuangs.iot.utils.IntegerUtil;
+import com.github.xingshuangs.iot.utils.ShortUtil;
+
import java.lang.reflect.Array;
import java.nio.charset.StandardCharsets;
import java.util.*;
@@ -156,15 +159,14 @@
Array.setByte(valueList, i, plcValueArray[plcParameterInfo.getAddressIndex() + i]);
}
if (plcParameterInfo.getAddressLength() == 2) {
- plcParameterInfo.setValue(String.valueOf(byte2short(valueList)));
+ plcParameterInfo.setValue(String.valueOf(ShortUtil.toUInt16(valueList)));
} else if (plcParameterInfo.getAddressLength() == 4) {
- plcParameterInfo.setValue(String.valueOf(byte2int(valueList)));
+ plcParameterInfo.setValue(String.valueOf(IntegerUtil.toUInt32(valueList)));
}
else if (plcParameterInfo.getAddressLength() >10) {
plcParameterInfo.setValue((byteToHexString(valueList)));
} else {
- String valuestr = new String(valueList);
- plcParameterInfo.setValue(valuestr);
+ plcParameterInfo.setValue((byteToHexString(valueList)));
}
}
}
@@ -194,6 +196,25 @@
}
}*/
}
+ /**
+ * 鎶婂啓鍏ュ�艰浆鍖栦负byte[]
+ * @param param 鍙傛暟瀹炰緥
+ * @param data 鍐欏叆鍊肩殑瀛楃绫诲瀷
+ */
+ public byte[] setValueToBytes(PlcParameterInfo param, String data) {
+ if (param.getAddressLength() == 2) {
+ return ShortUtil.toByteArray(Integer.parseInt(data));
+
+ } else if (param.getAddressLength() == 4) {
+
+ return IntegerUtil.toByteArray(Long.parseLong(data));
+ }
+ else if (param.getAddressLength() >10) {
+ return data.getBytes();
+ } else {
+ return data.getBytes();
+ }
+ }
/**
* short绫诲瀷杞琤yte[]
@@ -203,7 +224,7 @@
public static byte[] short2byte(short s) {
byte[] b = new byte[2];
for (int i = 0; i < 2; i++) {
- int offset = 16 - (i + 1) * 8; //鍥犱负byte鍗�4涓瓧鑺傦紝鎵�浠ヨ璁＄畻鍋忕Щ閲�
+ int offset = 16 - (i + 1) * 8; //璁＄畻鍋忕Щ閲�
b[i] = (byte) ((s >> offset) & 0xff); //鎶�16浣嶅垎涓�2涓�8浣嶈繘琛屽垎鍒瓨鍌�
}
return b;
@@ -228,14 +249,22 @@
*
* @param b byte[]绫诲瀷鍊�
*/
- public static short byte2int(byte[] b) {
- short l = 0;
+ public static int byte2int(byte[] b) {
+ int l = 0;
for (int i = 0; i < 4; i++) {
l <<= 8; //<<=鍜屾垜浠殑 +=鏄竴鏍风殑锛屾剰鎬濆氨鏄� l = l << 8
l |= (b[3-i] & 0xff); //鍜屼笂闈篃鏄竴鏍风殑 l = l | (b[i]&0xff)
}
return l;
}
+ public static byte[] int2byte(int s){
+ byte[] b = new byte[2];
+ for(int i = 0; i < 4; i++){
+ int offset = 16 - (i+1)*8; //鍥犱负byte鍗�4涓瓧鑺傦紝鎵�浠ヨ璁＄畻鍋忕Щ閲�
+ b[i] = (byte)((s >> offset)&0xff); //鎶�32浣嶅垎涓�4涓�8浣嶈繘琛屽垎鍒瓨鍌�
+ }
+ return b;
+ }
public static String byteToHexString(byte[] bytes) {
String str = new String(bytes, StandardCharsets.UTF_8).trim();
return str;
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/S7control.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/S7control.java
index 0b206d5..10e349a 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/S7control.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/S7control.java
@@ -3,9 +3,6 @@
import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
import com.github.xingshuangs.iot.protocol.s7.service.MultiAddressWrite;
import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
-import com.google.common.primitives.Bytes;
-
-import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -22,17 +19,25 @@
/**
* 鍏抽棴瑗块棬瀛恠7閫氳杩炴帴
*/
- public void CloseS7client() {
- if (s7PLC == null) {
+ public void closeS7client() {
+ if (s7PLC != null) {
s7PLC.close();
}
- s7PLC.checkConnected();
}
+ /**
+ * 閲嶅惎瑗块棬瀛恠7閫氳杩炴帴
+ */
+ public void reStartS7client() {
+ if (s7PLC != null) {
+ s7PLC.hotRestart();
+ }
+ }
+
/**
* s7閫氳杩炴帴鐘舵��
*/
- public boolean CheckConnected() {
+ public boolean checkConnected() {
return s7PLC.checkConnected();
}
@@ -42,11 +47,14 @@
* @param address 鍦板潃
* @param data word鐨勫��
*/
- public void WriteWord(String address, short data) {
+ public void writeWord(String address, int data) {
if (s7PLC == null) {
return;
}
- s7PLC.writeInt16(address, data);
+ else if(!s7PLC.checkConnected()) {
+ s7PLC.hotRestart();
+ }
+ s7PLC.writeUInt16(address, data);
}
/**
@@ -55,17 +63,20 @@
* @param address 鍦板潃
* @param datas word鐨勫��
*/
- public void WriteWord(String address, List<Short> datas) {
+ public void writeWord(String address, List<Integer> datas) {
if (s7PLC == null) {
return;
}
+ else if(!s7PLC.checkConnected()) {
+ s7PLC.hotRestart();
+ }
// s7PLC.write(address, data);
- List<String> addresslist = GetAddressList(address, datas.size(), 16);
+ List<String> addresslist = getAddressList(address, datas.size(), 16);
MultiAddressWrite addressWrite = new MultiAddressWrite();
for (int i = 0; i < datas.size(); i++) {
- addressWrite.addInt16(addresslist.get(i), datas.get(i));
+ addressWrite.addUInt16(addresslist.get(i), datas.get(i));
}
- s7PLC.writeMultiData(addressWrite);
+ s7PLC.writeMultiData(addressWrite);
}
/**
@@ -82,11 +93,14 @@
* @param address 鍦板潃
* @param data Bit鐨勫��
*/
- public void WriteBit(String address, Boolean data) {
+ public void writeBit(String address, Boolean data) {
if (s7PLC == null) {
return;
}
- s7PLC.writeBoolean(address, data);
+ else if(!s7PLC.checkConnected()) {
+ s7PLC.hotRestart();
+ }
+ s7PLC.writeBoolean(address, data);
}
/**
@@ -95,9 +109,12 @@
* @param address 鍦板潃
* @param datas bit鐨勫��
*/
- public void WriteBit(List<String> address, List<Boolean> datas) {
+ public void writeBit(List<String> address, List<Boolean> datas) {
if (s7PLC == null) {
return;
+ }
+ else if(!s7PLC.checkConnected()) {
+ s7PLC.hotRestart();
}
// s7PLC.write(address, data);
@@ -105,7 +122,7 @@
for (int i = 0; i < address.size(); i++) {
addressWrite.addBoolean(address.get(i), datas.get(i));
}
- s7PLC.writeMultiData(addressWrite);
+ s7PLC.writeMultiData(addressWrite);
}
/**
@@ -114,17 +131,20 @@
* @param address 鍦板潃
* @param datas word鐨勫��
*/
- public void WriteBit(String address, List<Boolean> datas) {
+ public void writeBit(String address, List<Boolean> datas) {
if (s7PLC == null) {
return;
}
+ else if(!s7PLC.checkConnected()) {
+ s7PLC.hotRestart();
+ }
// s7PLC.write(address, data);
- List<String> addresslist = GetAddressList(address, datas.size(), 1);
+ List<String> addresslist = getAddressList(address, datas.size(), 1);
MultiAddressWrite addressWrite = new MultiAddressWrite();
for (int i = 0; i < datas.size(); i++) {
addressWrite.addBoolean(addresslist.get(i), datas.get(i));
}
- s7PLC.writeMultiData(addressWrite);
+ s7PLC.writeMultiData(addressWrite);
}
/**
@@ -133,11 +153,14 @@
* @param address 鍦板潃
* @param datas byte鐨勫��
*/
- public void WriteByte(String address, byte[] datas) {
+ public void writeByte(String address, byte[] datas) {
if (s7PLC == null) {
return;
}
- // s7PLC.write(address, data);
+ else if(!s7PLC.checkConnected()) {
+ s7PLC.hotRestart();
+ }
+ // s7PLC.write(address, data);
s7PLC.writeByte(address, datas);
}
@@ -147,31 +170,21 @@
* @param address 鍦板潃
* @return 缁撴灉
*/
- public List<Short> ReadWord(List<String> address) {
+ public List<Integer> readWord(List<String> address) {
if (s7PLC == null) {
return null;
}
try {
- return s7PLC.readInt16(address);
+ return s7PLC.readUInt16(address);
} catch (Exception e) {
+ s7PLC.hotRestart();
System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
return null;
}
}
- private int getIndexFromAddress(String address) {
-
- // 鍙互瑙ｆ瀽鍑哄湴鍧�涓殑鏁板瓧閮ㄥ垎锛屽苟杞崲涓烘暣鏁�
- return 0;
- }
-
- private String getAddressFromIndex(int index) {
-
- // 鏁存暟杞崲涓哄湴鍧�鏍煎紡鐨勫瓧绗︿覆
- return "";
- }
/**
* 鎸夋寚瀹氱殑鍦板潃 璇诲彇word缁撴灉闆�
@@ -180,15 +193,16 @@
* @param count 杩炵画璇诲灏戜釜word
* @return 缁撴灉
*/
- public List<Short> ReadWord(String address, int count) {
+ public List<Integer> readWord(String address, int count) {
if (s7PLC == null) {
return null;
}
- List<String> addresslist = GetAddressList(address, count, 16);
+ List<String> addresslist = getAddressList(address, count, 16);
try {
- return s7PLC.readInt16(addresslist);
+ return s7PLC.readUInt16(addresslist);
} catch (Exception e) {
+ s7PLC.hotRestart();
System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
return null;
@@ -202,7 +216,7 @@
* @param count 杩炵画璇诲灏戜釜byte
* @return 缁撴灉
*/
- public byte[] ReadByte(String address, int count) {
+ public byte[] readByte(String address, int count) {
if (s7PLC == null) {
return null;
}
@@ -212,6 +226,7 @@
return s7PLC.readByte(address, count);
} catch (Exception e) {
// 澶勭悊寮傚父
+ s7PLC.hotRestart();
System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
return null;
}
@@ -224,14 +239,21 @@
* @param addresslist 鍦板潃闆�
* @return Boolean缁撴灉
*/
- public List<Boolean> ReadBits(List<String> addresslist) {
+ public List<Boolean> readBits(List<String> addresslist) {
if (s7PLC == null) {
return null;
}
- return s7PLC.readBoolean(addresslist);
+ try {
+ return s7PLC.readBoolean(addresslist);
+ } catch (Exception e) {
+ // 澶勭悊寮傚父
+ s7PLC.hotRestart();
+ return null;
+ }
+
}
- //璇诲彇涓嶈繛缁湴鍧�bit
+ /* //璇诲彇涓嶈繛缁湴鍧�bit
public List<Boolean> readBits(List<String> addressList) {
if (s7PLC == null || addressList.isEmpty()) {
return null;
@@ -249,30 +271,10 @@
}
return values;
- }
+ }*/
- //璇诲彇StringList
- public List<String> readStrings(List<String> addressList) {
- if (s7PLC == null) {
- return null;
- }
- List<String> result = new ArrayList<>();
- for (String address : addressList) {
- try {
- byte[] bytes = s7PLC.readByte(address, 14);
- if (bytes != null) {
- String str = new String(bytes, StandardCharsets.UTF_8);
- result.add(str);
- }
- } catch (Exception e) {
- System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
- result.add(null);
- }
- }
- return result;
- }
//璇诲彇瀛楃涓�
public String readString(String address) {
@@ -282,81 +284,13 @@
try {
return s7PLC.readString(address);
} catch (Exception e) {
+ s7PLC.hotRestart();
System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
return null;
}
}
- //涓嶈繛缁湴鍧�鍐欏叆Word
- public void WriteWord(List<String> address, List<Short> datas) {
- if (s7PLC == null) {
- return;
- }
-
- for (int i = 0; i < address.size(); i++) {
- String addr = address.get(i);
- short data = datas.get(i);
-
- if (addr.contains("-")) {
- outmesid(String.valueOf(data), addr); // 鍗曠嫭澶勭悊甯︾牬鎶樺彿鐨勫湴鍧�
- } else {
- s7PLC.writeInt16(addr, data); // 灏嗘暟鎹啓鍏ュ崟涓湴鍧�
- }
- }
- }
-
-
- //瀛楃涓插啓鍏�
- public void outmesid(String data, String addr) {
-// System.out.println("outmesid: " + data);
- List<Byte> glassidlist = new ArrayList<>();
- String[] parts = addr.split("-");
- if (parts.length == 2) {
- addr = parts[0]; // 鍙繚鐣� "-" 鍓嶉潰鐨勯儴鍒�
- }
- for (char iditem : data.toCharArray()) {
- glassidlist.add(Byte.valueOf(String.valueOf(iditem)));
- }
- byte[] bytes = Bytes.toArray(glassidlist);
- WriteByte(addr, bytes);
- }
-
- //璇诲彇涓嶈繛缁瓀ord
- public List<Short> readWords(List<String> addresses) {
- if (s7PLC == null) {
- return null;
- }
- List<Short> data = new ArrayList<>();
-
- for (String address : addresses) {
- try {
- // 鍗曚釜鍦板潃
- Short value = s7PLC.readInt16(address);
- data.add(value);
- } catch (Exception e) {
- System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
-
- }
-
- }
- return data;
- }
-
- //璇诲彇鍗曚釜word
- public Short readWord(String address) {
- if (s7PLC == null) {
- return null;
- }
- try {
- // 鍗曚釜鍦板潃
- return s7PLC.readInt16(address);
- } catch (Exception e) {
- System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
-
- }
- return -1;
- }
//璇诲彇鏃堕棿
public Long readtime(String address) {
@@ -366,6 +300,7 @@
try {
return s7PLC.readTime(address);
} catch (Exception e) {
+ s7PLC.hotRestart();
System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
return null;
}
@@ -373,17 +308,16 @@
public void writetime(String address, long datas) {
- if (s7PLC == null)
+ if (s7PLC == null) {
return;
+ }
+ else if(!s7PLC.checkConnected())
+ {
+ s7PLC.hotRestart();
+ }
s7PLC.writeTime(address, datas); // 灏嗘暟鎹啓鍏ュ崟涓湴鍧�
- }
-
-
- private int extractAddressNumber(String address) {
- String numberStr = address.replaceAll("\\D+", ""); // 浣跨敤姝ｅ垯琛ㄨ揪寮忔彁鍙栨暟瀛楅儴鍒�
- return Integer.parseInt(numberStr);
}
@@ -394,13 +328,15 @@
* @param count 闀垮害
* @return Boolean缁撴灉
*/
- public List<Boolean> ReadBits(String address, int count) {
- if (s7PLC == null)
+ public List<Boolean> readBits(String address, int count) {
+ if (s7PLC == null) {
return null;
- List<String> addresslist = GetAddressList(address, count, 1);
+ }
+ List<String> addresslist = getAddressList(address, count, 1);
try {
return s7PLC.readBoolean(addresslist);
} catch (Exception e) {
+ s7PLC.hotRestart();
System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
return null;
}
@@ -410,7 +346,7 @@
;
- private List<String> GetAddressList(String address, int count, int addedbit) {
+ private List<String> getAddressList(String address, int count, int addedbit) {
List<String> addresslist = new ArrayList<String>();
String[] stringdatas = address.trim().split("\\.");
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/S7object.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/S7object.java
index abc0718..53a7864 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/S7object.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/S7object.java
@@ -52,7 +52,7 @@
e.printStackTrace();
}
- byte[] getplcvlues = plccontrol.ReadByte(PlcMesObject.getPlcAddressBegin(), PlcMesObject.getPlcAddressLength());
+ byte[] getplcvlues = plccontrol.readByte(PlcMesObject.getPlcAddressBegin(), PlcMesObject.getPlcAddressLength());
PlcMesObject.setPlcParameterList(getplcvlues);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
index a9d0721..8c2763e 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
@@ -19,9 +19,10 @@
/**
* 鏌ヨ绗煎唴绂绘寚瀹氭牸瀛愭渶杩戠┖鏍�
+ *
* @return
*/
- EdgStorageCage selectNearestEmpty(int currentSlot);
+ EdgStorageCage selectNearestEmpty(int currentSlot, boolean flag);
/**
* 鏌ヨ绗煎唴绌烘牸
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
index f94d854..5d27ac4 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
@@ -37,7 +37,7 @@
UpPattenUsageMapper upPattenUsageMapper;
@Override
- public EdgStorageCage selectNearestEmpty(int currentSlot) {
+ public EdgStorageCage selectNearestEmpty(int currentSlot, boolean flag) {
List<EdgStorageCage> emptyList = this.selectJoinList(EdgStorageCage.class, new MPJLambdaWrapper<EdgStorageCage>()
.selectAll(EdgStorageCage.class)
.leftJoin(EdgStorageCageDetails.class, on -> on
@@ -46,7 +46,10 @@
.isNull(EdgStorageCageDetails::getSlot)
.last("order by abs(t.slot - " + currentSlot + ") asc limit 2")
);
- if (CollectionUtil.isEmpty(emptyList) || emptyList.size() < 2) {
+ if (flag && CollectionUtil.isNotEmpty(emptyList)) {
+ return emptyList.get(0);
+ }
+ if (CollectionUtil.isEmpty(emptyList) || emptyList.size() == 1) {
return null;
}
return emptyList.get(0);
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
index c0126b4..a3615de 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -86,7 +86,7 @@
return;
}
log.info("2銆佽幏鍙栧埌鐨勮姹傚瓧涓�0锛屽皢纭瀛楁敼涓�0");
- S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 0);
+ S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, (short) 0);
return;
}
if (!"0".equals(confirmationWrodValue)) {
@@ -104,14 +104,10 @@
} else if ("3".equals(taskRequestTypeValue)) {
log.info("2銆佽繘鐗囧拰鍑虹墖閮界┖闂诧紝鎵ц鍑虹墖浠诲姟");
//鍔犵瀛愰噷闈㈡槸鍚︽湁鐜荤拑锛屾湁鍏堝嚭锛屾棤鐜荤拑鍏堣繘
- if (("1".equals(out08Glassstate) || "1".equals(out10Glassstate))) {
- boolean outFlase = outTo(Integer.parseInt(out08Glassstate),
- Integer.parseInt(out10Glassstate), confirmationWrodAddress, glassIdeValue, Integer.parseInt(currentSlot));
- log.info("鍑虹墖浠诲姟鏄惁瀹屾垚锛歿},澶辫触涓旂幓鐠僫d:{}涓嶄负绌哄垯鎵ц杩涚墖浠诲姟", outFlase, glassIdeValue);
- if (!outFlase && StringUtils.isNotBlank(glassIdeValue)) {
- inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
- }
- } else {
+ boolean outFlase = outTo(Integer.parseInt(out08Glassstate),
+ Integer.parseInt(out10Glassstate), confirmationWrodAddress, glassIdeValue, Integer.parseInt(currentSlot));
+ log.info("鍑虹墖浠诲姟鏄惁瀹屾垚锛歿},澶辫触涓旂幓鐠僫d:{}涓嶄负绌哄垯鎵ц杩涚墖浠诲姟", outFlase, glassIdeValue);
+ if (!outFlase && StringUtils.isNotBlank(glassIdeValue)) {
inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
}
}
@@ -155,7 +151,7 @@
}
log.info("2銆佽幏鍙栧埌鐨勭幓鐠冧俊鎭负{}", glassInfo);
//娣诲姞杩涚墖浠诲姟 鏌ユ壘绌烘牸
- EdgStorageCage nearestEmpty = edgStorageCageService.selectNearestEmpty(Integer.parseInt(currentSlot));
+ EdgStorageCage nearestEmpty = edgStorageCageService.selectNearestEmpty(Integer.parseInt(currentSlot), Boolean.FALSE);
Assert.isTrue(null != nearestEmpty, "鏍煎瓙宸叉弧");
log.info("3銆佹煡璇㈠崸寮忕悊鐗囩閲岄潰鐨勭┖鏍�:{}", nearestEmpty);
@@ -171,7 +167,7 @@
boolean taskCache = saveTaskCache(details.getGlassId(), 0, nearestEmpty.getSlot(), Const.GLASS_CACHE_TYPE_IN);
log.info("6銆佺敓鎴愯繘鐗囦换鍔′俊鎭瓨鍏ヤ换鍔¤〃鏄惁瀹屾垚锛歿}", taskCache);
- S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 1);
+ S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, (short) 1);
log.info("7銆佸彂閫佺‘璁ゅ瓧瀹屾垚");
@@ -200,7 +196,10 @@
// 1.2.3銆佹寜鐓у嚭鐗囦俊鎭幓璇︽儏琛ㄦ煡璇㈡牸瀛愬湪绗煎瓙閲岄潰鍓╀綑鐩稿悓灏哄鐨勭幓鐠冩暟鎹笖浠ョ増鍥緄d銆佺増搴忓崌搴忔帓搴� 鍙栫涓�鍧楃幓鐠冨嚭鐗�
// 2銆佸鏋滄病鏈夊巻鍙插嚭鐗囦换鍔�
// 2.1銆佸嚭褰撳墠鐗堝浘id鏈�灏忕増搴忔渶灏忕殑鐜荤拑锛堥棶棰橈細涓ゆ潯绾块兘娌℃湁鍘嗗彶浠诲姟锛屽嚭鐗囨椂涓ゆ潯绾跨殑鐜荤拑灏哄鐩稿悓锛屾槸鍚︽壘灏哄涓嶅悓鐨勶級
- Assert.isFalse(out08Glassstate == 0 && out10Glassstate == 0, "A09銆丄10閮芥湁鐜荤拑锛屾棤娉曞嚭鐗�");
+ if (out08Glassstate == 2 && out10Glassstate == 2) {
+ log.info("A09銆丄10涓簕},{}闈炶嚜鍔ㄧ姸鎬侊紝鏃犳硶鍑虹墖");
+ return Boolean.FALSE;
+ }
log.info("0銆佸嚭鐗囦换鍔″嚭鐨勭姸鎬�:A09:銆恵}銆�;A10:銆恵}銆�)", out08Glassstate, out10Glassstate);
//瀹氫箟鍑虹墖鐜荤拑淇℃伅
int endcell = 0;
@@ -220,8 +219,9 @@
endcell = queryLineByGlassInfo(a09EdgGlass, a10EdgGlass, glassInfo, out08Glassstate, out10Glassstate);
} else {
//鍒ゆ柇涓ゆ潯绾挎槸鍚﹂兘绌洪棽
- endcell = out08Glassstate == 1 ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
- if (out08Glassstate == 1 && out10Glassstate == 1) {
+ endcell = out08Glassstate == 1 || out10Glassstate == 2 ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
+
+ if ((out08Glassstate == 0 && out10Glassstate == 0) || (out08Glassstate == 1 && out10Glassstate == 1)) {
EdgStorageCageDetails a09EdgGlass = queryGlassByTaskCache(Const.A09_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT);
EdgStorageCageDetails a10EdgGlass = queryGlassByTaskCache(Const.A10_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT);
if (a09EdgGlass == null && a10EdgGlass == null) {
@@ -258,7 +258,10 @@
} else {
//鑾峰彇绗煎唴鎵�鏈夌幓鐠冧俊鎭紝鍖呮嫭寰呰繘鐗囩殑
List<EdgStorageCageDetails> glassList = queryEdgAllGlass(glassId);
- Assert.isTrue(CollectionUtil.isNotEmpty(glassList), "绗煎唴鍜屽緟杩涚墖閮芥病鏈夌幓鐠�");
+ if (CollectionUtil.isEmpty(glassList)) {
+ log.info("绗煎唴鍜屽緟杩涚墖閮芥病鏈夌幓鐠�");
+ return Boolean.FALSE;
+ }
if (glassList.size() == 1 && glassId.equals(glassList.get(0).getGlassId())) {
glassInfo = glassList.get(0);
} else {
@@ -402,23 +405,46 @@
*/
private Integer queryLineByGlassInfo(EdgStorageCageDetails a08EdgStorageCageDetails, EdgStorageCageDetails a10EdgStorageCageDetails,
EdgStorageCageDetails glassInfo, int out08Glassstate, int out10Glassstate) {
- if (a08EdgStorageCageDetails != null && a08EdgStorageCageDetails.getHeight().equals(glassInfo.getHeight())
- && a08EdgStorageCageDetails.getWidth().equals(glassInfo.getWidth()) && out08Glassstate == 1) {
- return Const.A09_OUT_TARGET_POSITION;
+ boolean b08 = a08EdgStorageCageDetails != null && a08EdgStorageCageDetails.getHeight().equals(glassInfo.getHeight())
+ && a08EdgStorageCageDetails.getWidth().equals(glassInfo.getWidth());
+ boolean b10 = a10EdgStorageCageDetails != null && a10EdgStorageCageDetails.getHeight().equals(glassInfo.getHeight())
+ && a10EdgStorageCageDetails.getWidth().equals(glassInfo.getWidth());
+ //瀛樺湪鍑虹墖浠诲姟 07涓虹┖
+ if (a08EdgStorageCageDetails == null && a10EdgStorageCageDetails == null) {
+ return queryLineNoTask(out08Glassstate, out10Glassstate);
+ } else {
+ if (b08) {
+ return queryLineHasTask(out08Glassstate);
+ }
+ if (b10) {
+ return queryLineHasTask(out10Glassstate);
+ }
+ return queryLineNoTask(out08Glassstate, out10Glassstate);
}
- if (a10EdgStorageCageDetails != null && a10EdgStorageCageDetails.getHeight().equals(glassInfo.getHeight())
- && a10EdgStorageCageDetails.getWidth().equals(glassInfo.getWidth()) && out10Glassstate == 1) {
- return Const.A10_OUT_TARGET_POSITION;
- }
- if (out08Glassstate == 1) {
- return Const.A09_OUT_TARGET_POSITION;
- }
- if (out10Glassstate == 1) {
- return Const.A10_OUT_TARGET_POSITION;
- }
- Assert.isTrue(Boolean.FALSE, "娌℃湁鎵惧埌鍑虹墖璺緞");
- return 0;
}
+
+ /**
+ * 鑾峰彇鏈変换鍔″悗鐨勫嚭鐗囬�昏緫
+ */
+ private Integer queryLineHasTask(int outGlassstate) {
+ return outGlassstate == 2 ? Const.A10_OUT_TARGET_POSITION : Const.A09_OUT_TARGET_POSITION;
+ }
+
+ /**
+ * 鑾峰彇鏃犱换鍔″悗鐨勫嚭鐗囬�昏緫
+ *
+ * @return
+ */
+ private Integer queryLineNoTask(int out08Glassstate, int out10Glassstate) {
+ if (out08Glassstate == 2) {
+ return Const.A10_OUT_TARGET_POSITION;
+ }
+ if (out10Glassstate == 2 || out08Glassstate == 1) {
+ return Const.A09_OUT_TARGET_POSITION;
+ }
+ return Const.A10_OUT_TARGET_POSITION;
+ }
+
/**
* 鎸夌収灏哄鍑虹幓鐠�
@@ -504,7 +530,7 @@
log.info("5銆佺洿閫氫换鍔�,灏嗙幓鐠冧俊鎭彃鍏ュ崸寮忕悊鐗囩,褰撳墠鐜荤拑淇℃伅:{}", glassInfo);
EdgStorageCageDetails details = new EdgStorageCageDetails();
BeanUtils.copyProperties(glassInfo, details);
- EdgStorageCage nearestEmpty = edgStorageCageService.selectNearestEmpty(currentSlot);
+ EdgStorageCage nearestEmpty = edgStorageCageService.selectNearestEmpty(currentSlot, Boolean.TRUE);
Assert.isTrue(null != nearestEmpty, "鏍煎瓙宸叉弧,鏃犳硶鎵ц鐩撮�氫换鍔�");
log.info("3銆佹煡璇㈠崸寮忕悊鐗囩閲岄潰鐨勭┖鏍�:{}", nearestEmpty);
details.setSlot(nearestEmpty.getSlot());
@@ -527,7 +553,7 @@
}
boolean glassSizeStatus = saveGlassSize(glassInfo);
log.info("7銆佹坊鍔犲嚭鐗囩幓鐠冨昂瀵镐俊鎭埌纾ㄨ竟鍓嶇幓鐠冭〃鏄惁瀹屾垚锛歿}", glassSizeStatus);
- S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 1);
+ S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, (short) 1);
log.info("8銆佸彂閫佺‘璁ゅ瓧宸插畬鎴�");
return Boolean.TRUE;
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/common/S7object.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/common/S7object.java
index 785ef2f..ac57db3 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/common/S7object.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/common/S7object.java
@@ -51,7 +51,7 @@
e.printStackTrace();
}
- byte[] getplcvlues= plccontrol.ReadByte(PlcMesObject.getPlcAddressBegin(),PlcMesObject.getPlcAddressLength());
+ byte[] getplcvlues = plccontrol.readByte(PlcMesObject.getPlcAddressBegin(), PlcMesObject.getPlcAddressLength());
PlcMesObject.setPlcParameterList(getplcvlues);
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java
index ed8f92d..f5e434b 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java
@@ -51,7 +51,7 @@
e.printStackTrace();
}
- byte[] getplcvlues = plccontrol.ReadByte(PlcMesObject.getPlcAddressBegin(), PlcMesObject.getPlcAddressLength());
+ byte[] getplcvlues = plccontrol.readByte(PlcMesObject.getPlcAddressBegin(), PlcMesObject.getPlcAddressLength());
PlcMesObject.setPlcParameterList(getplcvlues);
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
index bdae975..a019c7c 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
@@ -52,10 +52,10 @@
int workId = upwork.getWorkstationId();//宸ヤ綅id
double width = upwork.getPatternWidth();//瀹藉害
double height = upwork.getPatternHeight();//楂樺害
- S7object.getinstance().plccontrol.WriteWord(plcParameterObject.getPlcParameter("WorkId").getAddress(), (short) workId);
- S7object.getinstance().plccontrol.WriteWord(plcParameterObject.getPlcParameter("GlassWidth").getAddress(), (short) width);
- S7object.getinstance().plccontrol.WriteWord(plcParameterObject.getPlcParameter("GlassHeight").getAddress(), (short) height);
- S7object.getinstance().plccontrol.WriteWord(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), (short) 1);
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("WorkId").getAddress(), (short) workId);
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("GlassWidth").getAddress(), (short) width);
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("GlassHeight").getAddress(), (short) height);
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), (short) 1);
//鏇存敼涓婄墖琛ㄧ姸鎬�
upPattenUsageService.updateUpPattenUsageState(upPattenUsage, workId);
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
index 9949483..38aa703 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
@@ -91,7 +91,7 @@
public String updateMesInkageLoad(short inKageWord) {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
log.info("淇敼璁惧涓ゆ爧璇锋眰涓簕}锛�0鑱旂嚎锛�1鑱斿姩", inKageWord);
- S7object.getinstance().plccontrol.WriteWord(plcParameterObject.getPlcParameter("InkageStatus").getAddress(), inKageWord);
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("InkageStatus").getAddress(), inKageWord);
return "success";
}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java
index f122d7d..bd7cb05 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java
@@ -25,8 +25,8 @@
// }
//鍙戦�佸潗鏍囦俊鎭�
public void SendCoordinate(short glassX, short glassY) {
- s7control.WriteWord("DB100.10", glassX);
- s7control.WriteWord("DB100.10", glassY);
+ s7control.writeWord("DB100.10", glassX);
+ s7control.writeWord("DB100.10", glassY);
}
//鍒ゆ柇鏄惁鍙互鍙戦�佽繘鐐変俊鍙�
@@ -41,12 +41,12 @@
//鍙戦�佽繘鐐変俊鍙�
public void SendIntoGlass(short start) {
- s7control.WriteWord("DB100.10", start);
+ s7control.writeWord("DB100.10", start);
}
//鎺ュ彈瀹屾垚瀛楀洖澶嶇‘璁ゅ瓧
public void SendIntoGlass() {
- s7control.WriteWord("DB100.10", (short) 1);
+ s7control.writeWord("DB100.10", (short) 1);
}
//鏄剧ず绛夊緟涓殑鐗堝浘
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml b/hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml
index f447221..fcf1a62 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml
@@ -31,6 +31,11 @@
<version>4.0</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-websocket</artifactId>
+ </dependency>
+
</dependencies>
<properties>
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java
index ddac7f5..252ad6f 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java
@@ -20,7 +20,7 @@
@Override
public void run(ApplicationArguments args) throws Exception {
log.info("鍚姩瀹屾垚");
- S7object.getinstance().start();
+ //S7object.getinstance().start();
}
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/S7object.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/S7object.java
index 92f56b5..15b3372 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/S7object.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/S7object.java
@@ -51,7 +51,7 @@
e.printStackTrace();
}
- byte[] getplcvlues= plccontrol.ReadByte(PlcMesObject.getPlcAddressBegin(),PlcMesObject.getPlcAddressLength());
+ byte[] getplcvlues = plccontrol.readByte(PlcMesObject.getPlcAddressBegin(), PlcMesObject.getPlcAddressLength());
PlcMesObject.setPlcParameterList(getplcvlues);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
index df1f641..d145b2c 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
@@ -29,7 +29,7 @@
@Override
public List<DownGlassTask> getUnloadingTaskState() {
QueryWrapper<DownGlassTask> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("task_stauts", 0);
+ queryWrapper.eq("task_stauts", 0).eq("task_type", 2).or().eq("task_stauts", 3);
return baseMapper.selectList(queryWrapper);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
index 173056a..ba78936 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
@@ -2,6 +2,7 @@
import com.github.yulichang.base.MPJBaseService;
import com.mes.downstorage.entity.DownStorageCageDetails;
+import com.mes.glassinfo.entity.GlassInfo;
import java.util.List;
import java.util.Map;
@@ -52,4 +53,10 @@
*/
List<DownStorageCageDetails> CacheOut1(int start, int end);
+
+
+ /**
+ * @return 鐩撮�氭煡璇�
+ */
+ List<GlassInfo> DirectConnection();
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
index f94df84..225e002 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
@@ -160,6 +160,27 @@
//
// }
+ @Override
+ public List<GlassInfo> DirectConnection(){
+ LambdaQueryWrapper<GlassInfo> queryWrapper2 = Wrappers.lambdaQuery();
+ queryWrapper2.select(GlassInfo::getFlowCardId,
+ GlassInfo::getGlassId,
+ GlassInfo::getTemperingLayoutId,
+ GlassInfo::getTemperingFeedSequence)
+ .notInSql(GlassInfo::getGlassId, "SELECT glass_id FROM down_glass_info")
+ .orderByAsc(GlassInfo::getTemperingLayoutId)
+ .orderByDesc(GlassInfo::getTemperingFeedSequence)
+ .last("LIMIT 1");
+
+ // 鏌ヨ GlassInfo 琛�
+ log.info("鐩撮�氭煡璇�");
+ return glassInfoMapper.selectList(queryWrapper2);
+
+ };
+
+
+
+
@Override
public List<DownStorageCageDetails> CacheOut1(int start, int end) {
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
index d6f8f74..40f9793 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
@@ -149,7 +149,7 @@
}
}
- @ApiOperation("鑾峰彇宸ヤ綅鏄剧ず鍥�1")
+ @ApiOperation("鑾峰彇宸ヤ綅鏄剧ず鍥�2")
@GetMapping("/getwo2")
public ResponseEntity<Map<String, Object>> getw2o() {
Map<String, Object> responseData = new HashMap<>();
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
index 69b61b3..d8361e1 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Assert;
+import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.mes.common.S7object;
import com.mes.common.config.Const;
@@ -21,6 +22,7 @@
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downglassinfo.service.DownGlassTaskService;
+import com.mes.tools.WebSocketServer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +30,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -63,7 +66,7 @@
// @Value("${mes.threshold}")
private int threshold;
- //@Scheduled(fixedDelay = 1000)
+ // @Scheduled(fixedDelay = 1000)
public void plcdownGlassTask() {
// PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
// String taskRequestTypeValue = plcParameterObject.getPlcParameter("A06_request_word").getValue();
@@ -74,14 +77,14 @@
// String G06RobotTaskRequestWord = plcParameterObject.getPlcParameter("G06RobotTaskRequestWord").getAddress();
- String taskRequestTypeValue ="3";
+ String taskRequestTypeValue ="0";
String glassIdeValue ="NG24041101C002-2-6-1-6";
String confirmationWrodValue ="1";
String outGlassstate="1";
String confirmationWrodAddress="1";
- String G11RobotTaskRequestWord ="1";
- String G06RobotTaskRequestWord ="1";
- String G13RobotTaskRequestWord ="1";
+ String G11RobotTaskRequestWord ="0";
+ String G06RobotTaskRequestWord ="0";
+ String G13RobotTaskRequestWord ="0";
log.info("1銆佽幏鍙栧埌鐨勮姹傚瓧涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{}锛岃幏鍙栧埌鐨勭‘璁ゅ瓧涓猴細{}锛岃幏鍙栧埌鐨勫嚭鐗囩姸鎬佷负锛歿}",
taskRequestTypeValue, glassIdeValue, confirmationWrodValue, outGlassstate);
@@ -127,6 +130,8 @@
+
+
}
/**
@@ -144,9 +149,19 @@
}
log.info("2銆佽幏鍙栧埌鐨勭幓鐠冧俊鎭负{}", glassInfo);
-// if(glassInfo.getFlowCardId()=){
-//
-// }
+ if (glassInfo.getGlassId().equals(downStorageCageDetailsService.DirectConnection()) ) {
+ //鐩撮��
+ log.info("3銆佸鏋滃綋鍓嶇幓鐠冨睘浜庣増鍥緄d鍜岀墖搴忕殑椤哄簭鍒欑洿閫氾紝鎵ц涓嬬墖浠诲姟");
+ DownWorkstation downWorkstation = downWorkstationService.getOne(new LambdaQueryWrapper<DownWorkstation>().eq(DownWorkstation::getFlowCardId, glassInfo.getFlowCardId()));
+ int WorkstationId=downWorkstation.getWorkstationId();
+ DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(glassInfo, "0", String.valueOf(WorkstationId), "3");
+ downGlassTaskService.insertCacheTask(downGlassTask);
+
+ }else{
+
+ log.info("4銆佸鏋滀笉灞炰簬鐗堝浘id鍜岀墖搴忕殑椤哄簭鎵ц杩涚墖浠诲姟");
+
+
//娣诲姞杩涚墖浠诲姟 鏌ユ壘绌烘牸
List<DownStorageCageDetails> list = downStorageCageService.selectCacheEmpty();
if(list.size()>0){
@@ -154,8 +169,8 @@
- log.info("3銆佹煡璇㈠崸寮忕悊鐗囩閲岄潰鐨勭┖鏍�:{}", list);
- log.info("4銆佸皢鐜荤拑淇℃伅鎻掑叆鍗у紡鐞嗙墖绗�,褰撳墠鐜荤拑淇℃伅:{}", glassInfo);
+ log.info("5銆佹煡璇㈠崸寮忕悊鐗囩閲岄潰鐨勭┖鏍�:{}", list);
+ log.info("6銆佸皢鐜荤拑淇℃伅鎻掑叆鍗у紡鐞嗙墖绗�,褰撳墠鐜荤拑淇℃伅:{}", glassInfo);
DownStorageCageDetails details = new DownStorageCageDetails();
BeanUtils.copyProperties(glassInfo, details);
details.setState(1);
@@ -163,17 +178,19 @@
details.setSlot(item.getSlot());
details.setDeviceId(item.getDeviceId());
downStorageCageDetailsService.save(details);
- log.info("5銆佺幓鐠冧俊鎭凡瀛樺叆鐞嗙墖绗艰鎯呰〃锛岀幓鐠冧俊鎭负{}", details);
+ log.info("7銆佺幓鐠冧俊鎭凡瀛樺叆鐞嗙墖绗艰鎯呰〃锛岀幓鐠冧俊鎭负{}", details);
DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(glassInfo, "0", item.getSlot() + "", "1");
//娣诲姞杩涚墖浠诲姟
- log.info("6銆佺敓鎴愯繘鐗囦换鍔′俊鎭瓨鍏ヤ换鍔¤〃{}", downGlassTask);
+ log.info("8銆佺敓鎴愯繘鐗囦换鍔′俊鎭瓨鍏ヤ换鍔¤〃{}", downGlassTask);
downGlassTaskService.insertCacheTask(downGlassTask);
}
+
+
+
+ }
+ log.info("9銆佸彂閫佺‘璁ゅ瓧瀹屾垚");
//S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 1);
- log.info("7銆佸彂閫佺‘璁ゅ瓧瀹屾垚");
-
-
}
/**
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
new file mode 100644
index 0000000..308599c
--- /dev/null
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
@@ -0,0 +1,68 @@
+package com.mes.job;
+
+import cn.hutool.json.JSONObject;
+import com.mes.downworkstation.entity.DownWorkstation;
+import com.mes.downworkstation.service.DownWorkstationService;
+import com.mes.tools.WebSocketServer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Component
+public class Downpush {
+
+
+ @Autowired
+ private DownWorkstationService downWorkstationService;
+ @Scheduled(fixedDelay = 1000)
+ public void Downpush() {
+
+
+ JSONObject jsonObject = new JSONObject();
+ JSONObject jsonObject2 = new JSONObject();
+ JSONObject jsonObject3 = new JSONObject();
+
+ List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1,6);
+ List<Map<String, Object>> glassinfodata = downWorkstationService.getTotalGlassDimensionsByWorkstation(1,3);
+ List<Map<String, Object>> glassinfodata2 = downWorkstationService.getTotalGlassDimensionsByWorkstation(4,6);
+ jsonObject.append("params",data);
+ jsonObject2.append("glassinfo",glassinfodata);
+ jsonObject3.append("glassinfo2",glassinfodata2);
+ log.info(jsonObject.toString());
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass");
+ ArrayList<WebSocketServer> sendwServer2 = WebSocketServer.sessionMap.get("unloadglass2");
+ ArrayList<WebSocketServer> sendwServer3 = WebSocketServer.sessionMap.get("unloadglass3");
+ // log.info(sendwServer.toString());
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+
+ if (webserver != null&&webserver.session.isOpen()) {
+ webserver.sendMessage(jsonObject.toString());
+ }
+ }
+ }
+ if (sendwServer2 != null) {
+ for (WebSocketServer webserver : sendwServer2) {
+
+ if (webserver != null&&webserver.session.isOpen()) {
+ webserver.sendMessage(jsonObject2.toString());
+ }
+ }
+ }
+ if (sendwServer3 != null) {
+ for (WebSocketServer webserver : sendwServer3) {
+
+ if (webserver != null&&webserver.session.isOpen()) {
+ webserver.sendMessage(jsonObject3.toString());
+ }
+ }
+ }
+
+ }
+}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/WebSocketConfig.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/WebSocketConfig.java
new file mode 100644
index 0000000..56fb341
--- /dev/null
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/WebSocketConfig.java
@@ -0,0 +1,16 @@
+package com.mes.tools;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+@Configuration
+public class WebSocketConfig {
+
+
+ @Bean
+ public ServerEndpointExporter serverEndpointExporter() {
+ return new ServerEndpointExporter();
+ }
+
+}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/WebSocketServer.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/WebSocketServer.java
index fcd2a10..b10efb4 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/WebSocketServer.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/WebSocketServer.java
@@ -1,28 +1,35 @@
package com.mes.tools;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.stereotype.Component;
-
-import javax.websocket.*;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.websocket.OnClose;
+import javax.websocket.OnError;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+import javax.websocket.server.PathParam;
+import javax.websocket.server.ServerEndpoint;
+
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.stereotype.Component;
+
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+
@ServerEndpoint(value = "/api/talk/{username}")
-@Component("webSocketServer")
+@Component
public class WebSocketServer {
// @Autowired
// HomeMapper homeMapper;
- public static ConfigurableApplicationContext applicationContext;
+ static ConfigurableApplicationContext applicationContext;
// 瑙ｅ喅鏃犳硶娉ㄥ叆mapper闂 //浣跨敤鏂规硶
// homeMapper=WebSocketServer.applicationContext.getBean(HomeMapper.class);
@@ -38,7 +45,7 @@
public static final Map<String, ArrayList<WebSocketServer>> sessionMap = new ConcurrentHashMap<>();
String username;
- Session session;
+ public Session session;
public WebSocketServer() {
this.messages = new ArrayList<>();
@@ -58,6 +65,15 @@
sessionMap.put(username, arrayListwebserver);
} else {
webSocketServers.add(this);
+ // Short i=0;
+ // for (WebSocketServer webSocketServer : webSocketServers) {
+ // if(webSocketServer==this){
+ // i++;
+ // }
+ // }
+ // if(i==0){
+ // webSocketServers.add(this);
+ // }
}
log.info("鏈夋柊鐢ㄦ埛鍔犲叆锛寀sername={}, 褰撳墠鍦ㄧ嚎浜烘暟涓猴細{}", username, sessionMap.get(username).size());
@@ -81,15 +97,15 @@
public void onClose(Session session, @PathParam("username") String username) {
List<WebSocketServer> webSocketServers = sessionMap.get(username);
ArrayList<WebSocketServer> arrayListwebserver = new ArrayList<WebSocketServer>();
- if (webSocketServers.size() > 1) {
+ if (webSocketServers.size()>1) {
for (WebSocketServer webSocketServer : webSocketServers) {
- if (webSocketServer != this) {
+ if(webSocketServer!=this){
arrayListwebserver.add(webSocketServer);
}
}
sessionMap.put(username, arrayListwebserver);
log.info("绉婚櫎username={}涓�鍚嶇敤鎴穝ession, {}鐨勫綋鍓嶅湪绾夸汉鏁颁负锛歿}", username, username, sessionMap.get(username).size());
- } else {
+ }else{
sessionMap.remove(username);
log.info("绉婚櫎username={}涓�鍚嶇敤鎴穝ession, {}杩炴帴鍏抽棴, 褰撳墠杩炴帴鏁颁负锛歿}", username, username, sessionMap.size());
}
@@ -157,6 +173,4 @@
public void clearMessages() {
messages.clear();
}
-
-
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
index 90f92f5..5d44c2f 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
@@ -6,6 +6,8 @@
active: prod
application:
name: unLoadGlass
+
+
mybatis-plus:
mapper-locations: classpath*:mapper/*.xml
configuration:
--
Gitblit v1.8.0