From 1310ca11b7aec973c6d75f986fb980b2446baafe Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 20 八月 2020 15:40:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/CrnError6.java | 11 +++
src/main/java/com/zy/core/model/protocol/CrnError5.java | 11 +++
src/main/webapp/views/pipeline.html | 30 +++++----
src/main/java/com/zy/core/model/protocol/CrnError4.java | 11 +++
src/main/java/com/zy/core/thread/CrnThread.java | 19 +++--
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 47 +++++++++++++++
src/main/java/com/zy/core/model/protocol/CrnError3.java | 11 +++
7 files changed, 116 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/CrnError3.java b/src/main/java/com/zy/core/model/protocol/CrnError3.java
new file mode 100644
index 0000000..0430e1e
--- /dev/null
+++ b/src/main/java/com/zy/core/model/protocol/CrnError3.java
@@ -0,0 +1,11 @@
+package com.zy.core.model.protocol;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020/8/17
+ */
+@Data
+public class CrnError3 {
+
+}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnError4.java b/src/main/java/com/zy/core/model/protocol/CrnError4.java
new file mode 100644
index 0000000..1d34239
--- /dev/null
+++ b/src/main/java/com/zy/core/model/protocol/CrnError4.java
@@ -0,0 +1,11 @@
+package com.zy.core.model.protocol;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020/8/17
+ */
+@Data
+public class CrnError4 {
+
+}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnError5.java b/src/main/java/com/zy/core/model/protocol/CrnError5.java
new file mode 100644
index 0000000..47d1863
--- /dev/null
+++ b/src/main/java/com/zy/core/model/protocol/CrnError5.java
@@ -0,0 +1,11 @@
+package com.zy.core.model.protocol;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020/8/17
+ */
+@Data
+public class CrnError5 {
+
+}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnError6.java b/src/main/java/com/zy/core/model/protocol/CrnError6.java
new file mode 100644
index 0000000..a449f3c
--- /dev/null
+++ b/src/main/java/com/zy/core/model/protocol/CrnError6.java
@@ -0,0 +1,11 @@
+package com.zy.core.model.protocol;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020/8/17
+ */
+@Data
+public class CrnError6 {
+
+}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index 13c51ed..3fbc73c 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -122,9 +122,32 @@
private CrnError2 crnError2;
/**
- * 淇濈暀
+ * 寮傚父3
*/
- private Short temp1;
+ private boolean[] error3;
+
+ private CrnError3 crnError3;
+
+ /**
+ * 寮傚父4
+ */
+ private boolean[] error4;
+
+ private CrnError4 crnError4;
+
+ /**
+ * 寮傚父5
+ */
+ private boolean[] error5;
+
+ private CrnError5 crnError5;
+
+ /**
+ * 寮傚父6
+ */
+ private boolean[] error6;
+
+ private CrnError6 crnError6;
/**
* X琛岃蛋绾块�熷害m/min
@@ -243,6 +266,26 @@
this.crnError2.none = error2[15];
}
+ public void setError3(boolean[] error3) {
+ this.error3 = error3;
+ this.crnError3 = new CrnError3();
+ }
+
+ public void setError4(boolean[] error4) {
+ this.error4 = error4;
+ this.crnError4 = new CrnError4();
+ }
+
+ public void setError5(boolean[] error5) {
+ this.error5 = error5;
+ this.crnError5 = new CrnError5();
+ }
+
+ public void setError6(boolean[] error6) {
+ this.error6 = error6;
+ this.crnError6 = new CrnError6();
+ }
+
/**
* 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
* I:鍏ュ簱
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 06b844e..148a3e5 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -130,14 +130,17 @@
// 寮傚父淇℃伅
crnProtocol.setError1(siemensNet.getByteTransform().TransBool(result.Content, 22, 2));
crnProtocol.setError2(siemensNet.getByteTransform().TransBool(result.Content, 24, 2));
- crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 26));
- crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
- crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
- crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
- crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 40));
- crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
- crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
- crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
+ crnProtocol.setError3(siemensNet.getByteTransform().TransBool(result.Content, 26, 2));
+ crnProtocol.setError4(siemensNet.getByteTransform().TransBool(result.Content, 28, 2));
+ crnProtocol.setError5(siemensNet.getByteTransform().TransBool(result.Content, 30, 2));
+ crnProtocol.setError6(siemensNet.getByteTransform().TransBool(result.Content, 32, 2));
+ crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 34));
+ crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 38));
+ crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 42));
+ crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 46));
+ crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 50));
+ crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 54));
+ crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 58));
/**
* 褰撹鍒皊tatus == 90.浠诲姟瀹屾垚绛夊緟WCS纭 鏃�
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 31c41bf..7ee7f06 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -129,21 +129,23 @@
},500);
$(document).on('click','#site-table tr', function () {
- layer.open({
- type: 1,
- title: false,
- shadeClose: true,
- offset: 'rt',
- anim: 5,
- shade: [0],
- area: ['340px', '215px'],
- closeBtn: 0,
- content: $("#site-detl"),
- success: function(layero, index){
+ var siteId = $(this).children("td").eq(0).html();
+ if (siteId !== null && siteId !== "") {
+ layer.open({
+ type: 1,
+ title: false,
+ shadeClose: true,
+ offset: 'rt',
+ anim: 5,
+ shade: [0],
+ area: ['340px', '215px'],
+ closeBtn: 0,
+ content: $("#site-detl"),
+ success: function(layero, index){
- }
- })
- console.log($(this).children("td").eq(0).html());
+ }
+ })
+ }
});
--
Gitblit v1.9.1