From b6eb0edc58567aca4d303f4928389bf25fe025ba Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 29 十一月 2023 11:04:27 +0800
Subject: [PATCH] 电气后端逻辑修改
---
CanadaMes-ui/src/views/Electrical/Positioning2.vue | 4
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java | 56 ++-
springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java | 6
CanadaMes-ui/src/views/Electrical/Sign.vue | 2
springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java | 8
springboot-vue3/src/main/java/com/example/springboot/component/S7control.java | 157 +++++-----
CanadaMes-ui/src/views/Electrical/Parameter2.vue | 27 +
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 4
springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java | 7
springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java | 22
springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java | 178 ++++++++---
CanadaMes-ui/src/configuration/ServoManualone.json | 4
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 12
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 22
CanadaMes-ui/src/configuration/Alarm.json | 2
/dev/null | 101 -------
springboot-vue3/src/main/java/com/example/springboot/service/OutSlice.java | 22
CanadaMes-ui/src/views/Electrical/Positioning1.vue | 6
springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java | 8
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 14
CanadaMes-ui/src/views/Electrical/Parameter1.vue | 2
CanadaMes-ui/src/views/Electrical/ServoManualone.vue | 125 +++++++-
CanadaMes-ui/src/configuration/Sign.json | 2
springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java | 10
24 files changed, 430 insertions(+), 371 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/Alarm.json b/CanadaMes-ui/src/configuration/Alarm.json
index b31d1ec..6552b83 100644
--- a/CanadaMes-ui/src/configuration/Alarm.json
+++ b/CanadaMes-ui/src/configuration/Alarm.json
@@ -507,7 +507,7 @@
],
"address": [
{
- "name": "DB104.DBx0.0",
+ "name": "DB104.0.0",
"count": 72
}
]
diff --git a/CanadaMes-ui/src/configuration/ServoManualone.json b/CanadaMes-ui/src/configuration/ServoManualone.json
index 2060629..d0a65e1 100644
--- a/CanadaMes-ui/src/configuration/ServoManualone.json
+++ b/CanadaMes-ui/src/configuration/ServoManualone.json
@@ -83,7 +83,7 @@
},
{
"button": {
- "name": "鍗婅嚜鍔ㄥ惎鍔�",
+ "name": "A01鍗婅嚜鍔ㄥ惎鍔�",
"value":0,
"address":"DB10.0"
}
@@ -154,7 +154,7 @@
},
{
"button": {
- "name": "鍗婅嚜鍔ㄥ惎鍔�",
+ "name": "A02鍗婅嚜鍔ㄥ惎鍔�",
"value":0,
"address":"DB10.0"
}
diff --git a/CanadaMes-ui/src/configuration/Sign.json b/CanadaMes-ui/src/configuration/Sign.json
index b5cb818..3401be1 100644
--- a/CanadaMes-ui/src/configuration/Sign.json
+++ b/CanadaMes-ui/src/configuration/Sign.json
@@ -445,7 +445,7 @@
"address": [
{
"name": "DB102.0.0",
- "count": 58
+ "count": 64
}
]
}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter1.vue b/CanadaMes-ui/src/views/Electrical/Parameter1.vue
index e3e5032..5455274 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter1.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter1.vue
@@ -155,7 +155,7 @@
const parms = obj.params;
const fanzhuan = obj.fanzhuan;
const xiaoche = obj.xiaoche;
-
+ console.log(obj);
// console.log('parms:', parms);
// console.log('fanzhuan:', fanzhuan);
// console.log('xiaoche:', xiaoche);
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter2.vue b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
index 9497c30..b067527 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter2.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
@@ -29,8 +29,8 @@
</el-breadcrumb>
<el-row :gutter="40">
- <el-col :span="6" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
- <el-card class="json-block" style="width:260px;">
+ <el-col :span="6" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex" style="margin-bottom: -20px;">
+ <el-card class="json-block" style="width:260px;margin-bottom: 2px;">
<div class="button-row" style="display: flex; justify-content: space-between;">
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
<span v-if="item.title" :name="item.title.name" class="action-button" >{{ item.title.name }}</span>
@@ -41,14 +41,14 @@
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
<el-button v-if="item.button" :name="item.button.name" v-model="item.button.value" class="action-button"
@click="updateButtonValue(dataGroup, itemIndex);submitDataToBackend(item.button.name)"
- :class="{ 'green-button': item.button.value === 0 && item.button.name !== '娓呴櫎ID','red-button': item.button.value === 1 && item.button.name !== '娓呴櫎ID' }">{{ item.button.name }}</el-button>
+ :class="{ 'green-button': item.button.value === 0 && item.button.name !== '娓呴櫎ID','red-button': item.button.value === 2 && item.button.name !== '娓呴櫎ID' ,'yellow-button': item.button.value === 1 && item.button.name !== '娓呴櫎ID' }">{{ item.button.name }}</el-button>
</div>
</div>
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
<div class="item-row">
<span class="name" style="width:150px;">{{ item.name }}</span>
- <el-input v-if="item.type === '0'" v-model="item.value" readonly="readonly" style="width:150px;" class="input-box"></el-input>
+ <el-input v-if="item.type === '0'" v-model="item.value" readonly="readonly" style="width:400px;" class="input-box"></el-input>
</div>
</div>
@@ -81,7 +81,7 @@
methods: {
updateButtonValue(dataGroup, itemIndex) {
// 灏嗗綋鍓嶆寜閽殑鍊艰涓�1
-
+
this.$set(dataGroup[itemIndex].button, 'value', 1);
@@ -100,13 +100,13 @@
});
const values = inputData.flat().filter(item => item !== null).map(item => item.value);
-
const jsonObject = { data: values };
// 鎻愪氦鏁版嵁鍒板悗绔�
const jsonString = JSON.stringify(jsonObject);
console.log('Type涓�3鐨剉alue:', jsonString);
socket?.send(jsonString);
+ window.location.reload();
}
},
initWebSocket () {
@@ -146,8 +146,8 @@
const parms = obj.params;
// const xiaoche = obj.params[3];
- console.log(parms);
-
+ // console.log(parms);
+//娓呴櫎id
for (let i = 0; i < jsonData2.length; i++) {
let arr = jsonData2[i];
for (let j = 0; j < arr.length; j++) {
@@ -159,7 +159,7 @@
}
-
+//ID
for (let i = 0; i < jsonData2.length; i++) {
let arr = jsonData2[i];
for (let j = 0; j < arr.length; j++) {
@@ -171,7 +171,7 @@
}
-
+//鎵嬪姩鐘舵��
for (let i = 0; i < jsonData2.length; i++) {
let arr = jsonData2[i];
for (let j = 0; j < arr.length; j++) {
@@ -183,7 +183,7 @@
}
-
+//鎵弿鏋壂鐮佺殑ID
jsonData2.forEach((item) => {
item.forEach((subItem) => {
if (subItem.read === 66) {
@@ -193,6 +193,8 @@
});
+
+//A01褰撳墠鏍煎瓙
let lastParmsArray = parms[parms.length - 1];
let lastParmsIndex = 0;
@@ -266,5 +268,8 @@
.red-button{
background-color: red;
}
+.yellow-button{
+ background-color: yellow;
+}
</style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/Positioning1.vue b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
index 24132fc..669b6de 100644
--- a/CanadaMes-ui/src/views/Electrical/Positioning1.vue
+++ b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
@@ -55,13 +55,13 @@
<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'" v-model="item.value" class="input-box"></el-input>
+ <el-input v-if="item.type === '0'" v-model="item.value" class="input-box" @keyup.enter.native="submitDataToBackend" ></el-input>
- <el-button
+ <!-- <el-button
v-if="item.type === '0' && item.name !== '鏍煎瓙闂磋窛' && item.name !== '鍑虹墖鎺ョ墖鍦板潃' && item.name !== '瀛樼墖鎺ョ墖鍦板潃'"
- class="input-box" @click="submitDataToBackend();">鍙栧湴鍧�</el-button>
+ class="input-box" @click="submitDataToBackend();">鍙栧湴鍧�</el-button> -->
</div>
</div>
diff --git a/CanadaMes-ui/src/views/Electrical/Positioning2.vue b/CanadaMes-ui/src/views/Electrical/Positioning2.vue
index 4ecd2ac..70b5e31 100644
--- a/CanadaMes-ui/src/views/Electrical/Positioning2.vue
+++ b/CanadaMes-ui/src/views/Electrical/Positioning2.vue
@@ -55,8 +55,8 @@
<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'" v-model="item.value" class="input-box"></el-input>
- <el-button v-if="item.type === '0'" class="input-box" @click="submitDataToBackend();">鍙栧湴鍧�</el-button>
+ <el-input v-if="item.type === '0'" v-model="item.value" class="input-box" @keyup.enter.native="submitDataToBackend"></el-input>
+ <!-- <el-button v-if="item.type === '0'" class="input-box" @click="submitDataToBackend();">鍙栧湴鍧�</el-button> -->
</div>
</div>
diff --git a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
index bfd5eb3..0029ba5 100644
--- a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
+++ b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
@@ -30,8 +30,8 @@
</el-breadcrumb>
<el-row :gutter="26">
- <el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
- <el-card class="json-block" style="width:auto;">
+ <el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex" style="margin-bottom: -20px;">
+ <el-card class="json-block" style="width:auto;margin-bottom: 10px;">
<el-row >
<el-col v-for="(item, itemIndex) in dataGroup" :key="itemIndex" :span="12">
<div class="item-container">
@@ -77,19 +77,23 @@
},
methods: {
+
updateButtonValue(dataGroup, itemIndex) {
// 灏嗗綋鍓嶆寜閽殑鍊艰涓�1
-
- this.$set(dataGroup[itemIndex].button, 'value', 1);
-
+ this.$set(dataGroup[itemIndex].button, 'value', 1);
-
+ // 灏嗗叾浠栨寜閽殑鍊艰涓�0
+ // dataGroup.forEach((item, index) => {
+ // if (index !== itemIndex && item.button) {
+ // this.$set(item.button, 'value', 0);
+ // }
+ // });
},
submitDataToBackend(currentButtonName) {
- if (currentButtonName === '鍗婅嚜鍔ㄥ惎鍔�') {
+ if (currentButtonName === 'A01鍗婅嚜鍔ㄥ惎鍔�') {
const data = [];
-for (let i = 0; i < 2; i++) {
+for (let i = 0; i < 1; i++) {
const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => {
return { value: item.value };
});
@@ -98,7 +102,6 @@
data.push(values);
}
-
const jsonObject = { data };
@@ -110,25 +113,78 @@
}
- if (currentButtonName === '澶嶄綅') {
-
+ if (currentButtonName === 'A02鍗婅嚜鍔ㄥ惎鍔�') {
const data2 = [];
- const resetButtonValues = this.jsonData.map(item => {
- const buttonItem = item.find(subItem => subItem.button && subItem.button.name === '澶嶄綅');
- return buttonItem ? buttonItem.button.value : null;
-}).filter(value => value !== null);
-// 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
-data2.push(...resetButtonValues);
-const jsonObject2 = { data2 };
+for (let i = 1; i < 2; i++) {
+ const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => {
+ return { value: item.value };
+ });
-// 鎻愪氦鏁版嵁鍒板悗绔�
-const jsonString2 = JSON.stringify(jsonObject2);
-console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString2);
-socket?.send(jsonString2);
+ const values2 = inputData.map(item => item.value);
+ data2.push(values2);
}
+data2.unshift([]);
+const jsonObject = { data:data2 };
+
+// 鎻愪氦鏁版嵁鍒板悗绔�
+const jsonString = JSON.stringify(jsonObject);
+console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
+socket?.send(jsonString);
+
+ }
+
+ if (currentButtonName === '澶嶄綅') {
+ const data2 = [];
+ const resetButtonValues = this.jsonData.map(item => {
+ const buttonItem = item.find(subItem => subItem.button && subItem.button.name === '澶嶄綅');
+ return buttonItem ? buttonItem.button.value : null;
+ }).filter(value => value !== null);
+
+ // 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
+ data2.push(resetButtonValues.flat());
+
+ // 鍦� data2 鏁扮粍鍓嶉潰娣诲姞涓や釜绌烘暟缁�
+ data2.unshift([], []);
+
+ // 鍒涘缓 jsonObject2 瀵硅薄锛屽苟娣诲姞 data2 灞炴��
+ const jsonObject2 = { data: data2 };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const jsonString2 = JSON.stringify(jsonObject2);
+ console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString2);
+ socket?.send(jsonString2);
+ window.location.reload();
+}
+
+if (currentButtonName === '鍥為浂') {
+ const data3 = [];
+ const resetButtonValues3 = this.jsonData.map(item => {
+ const buttonItem3 = item.find(subItem => subItem.button && subItem.button.name === '鍥為浂');
+ return buttonItem3 ? buttonItem3.button.value : null;
+ }).filter(value => value !== null);
+
+ // 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
+ data3.push(resetButtonValues3.flat());
+
+ // 鍦� data3 鏁扮粍鍓嶉潰娣诲姞涓や釜绌烘暟缁�
+ data3.unshift([], [], []);
+
+ // 鍒涘缓 jsonObject2 瀵硅薄锛屽苟娣诲姞 data3 灞炴��
+ const jsonObject3 = { data: data3 };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const jsonString3 = JSON.stringify(jsonObject3);
+ console.log('鍥為浂:', jsonString3);
+ socket?.send(jsonString3);
+ window.location.reload();
+}
+
+
+
+
if (currentButtonName === 'A01鍗婅嚜鍔�') {
const elements = document.getElementsByClassName('special-class');
for (let i = 0; i < elements.length; i++) {
@@ -182,7 +238,7 @@
}
let obj = JSON.parse(msg.data);
- // console.log(obj)
+ // console.log(obj)
const jsonData2 = this.jsonData;
const handleMouseMove = throttle(function(event) {
@@ -220,11 +276,32 @@
}
}
+for (let i = 0; i < obj.weihuiling[0].length; i++) {
+ const weihuilingValue = obj.weihuiling[0][i];
+
+ // 鏌ユ壘jsonData2涓甫鏈�"button"鐨勫璞★紝骞朵笖name绛変簬"鏁呴殰"
+ for (let j = 0; j < jsonData2.length; j++) {
+ const section = jsonData2[j];
+
+ for (let k = 0; k < section.length; k++) {
+ const item = section[k];
+
+ if (item.button && item.button.name === "鏈洖闆�") {
+ // 鏇存柊value灞炴��
+ item.button.value = weihuilingValue;
+ break;
+ }
+ }
+
+
+ }
+}
+
}
-}, 200);
+}, 500);
document.addEventListener('mouseover', handleMouseMove);
};
diff --git a/CanadaMes-ui/src/views/Electrical/Sign.vue b/CanadaMes-ui/src/views/Electrical/Sign.vue
index 1d23008..7dc4d0e 100644
--- a/CanadaMes-ui/src/views/Electrical/Sign.vue
+++ b/CanadaMes-ui/src/views/Electrical/Sign.vue
@@ -114,7 +114,7 @@
this.record.params[0] = obj.sig[0];
this.record.xyData = this.jsonData.sign;
-
+ console.log(this.jsonData.sign)
for (let a = 0; a < this.record.xyData.length; a++) {
this.record.xyData[a].value = this.record.params[0][a];
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
index 5c4348d..feefee3 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
@@ -69,18 +69,29 @@
List<String> addressList1 = new ArrayList<>();
- addressList1.add("DB103.32~45");
- addressList1.add("DB103.46~59");
- addressList1.add("DB103.60~73");
- addressList1.add("DB103.74~101");
- addressList1.add("DB103.102~115");
- addressList1.add("DB103.116~143");
- addressList1.add("DB103.144~157");
- addressList1.add("DB103.158~171");
- addressList1.add("DB103.172~185");
- addressList1.add("DB103.200~213");
- addressList1.add("DB103.228~241");
- List<Boolean> paramlist = S7control.getinstance().readBits(addressList1);
+// addressList1.add("DB103.32~45");
+// addressList1.add("DB103.46~59");
+// addressList1.add("DB103.60~73");
+// addressList1.add("DB103.74~101");
+// addressList1.add("DB103.102~115");
+// addressList1.add("DB103.116~143");
+// addressList1.add("DB103.144~157");
+// addressList1.add("DB103.158~171");
+// addressList1.add("DB103.172~185");
+// addressList1.add("DB103.200~213");
+// addressList1.add("DB103.228~241");
+ addressList1.add("DB103.40");
+ addressList1.add("DB103.58");
+ addressList1.add("DB103.72");
+ addressList1.add("DB103.86");
+ addressList1.add("DB103.100");
+ addressList1.add("DB103.114");
+ addressList1.add("DB103.128");
+ addressList1.add("DB103.142");
+ addressList1.add("DB103.156");
+ addressList1.add("DB103.184");
+ addressList1.add("DB103.212");
+ List<String> paramlist = S7control.getinstance().readStrings(addressList1);
List<String> addresses = new ArrayList<>();
@@ -100,14 +111,14 @@
List<Boolean> data2 = S7control.getinstance().ReadBits("DB101.9.2", 10);
List<String> addressList3 = new ArrayList<>();
- addressList3.add("DB106.64-DB106.77");
- List<Boolean> data3 = S7control.getinstance().readBits(addressList3);
+ addressList3.add("DB106.64");
+ List<String> data3 = S7control.getinstance().readStrings(addressList3);
List<String> addresses4 = new ArrayList<>();
- addresses.add("DB106.0");
- addresses.add("DB106.12");
- addresses.add("DB106.40");
- addresses.add("DB106.50");
+ addresses4.add("DB103.52");
+ addresses4.add("DB103.54");
+ addresses4.add("DB103.56");
+ addresses4.add("DB103.60");
List<Short> data4 = S7control.getinstance().readWords(addresses4);
@@ -126,14 +137,13 @@
JSONObject jsonObject = new JSONObject();
- short[] params = new short[paramlist.size()];
- for (int i = 0; i < paramlist.size(); i++) {
- boolean value = paramlist.get(i);
+ short[] params = new short[data2.size()];
+ for (int i = 0; i < data2.size(); i++) {
+ boolean value = data2.get(i);
params[i] = value ? (short) 1 : (short) 0;
}
-
jsonObject.append("params", params);
- jsonObject.append("params", data2);
+ jsonObject.append("params", paramlist);
jsonObject.append("params", data);
jsonObject.append("params", data3);
jsonObject.append("params", data4);
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
index 17e0010..8c2ef38 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
@@ -79,8 +79,8 @@
// Integer Plccount = this.count;
// System.out.println(stt);
- List<Short> arraylist = S7control.getinstance().ReadWord("DB100.42", 20);
-
+ List<Short> arraylist = S7control.getinstance().ReadWord("DB100.42", 23);
+// System.out.println(arraylist);
// Short[] 瀛樼墖 = { 1 };
// List<Short> 瀛樼墖1 = new ArrayList<>(Arrays.asList(瀛樼墖));
// Short[] 鎺ョ墖 = { 1 };
@@ -106,7 +106,7 @@
if (webSocketServer != null) {
List<String> messages = webSocketServer.getMessages();
- String addressList3 = "DB100.12";
+ String addressList3 = "DB100.42";
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
@@ -136,7 +136,7 @@
// 鍐欏叆绗瑈i涓湴鍧�
if (!mergedList.isEmpty()) {
-// S7control.getinstance().WriteWord(addressList3, mergedList);
+ S7control.getinstance().WriteWord(addressList3, mergedList);
System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList3);
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
index 70b6ea5..4eb6072 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
@@ -18,42 +18,25 @@
return FileUtils.readFileToString(file, "UTF-8");
}
- public void readValue() {
- String str = "";
- BufferedReader bufferedReader = null;
- FileInputStream fileInputStream;
- try {
- // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
- fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/address.json");
- // 璇诲彇 fileInputStream 涓瓧鑺傚苟灏嗗叾瑙ｇ爜涓哄瓧绗�
- InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
- // 鎻愰珮璇诲彇鏁堢巼锛屽湪 BufferedReader 鍐呭寘瑁� InputStreamReader
- bufferedReader = new BufferedReader(inputStreamReader);
- String line = null;
- // 灏� bufferedReader 鍐呭涓�琛屼竴琛岃祴鍊肩粰str
- while ((line = bufferedReader.readLine()) != null) {
- str += line;
+
+
+
+ public void insertDataToList(List<Short> list, String rangeAddress, int insertIndex) {
+ if (list.size() >= insertIndex + 14) {
+ List<Short> rangeData = new ArrayList<>();
+ byte[] byteData = S7control.getinstance().ReadByte(rangeAddress, 14);
+ if (byteData != null && byteData.length == 14) {
+ for (byte b : byteData) {
+ rangeData.add((short) b);
+ }
+ } else {
+ // 璇诲彇鏁版嵁澶辫触锛屾坊鍔犻粯璁ゅ��
+ for (int i = 0; i < 14; i++) {
+ rangeData.add((short) -1);
+ }
}
- // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
- JSONObject jsonObject = new JSONObject(str);
-
- // 鑾峰彇json涓殑鍊�
- JSONArray address = jsonObject.getJSONArray("ServoManualone");
- for (int i = 0; i < address.size(); i++) {
- JSONObject ress = (JSONObject) address.get(i);
-
- this.name = ress.getStr("name");
- this.count = ress.getInt("count");
-
- }
-
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
+ list.addAll(insertIndex, rangeData);
}
}
@@ -61,20 +44,17 @@
public void run() {
while (this != null) {
try {
- Thread.sleep(500);
+ Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
-// this.readValue();
-// String PlcAddress = this.name;
-// Integer Plccount = this.count;
List<String> addresses = new ArrayList<>();
addresses.add("DB103.25");
addresses.add("DB100.144");
- addresses.add("DB100.148-161");
+
addresses.add("DB100.184");
addresses.add("DB100.186");
addresses.add("DB100.180");
@@ -82,14 +62,24 @@
List<Short> arraylist = S7control.getinstance().readWords(addresses);
+// String rangeAddress = "DB100.148-161";
+ String rangeAddress = "DB100.148";
+ int insertIndex = 2;
+ insertDataToList(arraylist, rangeAddress, insertIndex);
+
+
List<String> addresses2 = new ArrayList<>();
addresses2.add("DB103.26");
addresses2.add("DB100.188");
addresses2.add("DB100.190");
addresses2.add("DB100.146");
- addresses2.add("DB100.162-175");
+// addresses2.add("DB100.162-175");
List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);
-
+// String rangeAddress2 = "DB100.148-161";
+ String rangeAddress2 = "DB100.162";
+ int insertIndex2 = 4;
+ insertDataToList(arraylist2, rangeAddress2, insertIndex2);
+// System.out.println(arraylist2);
List<String> addresses3 = new ArrayList<>();
addresses3.add("DB103.42");
List<Short> arraylist3 = S7control.getinstance().readWords(addresses3);
@@ -108,18 +98,26 @@
addresses7.add("DB104.28");
addresses7.add("DB104.30");
List<Short> arraylist7 = S7control.getinstance().readWords(addresses7);
-// List<String> addresses8 = new ArrayList<>();
-// addresses8.add("DB103.26");
-// addresses8.add("DB103.26");
-// addresses8.add("DB103.26");
-// addresses8.add("DB103.26");
-// List<Short> arraylist8 = S7control.getinstance().readWords(addresses8);
+
+
+ List<String> addresses8 = new ArrayList<>();
+ addresses8.add("DB101.3.7");
+ addresses8.add("DB101.4.2");
+ addresses8.add("DB101.4.5");
+ addresses8.add("DB101.4.7");
+ List<Boolean> arraylist8 = S7control.getinstance().readBits(addresses8);
+ short[] params = new short[arraylist8.size()];
+ for (int i = 0; i < arraylist8.size(); i++) {
+ boolean value = arraylist8.get(i);
+ params[i] = value ? (short) 1 : (short) 0;
+ }
+
// Short[] values1 = { 1, 2, 3, 4, 5, 6, 7};
// List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
// Short[] values2 = { 1, 2, 3, 4, 5};
// List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
-
+//
// Short[] values3 = {1};
// List<Short> arraylist3 = new ArrayList<>(Arrays.asList(values3));
// Short[] values4 = {2};
@@ -143,7 +141,7 @@
jsonObject.append("zuhe5", arraylist5);
jsonObject.append("zuhe6", arraylist6);
jsonObject.append("guzhang", arraylist7);
-// jsonObject.append("weihuiling", arraylist8);
+ jsonObject.append("weihuiling", params);
@@ -170,6 +168,29 @@
waddresses2.add("DB100.190");
waddresses2.add("DB100.146");
waddresses2.add("DB100.162-175");
+
+ List<String> waddresses3 = new ArrayList<>();
+ waddresses3.add("DB101.4.0");
+ waddresses3.add("DB101.4.3");
+ waddresses3.add("DB101.3.6");
+ waddresses3.add("DB101.4.1");
+ waddresses3.add("DB101.4.4");
+ waddresses3.add("DB101.4.6");
+
+
+ List<String> waddresses4 = new ArrayList<>();
+ waddresses4.add("DB101.3.7");
+ waddresses4.add("DB101.4.2");
+ waddresses4.add("DB101.4.5");
+ waddresses4.add("DB101.4.7");
+
+
+
+
+
+
+
+
@@ -201,16 +222,16 @@
}
}
if (!sValue.isEmpty()) {
- S7control.getinstance().WriteWord(waddresses1, sValue);
+ S7control.getinstance().WriteWord(waddresses1, sValue);
System.out.println("Values " + sValue + " written to PLC at address " + waddresses1);
}
}
if (messageArray.getJSONArray(1).size() > 0) {
- JSONArray jsonArray = messageArray.getJSONArray(1);
+ JSONArray jsonArray2 = messageArray.getJSONArray(1);
List<Short> sValue2 = new ArrayList<>();
- for (int i = 0; i < jsonArray.size(); i++) {
- Object value = jsonArray.get(i);
+ for (int i = 0; i < jsonArray2.size(); i++) {
+ Object value = jsonArray2.get(i);
if (value != null && !value.toString().equals("null")) {
try {
String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
@@ -224,11 +245,60 @@
}
}
if (!sValue2.isEmpty()) {
- S7control.getinstance().WriteWord(waddresses2, sValue2);
+ S7control.getinstance().WriteWord(waddresses2, sValue2);
System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses2);
}
}
+
+
+ if (messageArray.getJSONArray(2).size() > 0) {
+ JSONArray jsonArray3 = messageArray.getJSONArray(2);
+ List<Boolean> sValue3 = new ArrayList<>();
+ for (int i = 0; i < jsonArray3.size(); i++) {
+ Object value = jsonArray3.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValue3.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValue3.isEmpty()) {
+ S7control.getinstance().WriteBit(waddresses3, sValue3);
+ System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses3);
+ }
+ }
+
+
+ if (messageArray.getJSONArray(3).size() > 0) {
+ JSONArray jsonArray4 = messageArray.getJSONArray(3);
+ List<Boolean> sValue4 = new ArrayList<>();
+ for (int i = 0; i < jsonArray4.size(); i++) {
+ Object value = jsonArray4.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValue4.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValue4.isEmpty()) {
+ S7control.getinstance().WriteBit(waddresses4, sValue4);
+ System.out.println("Values " + sValue4 + " written to PLC at address " + waddresses4);
+ }
+ }
+
// 娓呯┖娑堟伅鍒楄〃
webSocketServer.clearMessages();
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
index f601cbb..1195ec1 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
@@ -71,11 +71,11 @@
Integer Plccount = this.count;
// System.out.println(PlcAddress);
- // List<Boolean> paramlist = S7control.getinstance().ReadBits("DB2.0.0", 26);
- Boolean[] values = { false, true, true, true, true, true, true, true, true,
- true, true, true, true, true, true, true, true, true, true, true, true, true, true,
- true, false, true };
- List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
+ List<Boolean> paramlist = S7control.getinstance().ReadBits("DB2.0.0", 26);
+// Boolean[] values = { false, true, true, true, true, true, true, true, true,
+// true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+// true, false, true };
+// List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
if (paramlist != null) {
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
index 393174d..072f493 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
@@ -87,15 +87,14 @@
Integer Plccount = this.count;
// 鏍规嵁鍦板潃璇诲彇PCL鏁版嵁
- // List<Boolean> plclist = S7control.getinstance().ReadBits(PlcAddress,
- // Plccount);
- Boolean[] values = { false, false, true, false, true, false, true, false,
+ List<Boolean> plclist = S7control.getinstance().ReadBits(PlcAddress,Plccount);
+ /*Boolean[] values = { false, false, true, false, true, false, true, false,
true, false, true, false, true, false,
true, false, true, false, true, false, true, false, true, false, true, false,
true, false, true, false, true,
false, true, false, true, false,
true, false, true, false };
- List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));
+ List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));*/
if (plclist != null) {
JSONObject jsonObject = new JSONObject();
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
index 0e503c4..11c47ab 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
@@ -70,19 +70,19 @@
Integer Plccount = this.count;
// System.out.println(PlcAddress);
- // List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 44);
+ List<Boolean> plclist = S7control.getinstance().ReadBits(PlcAddress, Plccount);
// List<Boolean> plclist2 = S7control.getinstance().ReadBits("DB102.5.5", 13);
- Boolean[] values = { true, true, true, true, true, false, true, false,
- true, false, true, false, true, false,
- true, false, true, false, true, false, true, false, true, false, true, false,
- true, false, true, false, true,
- false, true, false, true, false,
- true, false, true, false, true, false, true, false, null,
- true, false,
- true, false, true, false, true, false,
- true, false, true, false, true, };
- List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));
+// Boolean[] values = { true, true, true, true, true, false, true, false,
+// true, false, true, false, true, false,
+// true, false, true, false, true, false, true, false, true, false, true, false,
+// true, false, true, false, true,
+// false, true, false, true, false,
+// true, false, true, false, true, false, true, false, null,
+// true, false,
+// true, false, true, false, true, false,
+// true, false, true, false, true, };
+// List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));
if (plclist != null) {
// 灏嗚幏鍙栫殑甯冨皵绫诲瀷杞崲涓烘暣鏁扮被鍨�
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
index 61c28f0..843e685 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
@@ -70,10 +70,10 @@
Integer Plccount = this.count;
// System.out.println(PlcAddress);
- // List<Short> plclist = S7control.getinstance().ReadWord("DB103.0", 10);
- Short[] values = { 0, 1, 1, 0, 1, 0, 1, 0,
- 1, 0, };
- List<Short> plclist = new ArrayList<>(Arrays.asList(values));
+List<Short> plclist = S7control.getinstance().ReadWord("DB103.0", 10);
+// Short[] values = { 0, 1, 1, 0, 1, 0, 1, 0,
+// 1, 0, };
+// List<Short> plclist = new ArrayList<>(Arrays.asList(values));
if (plclist != null) {
List<String> Intlist = new ArrayList<>();
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
index e207db3..b6afa91 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
@@ -1,11 +1,15 @@
package com.example.springboot.component;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
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;
public class S7control {
@@ -78,35 +82,7 @@
* @param address 鍦板潃
* @param datas 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("-")) {
- // 澶勭悊鑼冨洿鍦板潃
- String[] range = addr.split("-");
- if (range.length == 2) {
- String startAddr = range[0].trim();
- String endAddr = range[1].trim();
-
- int startIndex = Integer.parseInt(startAddr.substring(startAddr.indexOf('.') + 1));
- int endIndex = Integer.parseInt(endAddr.substring(endAddr.indexOf('.') + 1));
-
- for (int j = startIndex; j <= endIndex; j++) {
- String currentAddress = startAddr.substring(0, startAddr.indexOf('.') + 1) + j;
- s7PLC.writeInt16(currentAddress, data); // 灏嗘暟鎹啓鍏ュ綋鍓嶅湴鍧�
- }
- }
- } else {
- // 澶勭悊鍗曚釜鍦板潃
- s7PLC.writeInt16(addr, data); // 灏嗘暟鎹啓鍏ュ崟涓湴鍧�
- }
- }
- }
@@ -184,43 +160,7 @@
return s7PLC.readInt16(address);
}
- public List<Short> readWords(List<String> addresses) {
- if (s7PLC == null) {
- return null;
- }
- List<Short> data = new ArrayList<>();
-
- for (String address : addresses) {
- if (address.contains("-")) {
- String[] range = address.split("-");
- String startAddress = range[0];
- String endAddress = range[1];
-
- if (startAddress.equals(endAddress)) {
- // 鍗曚釜鍦板潃
- Short value = s7PLC.readInt16(startAddress);
- data.add(value);
- } else {
- // 鑼冨洿鍦板潃
- int startIndex = getIndexFromAddress(startAddress);
- int endIndex = getIndexFromAddress(endAddress);
-
- for (int i = startIndex; i <= endIndex; i++) {
- String currentAddress = getAddressFromIndex(i);
- Short value = s7PLC.readInt16(currentAddress);
- data.add(value);
- }
- }
- } else {
- // 鍗曚釜鍦板潃
- Short value = s7PLC.readInt16(address);
- data.add(value);
- }
- }
-
- return data;
- }
private int getIndexFromAddress(String address) {
@@ -258,7 +198,6 @@
public byte[] ReadByte(String address, int count) {
if (s7PLC==null)
return null;
-
// List<String> addresslist = GetAddressList(address, count, 16);
return s7PLC.readByte(address,count);
}
@@ -276,28 +215,33 @@
}
public List<Boolean> readBits(List<String> addressList) {
- if (s7PLC == null)
+ if (s7PLC == null || addressList.isEmpty()) {
return null;
+ }
- List<Boolean> result = new ArrayList<>();
+ List<Boolean> values = new ArrayList<>();
+ for (String address : addressList) {
+ boolean value = s7PLC.readBoolean(address);
+ values.add(value);
+ }
+
+ return values;
+ }
+
+
+ public List<String> readStrings(List<String> addressList) {
+ if (s7PLC == null) {
+ return null;
+ }
+
+ List<String> result = new ArrayList<>();
for (String address : addressList) {
- if (address.contains("~")) {
- String[] range = address.split("~");
- String startAddress = range[0];
- String endAddress = range[1];
+ byte[] bytes = s7PLC.readByte(address, 14);
- int startIndex = extractAddressNumber(startAddress);
- int endIndex = extractAddressNumber(endAddress);
-
- String prefix = startAddress.substring(0, startAddress.indexOf(".") + 1);
-
- for (int i = startIndex; i <= endIndex; i++) {
- String newAddress = prefix + i;
- result.add(s7PLC.readBoolean(newAddress));
- }
- } else {
- result.add(s7PLC.readBoolean(address));
+ if (bytes != null) {
+ String str = new String(bytes, StandardCharsets.US_ASCII);
+ result.add(str);
}
}
@@ -305,6 +249,55 @@
}
+ 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);
+ S7control.getinstance().WriteByte(addr, bytes);
+ }
+
+
+ public List<Short> readWords(List<String> addresses) {
+ if (s7PLC == null) {
+ return null;
+ }
+
+ List<Short> data = new ArrayList<>();
+
+ for (String address : addresses) {
+
+ // 鍗曚釜鍦板潃
+ Short value = s7PLC.readInt16(address);
+ data.add(value);
+
+ }
+
+ return data;
+ }
+
private int extractAddressNumber(String address) {
String numberStr = address.replaceAll("\\D+", ""); // 浣跨敤姝ｅ垯琛ㄨ揪寮忔彁鍙栨暟瀛楅儴鍒�
return Integer.parseInt(numberStr);
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index 7d52f42..736c35c 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -18,7 +18,7 @@
import com.example.springboot.component.PlcPositioning2;
import com.example.springboot.component.PlcParameter2;
import com.example.springboot.component.PlcParameter1;
-//import com.example.springboot.component.PlcServoManualone;
+import com.example.springboot.component.PlcServoManualone;
@Component
@Order(1)
@@ -33,22 +33,22 @@
// new PlcHold().start();
- // new Plcaction().start();
+ // new Plcaction().start();
//
// new Plchome().start();
//
- // new PlcParameter().start();
+// new PlcParameter().start();
//
- // new Plcalarm().start();
+ // new Plcalarm().start();
//
- // new Plcsign().start();
+ // new Plcsign().start();
//
- // new Plcstate().start();
+ // new Plcstate().start();
new PlcPositioning1().start();
new PlcPositioning2().start();
new PlcParameter2().start();
new PlcParameter1().start();
new PLCAutomaticParameterSetting().start();
- // new PlcServoManualone().start();
+ new PlcServoManualone().start();
}
}
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
index c773316..0017925 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -13,7 +13,7 @@
import com.example.springboot.mapper.HomeMapper;
import com.example.springboot.mapper.SpianMapper;
import com.example.springboot.service.HomeService;
-import com.example.springboot.service.MultiFieldComparator;
+//import com.example.springboot.service.MultiFieldComparator;
import com.example.springboot.service.SpianService;
import com.example.springboot.common.Result;
import com.example.springboot.component.S7control;
@@ -228,7 +228,7 @@
map.put("message", "300");
} else {
homeMapper.Inglassid(north_glass_buffer1s, cage, cell, tier);
- spianMapper.UpdataAddCage1(north_glass_buffer1s.getglasslengthMm(), cage, cell);
+ spianMapper.UpdataAddCage1(north_glass_buffer1s.getglasslengthmm(), cage, cell);
}
return Result.success(map);
}
@@ -291,8 +291,8 @@
List<north_glass_buffer1> listAluminumFrame = homeMapper.SelectAluminumFrameInfoById(FrameBarcode);
String flip=homeMapper.SelectFlipByFrameBarcode(FrameBarcode);
for (north_glass_buffer1 north_glass_buffer1 : listAluminumFrame) {
- north_glass_buffer1.setstorageCage(homeMapper.SelectStorageGlassById(north_glass_buffer1.getbarcode()));
- north_glass_buffer1.setOut_slice(homeMapper.SelectQueueByglassid(north_glass_buffer1.getbarcode()));
+// north_glass_buffer1.setstorageCage(homeMapper.SelectStorageGlassById(north_glass_buffer1.getbarcode()));
+// north_glass_buffer1.setOut_slice(homeMapper.SelectQueueByglassid(north_glass_buffer1.getbarcode()));
}
Map<String, Object> map = new HashMap<>();
map.put("listAluminumFrame", listAluminumFrame);
@@ -313,15 +313,15 @@
//HashMap<String,List<Out_slice>> map=new HashMap<String,List<Out_slice>>();
// HashMap map=new HashMap<>();
- // for (Out_slice out_slice : listoutslice) {
- // String key_=out_slice.getState()+"-";
+ // for (Out_slice Out_slice.java : listoutslice) {
+ // String key_=Out_slice.java.getState()+"-";
// if (map.get(key_)==null) {
// List<Out_slice> lists=new ArrayList<Out_slice>();
- // lists.add(out_slice);
+ // lists.add(Out_slice.java);
// map.put(key_, lists);
// }else{
// List<Out_slice> lists=(List<Out_slice>)map.get(key_);
- // lists.add(out_slice);
+ // lists.add(Out_slice.java);
// map.put(key_,lists);
// }
// }
@@ -329,13 +329,13 @@
// List<Out_slice> listskey=(List<Out_slice>)map.get("1-");
// List<Out_slice> list=new ArrayList<Out_slice>();
- // for (Out_slice out_slice : listskey) {
+ // for (Out_slice Out_slice.java : listskey) {
// if (list.isEmpty()) {
- // list.add(out_slice);
+ // list.add(Out_slice.java);
// }else{
// for (int i=0;i<list.size();i++) {
// Out_slice out_slice2=list.get(i);
- // if(out_slice.getID()>out_slice2.getID()){
+ // if(Out_slice.java.getID()>out_slice2.getID()){
// continue;
// }else{
// list.add(i,out_slice2);
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java b/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
index 370e790..25f96c8 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
@@ -20,6 +20,12 @@
private String datecreated;//
private String FrameBarcode;//
+ private StorageCage storageCage;
+
+// public void class setstorageCage(StorageCage storageCage){
+// this.storageCage=storageCage;
+// }
+
public Integer id() {
return id;
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/out_slice.java b/springboot-vue3/src/main/java/com/example/springboot/entity/out_slice.java
deleted file mode 100644
index 84e3004..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/out_slice.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.example.springboot.entity;
-
-public class Out_slice {
- private int id;
- private String glassId;
- private String barcode;
- private double glasswidth;
- private double glassheight;
- private int state;
- private String time;
-
- private north_glass_buffer1 north_glass_buffer1s;
-
- public void setnorth_glass_buffer1s(north_glass_buffer1 north_glass_buffer1s) {
- this.north_glass_buffer1s = north_glass_buffer1s;
- }
-
- public north_glass_buffer1 getnorth_glass_buffer1s() {
- return north_glass_buffer1s;
- }
-
- private StorageCage storageCage;
-
- public void setstorageCage(StorageCage storageCage) {
- this.storageCage = storageCage;
- }
-
- public StorageCage getstorageCage() {
- return storageCage;
- }
-
- public Out_slice() {
- }
-
- public Out_slice(int ID, String glassId, String barCode, double glasswidth, double glassheight, int state, String time) {
- this.id = ID;
- this.glassId = glassId;
- this.barcode = barCode;
- this.glasswidth = glasswidth;
- this.glassheight = glassheight;
- this.state = state;
- this.time = time;
- }
-
- public int getID() {
- return id;
- }
-
- public String getGlassId() {
- return glassId;
- }
-
- public String getBarCode() {
- return barcode;
- }
-
- public double getGlasswidth() {
- return glasswidth;
- }
-
- public double getGlassheight() {
- return glassheight;
- }
-
- public int getState() {
- return state;
- }
-
- public String getTime() {
- return time;
- }
-
- public void setID(int ID) {
- this.id = ID;
- }
-
- public void setGlassId(String glassId) {
- this.glassId = glassId;
- }
-
-public void setBarCode(String barCode) {
- barcode = barCode;
- }
-
- public void setGlasswidth(double glasswidth) {
- this.glasswidth = glasswidth;
- }
-
- public void setGlassheight(double glassheight) {
- this.glassheight = glassheight;
- }
-
- public void setState(int state) {
- this.state = state;
- }
-
- public void setTime(String time) {
- this.time = time;
- }
-
-}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
index d6236e3..df66987 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -7,7 +7,7 @@
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.north_glass_buffer1_frames;
+//import com.example.springboot.entity.north_glass_buffer1_frames;
import com.example.springboot.entity.Out_slice;
import java.util.List;
@@ -135,7 +135,7 @@
north_glass_buffer1 SelectBoxNo(String glassid);
//鏌ヨ鍑虹墖闃熷垪淇℃伅
- @Select("select * from out_slice where state=0 or state=1")
+ @Select("select * from Out_slice.java where state=0 or state=1")
List<Out_slice> SelectProductionqueue();
//鏍规嵁鐜荤拑id鏌ヨ绗煎唴鐜荤拑淇℃伅
@@ -144,7 +144,7 @@
//鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
- @Select("update out_slice set state=3 where id=#{id}")
+ @Select("update Out_slice.java set state=3 where id=#{id}")
void DeleteProductionQueueGlass(Short id);
//鏍规嵁閾濇id鏌ヨ瀵瑰簲鐜荤拑淇℃伅
@@ -152,7 +152,7 @@
List<north_glass_buffer1> SelectAluminumFrameInfoById(String FrameBarcode);
//鏌ヨ鏍规嵁id鏌ヨ
- @Select("select b.* from storage_cage a inner join out_slice b on a.glass_id=b.glassId where b.glassId=#{glassId}")
+ @Select("select b.* from storage_cage a inner join Out_slice.java b on a.glass_id=b.glassId where b.glassId=#{glassId}")
List<Out_slice> SelectOutSliceById(String glassId);
//鏌ヨ鐜荤拑id鏄惁
@@ -160,11 +160,11 @@
String SelectFlipByFrameBarcode(String frameBarcode);
//鏌ヨ鐜荤拑鏄惁宸插瓨鍦ㄤ簬鍑虹墖闃熷垪
- @Select("select * from out_slice where glassid=#{getbarcode} and (state=0 or state=1)")
+ @Select("select * from Out_slice.java where glassid=#{getbarcode} and (state=0 or state=1)")
Out_slice SelectQueueByglassid(String getbarcode);
//鏌ヨ鐜荤拑鏄惁宸插瓨鍦ㄤ簬鍑虹墖闃熷垪
- @Select("INSERT INTO out_slice( `glassId`, `barcode`, `glasswidth`, `glassheight`, `state`, `flip`) VALUES ( #{glassid}, #{FrameNo}, #{glasslengthMm}, #{glassheightMm}, 0, #{flip});")
+ @Select("INSERT INTO Out_slice.java( `glassId`, `barcode`, `glasswidth`, `glassheight`, `state`, `flip`) VALUES ( #{glassid}, #{FrameNo}, #{glasslengthMm}, #{glassheightMm}, 0, #{flip});")
void AddOutSliceS(String glassid, String flip, String FrameNo, String glasslengthMm, String glassheightMm);
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
index 86dbe5a..7bd7855 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -143,10 +143,10 @@
@Select("select state from queue where type=1")
String Selectqueuestate();
//鍒ゆ柇閾濇鍑虹墖琛ㄦ槸鍚︽湁鐜荤拑闇�瑕佸嚭
- @Select("SELECT * FROM `out_slice` where state=0 or state=0 order by id limit 1;")
+ @Select("SELECT * FROM `Out_slice.java` where state=0 or state=0 order by id limit 1;")
String SelectOutSlice();
//鍒ゆ柇閾濇鍑虹墖琛ㄦ槸鍚︽湁鐜荤拑姝ｅ湪鍑虹墖涓�
- @Select("SELECT count(*) FROM `out_slice` where state=1 or state=0 order by id limit 1;")
+ @Select("SELECT count(*) FROM `Out_slice.java` where state=1 or state=0 order by id limit 1;")
int SelectOutSliceshu();
}
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/OutSlice.java b/springboot-vue3/src/main/java/com/example/springboot/service/OutSlice.java
index 13764dd..27e72af 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/OutSlice.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/OutSlice.java
@@ -13,15 +13,15 @@
// List<Out_slice> resultlist = new ArrayList<Out_slice>();
// HashMap map = new HashMap<>();
// // HashMap<String,List<Out_slice>> map=new HashMap<String,List<Out_slice>>();
- // for (Out_slice out_slice : out_slices) {
- // String key_ = out_slice.getState() + "-";
+ // for (Out_slice Out_slice.java : out_slices) {
+ // String key_ = Out_slice.java.getState() + "-";
// if (map.get(key_) == null) {
// List<Out_slice> lists = new ArrayList<Out_slice>();
- // lists.add(out_slice);
+ // lists.add(Out_slice.java);
// map.put(key_, lists);
// } else {
// List<Out_slice> lists = (List<Out_slice>) map.get(key_);
- // lists.add(out_slice);
+ // lists.add(Out_slice.java);
// map.put(key_, lists);
// }
// }
@@ -31,13 +31,13 @@
// public static List<Out_slice> Orderbyresult(List<Out_slice> out_slices, int orders) {
// // orders 鎺掑簭妯″紡
// List<Out_slice> list = new ArrayList<Out_slice>();
- // for (Out_slice out_slice : out_slices) {
+ // for (Out_slice Out_slice.java : out_slices) {
// if (list.isEmpty()) {
- // list.add(out_slice);
+ // list.add(Out_slice.java);
// } else {
// for (int i = 0; i < list.size(); i++) {
// Out_slice out_slice2 = list.get(i);
- // if (out_slice.getID() > out_slice2.getID()) {
+ // if (Out_slice.java.getID() > out_slice2.getID()) {
// continue;
// } else {
// list.add(i, out_slice2);
@@ -49,15 +49,15 @@
// public static void f() {
// HashMap map = new HashMap<>();
- // for (Out_slice out_slice : listoutslice) {
- // String key_ = out_slice.getState() + "-";
+ // for (Out_slice Out_slice.java : listoutslice) {
+ // String key_ = Out_slice.java.getState() + "-";
// if (map.get(key_) == null) {
// List<Out_slice> lists = new ArrayList<Out_slice>();
- // lists.add(out_slice);
+ // lists.add(Out_slice.java);
// map.put(key_, lists);
// } else {
// List<Out_slice> lists = (List<Out_slice>) map.get(key_);
- // lists.add(out_slice);
+ // lists.add(Out_slice.java);
// map.put(key_, lists);
// }
// }
--
Gitblit v1.8.0