From c90e9e6d615b94aec96969b59d1eaecffaf8d0ef Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 28 六月 2022 18:07:50 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/resources/application-local.yml | 2 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 8 +-------
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java | 3 +++
ximon-admin/src/main/resources/application-dev.yml | 2 +-
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
index 22fcd9a..42972c9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
@@ -67,6 +67,9 @@
if (netRequestFrame.isValidate()) {
//淇濆瓨鍏呯數妗╃‖浠朵俊鎭�
boolean b = SpringContextHolder.getBean(C3ChargingService.class).saveReporEquipment(deviceName, netRequestFrame.getMcuUdid(), netRequestFrame.getDestinationAddress());
+ //妫�鏌ユ槸鍚︽湁姝ｅ湪杩涜鐨勮鍗�
+ //TODO
+
if (!b) {
return;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
index d38244e..3f6aaf8 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -59,17 +59,11 @@
* @return 鏄惁鎴愬姛
*/
public boolean updateReportState(String deviceName, String c3Mac, String statusBit, String deviceTemperature) {
- C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, deviceName));
+ C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
if (one != null) {
-// one.setStatusBit(Integer.valueOf(statusBit));
one.setDeviceTemperature(deviceTemperature);
one.setPoleDevicesCode(deviceName);
one.setC3Mac(c3Mac);
-
-// List<C3mChargingCharge> list = c3mChargingChargeService.list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, one.getC3Id()));
-// if (list.size() == 0) {//璐圭巼琛ㄤ腑娌℃湁姝ゅ厖鐢垫々鏁版嵁鏃� 娣诲姞榛樿璐圭巼
-// c3mChargingChargeService.initCharge((one.getC3Id()).intValue());
-// }
return updateById(one);
} else {
return false;
diff --git a/ximon-admin/src/main/resources/application-dev.yml b/ximon-admin/src/main/resources/application-dev.yml
index 5feb0ba..db6f2be 100644
--- a/ximon-admin/src/main/resources/application-dev.yml
+++ b/ximon-admin/src/main/resources/application-dev.yml
@@ -14,7 +14,7 @@
database: 0 # Redis鏁版嵁搴撶储寮曪紙榛樿涓�0锛�
port: 6379 # Redis鏈嶅姟鍣ㄨ繛鎺ョ鍙�
password: uIEFHmj4bC0wJCyM # Redis鏈嶅姟鍣ㄨ繛鎺ュ瘑鐮侊紙榛樿涓虹┖锛�
- timeout: 300ms # 杩炴帴瓒呮椂鏃堕棿锛堟绉掞級
+ timeout: 10000ms # 杩炴帴瓒呮椂鏃堕棿锛堟绉掞級
server:
port: 20017
sandu:
diff --git a/ximon-admin/src/main/resources/application-local.yml b/ximon-admin/src/main/resources/application-local.yml
index fea8084..7010a04 100644
--- a/ximon-admin/src/main/resources/application-local.yml
+++ b/ximon-admin/src/main/resources/application-local.yml
@@ -14,7 +14,7 @@
database: 0 # Redis鏁版嵁搴撶储寮曪紙榛樿涓�0锛�
port: 6379 # Redis鏈嶅姟鍣ㄨ繛鎺ョ鍙�
password: uIEFHmj4bC0wJCyM # Redis鏈嶅姟鍣ㄨ繛鎺ュ瘑鐮侊紙榛樿涓虹┖锛�
- timeout: 300ms # 杩炴帴瓒呮椂鏃堕棿锛堟绉掞級
+ timeout: 10000ms # 杩炴帴瓒呮椂鏃堕棿锛堟绉掞級
server:
port: 20017
sandu:
--
Gitblit v1.9.3