From 84f71b77fd5a497fab36f47ac72debc118b782e8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 30 十一月 2022 15:47:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 31 +++++++++++++++++--------------
src/main/resources/application.yml | 2 +-
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 3e4bde1..0d330da 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2789,22 +2789,25 @@
if (Cools.isEmpty(steProtocol, basSte)) {
continue;
}
- // 1鍙峰厖鐢垫々
- if (value.equals(SteChargeType.FIRST) && devpThread.charge0) {
+ if (steProtocol.getCharge() < 99) {
continue;
}
- // 2鍙峰厖鐢垫々
- if (value.equals(SteChargeType.SECOND) && devpThread.charge1) {
- continue;
- }
- // 3鍙峰厖鐢垫々
- if (value.equals(SteChargeType.THIRD) && devpThread.charge2) {
- continue;
- }
- // 灏忚溅鏄惁澶勪簬鍏呯數鐘舵��
- if (steProtocol.getChargeStatus() == 1) {
- continue;
- }
+// // 1鍙峰厖鐢垫々
+// if (value.equals(SteChargeType.FIRST) && devpThread.charge0) {
+// continue;
+// }
+// // 2鍙峰厖鐢垫々
+// if (value.equals(SteChargeType.SECOND) && devpThread.charge1) {
+// continue;
+// }
+// // 3鍙峰厖鐢垫々
+// if (value.equals(SteChargeType.THIRD) && devpThread.charge2) {
+// continue;
+// }
+// // 灏忚溅鏄惁澶勪簬鍏呯數鐘舵��
+// if (steProtocol.getChargeStatus() == 1) {
+// continue;
+// }
// case 1 : 鑷姩鍏呯數寮� 棣堢數 脳
// case 2 : 鑷姩鍏呯數寮� 婊＄數 鉁�
// case 3 : 鑷姩鍏呯數鍏� 棣堢數 鉁�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index de7f74e..77ecf77 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -47,7 +47,7 @@
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 2
# 绌挎杞﹂�氶亾搴撲綅
- channel: 0200201
+ channel: '0200201'
# 鍫嗗灈鏈�1
crn[0]:
id: 1
--
Gitblit v1.9.1