From cda9d3a12240ad659efc11603862487d946715b2 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 27 四月 2022 18:14:08 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 60 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 24 deletions(-)
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 f42f3dc..f5ed65b 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
@@ -57,7 +57,7 @@
* @return 鏄惁鎴愬姛
*/
public boolean updateReportState(String deviceName, String c3Mac, String statusBit, String deviceTemperature) {
- C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getPoleDevicesCode, deviceName));
+ C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, c3Mac));
if (one != null) {
// one.setStatusBit(Integer.valueOf(statusBit));
one.setDeviceTemperature(deviceTemperature);
@@ -108,23 +108,23 @@
c3mChargingChargeService.initCharge((c3mCharging1.getC3Id()).intValue());
}
}
- /**
- * 娣诲姞缁戝畾鍏崇郴寮�濮�
- */
- Pole pole = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName));
- if (pole == null) {
- Pole pole1 = new Pole();
- pole1.setDeviceCode(deviceName);
- pole1.setPoleName(deviceName);
- pole1.setPoleCode(poleService.generatePoleCode());
- poleService.save(pole1);
- }
-
- Long poleId = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName)).getId();
- PoleBindingParam poleBindingParam = new PoleBindingParam();
- poleBindingParam.setDeviceType(2);
- poleBindingParam.setDeviceCode(mcuUdid);
- bindingService.bindPole(poleId, poleBindingParam);
+// /**
+// * 娣诲姞缁戝畾鍏崇郴寮�濮�
+// */
+// Pole pole = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName));
+// if (pole == null) {
+// Pole pole1 = new Pole();
+// pole1.setDeviceCode(deviceName);
+// pole1.setPoleName(deviceName);
+// pole1.setPoleCode(poleService.generatePoleCode());
+// poleService.save(pole1);
+// }
+//
+// Long poleId = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName)).getId();
+// PoleBindingParam poleBindingParam = new PoleBindingParam();
+// poleBindingParam.setDeviceType(2);
+// poleBindingParam.setDeviceCode(mcuUdid);
+// bindingService.bindPole(poleId, poleBindingParam);
/**
* 娣诲姞缁戝畾鍏崇郴缁撴潫
@@ -184,7 +184,9 @@
* @return
*/
public List<C3ChargingBo> getC3ChargingListByKeyword(BaseConditionVO baseConditionVO, C3ChargingParam c3ChargingParam) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
if (c3ChargingParam == null) {
c3ChargingParam = new C3ChargingParam();
}
@@ -195,15 +197,20 @@
}
List<C3ChargingBo> c3ChargingBoList;
- if(SecurityUtils.getClientId() == null){
+ if (SecurityUtils.getClientId() == null) {
c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), null);
- }else{
+ } else {
c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), SecurityUtils.getUserId());
}
for (C3ChargingBo one : c3ChargingBoList) {
String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
if (s != null) {
- one.setStatusBit(1);
+ try {
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = JSON.parseObject(s, A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage.class);
+ one.setStatusBit((Integer.valueOf(beatDataPackage.getStatusBit())));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
} else {
one.setStatusBit(0);
}
@@ -221,7 +228,12 @@
C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, udid));
String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
if (s != null) {
- one.setStatusBit(1);
+ try {
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = JSON.parseObject(s, A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage.class);
+ one.setStatusBit((Integer.valueOf(beatDataPackage.getStatusBit())));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
} else {
one.setStatusBit(0);
}
@@ -795,7 +807,7 @@
if (one == null) {
throw new BusinessException("鏈壘鍒扮粦瀹氬叧绯�");
}
- return getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, one.getDeviceCode()));
+ return getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, one.getDeviceCode()));
}
--
Gitblit v1.9.3