From 7e2175df8ed913a858296d4fde0d268879a91daf Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 19 四月 2022 11:09:37 +0800
Subject: [PATCH] 首页
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 66 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 6 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 b176d54..f42f3dc 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
@@ -18,11 +18,14 @@
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.C3ChargingAddParam;
import com.sandu.ximon.admin.param.C3ChargingParam;
+import com.sandu.ximon.admin.param.PoleBindingParam;
+import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.bo.C3ChargingBo;
import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.C3mChargingCharge;
+import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.mapper.C3mChargingMapper;
import lombok.AllArgsConstructor;
@@ -56,7 +59,7 @@
public boolean updateReportState(String deviceName, String c3Mac, String statusBit, String deviceTemperature) {
C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getPoleDevicesCode, deviceName));
if (one != null) {
- one.setStatusBit(Integer.valueOf(statusBit));
+// one.setStatusBit(Integer.valueOf(statusBit));
one.setDeviceTemperature(deviceTemperature);
one.setPoleDevicesCode(deviceName);
one.setC3Mac(c3Mac);
@@ -105,6 +108,28 @@
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);
+
+ /**
+ * 娣诲姞缁戝畾鍏崇郴缁撴潫
+ */
+
//鍚屾鏃堕棿鎴�
String date = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
String s = SetCalendar(c3Mac, Integer.parseInt(date.substring(0, 2)), Integer.parseInt(date.substring(2, 4)),
@@ -131,7 +156,7 @@
* 鑾峰彇蹇冭烦鍖咃紝鍒ゆ柇鍦ㄧ嚎
*/
A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = ReadTheHeartbeatPackage(c3Mac);
- if(aPackage == null){
+ if (aPackage == null) {
LogUtils.error("璇诲彇蹇冭烦鍖呬负绌�");
return false;
}
@@ -147,7 +172,7 @@
*/
String end = EndOfTheSynchronization(c3Mac);
if (!"鎿嶄綔鎴愬姛".equals(end)) {
- LogUtils.error("C3鍚屾缁撴潫鍝嶅簲缁撴灉"+end);
+ LogUtils.error("C3鍚屾缁撴潫鍝嶅簲缁撴灉" + end);
return false;
}
return flag;
@@ -169,10 +194,40 @@
c3ChargingParam.setKeyword(c3ChargingParam.getKeyword().trim());
}
- List<C3ChargingBo> c3ChargingBoList
- = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword());
+ List<C3ChargingBo> c3ChargingBoList;
+ if(SecurityUtils.getClientId() == null){
+ c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), null);
+ }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);
+ } else {
+ one.setStatusBit(0);
+ }
+
+ }
return c3ChargingBoList;
}
+
+ /**
+ * 鏌ヨ鍏呯數妗�
+ *
+ * @return
+ */
+ public C3mCharging getByC3Mac(String udid) {
+ 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);
+ } else {
+ one.setStatusBit(0);
+ }
+ return one;
+ }
+
/**
* 寮�濮嬪厖鐢�
@@ -742,7 +797,6 @@
}
return getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, one.getDeviceCode()));
}
-
}
--
Gitblit v1.9.3