From 6e7005a9c8f0e9c21f2d3a4d77a779381e859ac3 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 11 四月 2026 10:35:09 +0800
Subject: [PATCH] 1
---
version/db/new.sql | 11 +++++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/ManagerBoot.java | 2 +-
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java | 11 +++++++++--
3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/version/db/new.sql b/version/db/new.sql
index 6339ce1..bdffc86 100644
--- a/version/db/new.sql
+++ b/version/db/new.sql
@@ -108,3 +108,14 @@
alter table sys_user_login
change system system_name varchar(255) null comment '鐧诲綍绯荤粺';
+
+
+
+
+ALTER TABLE `man_func_sta`
+ ADD COLUMN `protocol` varchar(255) NULL COMMENT '鍗忚' AFTER `angle`,
+ADD COLUMN `ip` varchar(255) NULL COMMENT 'ip鍦板潃' AFTER `protocol`,
+ADD COLUMN `port` varchar(255) NULL COMMENT '绔彛鍙�' AFTER `ip`;
+
+ALTER TABLE `man_func_sta`
+ ADD COLUMN `error` varchar(255) NULL COMMENT '鏁呴殰淇℃伅' AFTER `port`;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/ManagerBoot.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/ManagerBoot.java
index 03bec89..ba2fb1d 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/ManagerBoot.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/ManagerBoot.java
@@ -9,7 +9,7 @@
@MapperScan("com.zy.**.mapper")
@EnableDiscoveryClient
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {"com.zy.acs.manager", "com.zy.acs.charge"})
@EnableScheduling
public class ManagerBoot {
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
index 4df073c..370550e 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
@@ -181,6 +181,7 @@
if (!Cools.isEmpty(barcode)) {
StaProtocol staProtocol = station.get(barcodeArr.get(i));
if (staProtocol == null) {
+ log.warn("绔欑偣涓嶅瓨鍦� [id:{}] [staNo:{}]", slave.getId(), barcodeArr.get(i));
continue;
}
staProtocol.setBarcode(barcode);
@@ -209,10 +210,11 @@
for (int i = 0; i < weightArr.size(); i++) {
StaProtocol staProtocol = station.get(weightArr.get(i));
if (staProtocol == null) {
+ log.warn("绔欑偣涓嶅瓨鍦� [id:{}] [staNo:{}]", slave.getId(), weightArr.get(i));
continue;
}
- double weight = siemensS7Net.getByteTransform().TransSingle(result.Content, i * 4);
- staProtocol.setWeight(BigDecimal.valueOf(weight).setScale(2, RoundingMode.HALF_UP).doubleValue());
+ double weight = siemensS7Net.getByteTransform().TransSingle(result.Content, i * DeviceField.WEIGHT.getByteLength());
+ staProtocol.setWeight(BigDecimal.valueOf(weight).setScale(4, RoundingMode.HALF_UP).doubleValue());
}
}
@@ -238,6 +240,10 @@
for (int i = 0; i < staNosError.size(); i++) {
Integer siteId = staNosError.get(i);
StaProtocol staProtocol = station.get(siteId);
+ if (staProtocol == null){
+ log.warn("绔欑偣涓嶅瓨鍦� [id:{}] [staNo:{}]", slave.getId(), staNosError.get(i));
+ continue;
+ }
boolean[] status = siemensS7Net.getByteTransform().TransBool(
content, i * DeviceField.DIMENSION_WORD.getByteLength(),
@@ -271,6 +277,7 @@
Integer siteId = staNos.get(i);
StaProtocol staProtocol = station.get(siteId);
if (staProtocol == null) {
+ log.warn("绔欑偣涓嶅瓨鍦� [id:{}] [staNo:{}]", slave.getId(), siteId);
continue;
}
--
Gitblit v1.9.1