From 7b8d89b03cbf3b8cc98419462c2e616dcb70a5fe Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 13 四月 2022 11:48:28 +0800
Subject: [PATCH] 设备汇总
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 157 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 143 insertions(+), 14 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 2a70fe6..d23a4f1 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
@@ -1,10 +1,12 @@
package com.sandu.ximon.admin.service;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.ximon.admin.config.C3mRedisConfig;
import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3OperationReportInnerFrame;
@@ -12,19 +14,25 @@
import com.sandu.ximon.admin.manager.iot.frame.inner.request.*;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3mRedisConstant;
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.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;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
+import java.util.Set;
/**
* @author ZZQ
@@ -35,7 +43,7 @@
@Slf4j
@AllArgsConstructor
public class C3ChargingService extends BaseServiceImpl<C3mChargingMapper, C3mCharging> {
-
+ private C3mChargingMapper c3mChargingMapper;
private final C3mChargingChargeService c3mChargingChargeService;
private final PoleBindingService bindingService;
private final PoleService poleService;
@@ -48,7 +56,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);
@@ -70,13 +78,14 @@
*/
public boolean saveReporEquipment(String deviceName, String mcuUdid, String c3Mac) {
C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, mcuUdid));
+ boolean flag;
if (one == null) {
//灏嗚澶囦俊鎭坊鍔犲埌鍏呯數妗╄澶囪〃
C3mCharging c3mCharging = new C3mCharging();
c3mCharging.setMcuUdid(mcuUdid);
c3mCharging.setPoleDevicesCode(deviceName);
c3mCharging.setC3Mac(c3Mac);
- boolean flag = save(c3mCharging);
+ flag = save(c3mCharging);
//璁剧疆璐圭巼
C3mCharging c3mCharging1 = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, mcuUdid));
List<C3mChargingCharge> list = c3mChargingChargeService.list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3mCharging1.getC3Id()));
@@ -84,21 +93,64 @@
c3mChargingChargeService.initCharge((c3mCharging1.getC3Id()).intValue());
}
- return flag;
} else {
//灏嗚澶囦俊鎭坊鍔犲埌鍏呯數妗╄澶囪〃
one.setPoleDevicesCode(deviceName);
one.setC3Mac(c3Mac);
- boolean flag = updateById(one);
+ flag = updateById(one);
//璁剧疆璐圭巼
C3mCharging c3mCharging1 = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, mcuUdid));
List<C3mChargingCharge> list = c3mChargingChargeService.list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3mCharging1.getC3Id()));
if (list.size() == 0) {//璐圭巼琛ㄤ腑娌℃湁姝ゅ厖鐢垫々鏁版嵁鏃� 娣诲姞榛樿璐圭巼
c3mChargingChargeService.initCharge((c3mCharging1.getC3Id()).intValue());
}
-
- return flag;
}
+ //鍚屾鏃堕棿鎴�
+ String date = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
+ String s = SetCalendar(c3Mac, Integer.parseInt(date.substring(0, 2)), Integer.parseInt(date.substring(2, 4)),
+ Integer.parseInt(date.substring(4, 6)), Integer.parseInt(date.substring(6, 8)),
+ Integer.parseInt(date.substring(8, 10)), Integer.parseInt(date.substring(10, 12)));
+ if (!"鎿嶄綔鎴愬姛".equals(s)) {
+ LogUtils.error("鍙戦�佽缃瓹3鏃堕棿鍚屾澶辫触!");
+ return false;
+ }
+
+ /** 璺冲寘鏃堕棿鍚屾
+ * 璁剧疆鏃堕棿瑙勫垯锛氬厖鐢垫椂涓�1鍊嶏紝闈炲厖鐢电姸鎬佷负1.5鍊嶆椂闂�
+ */
+ Set<String> keys = RedisUtils.getBean().keys(C3mRedisConstant.C3_STATUS.getCode() + "*");
+
+ C3mRedisConfig.reFlushTime(keys.size());
+ String time1 = SetHeartbeatPacketTimeCharging(c3Mac, C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME) * 2, false);
+ LogUtils.error("C3绌洪棽蹇冭烦鍖呮椂闂村悓姝ュ搷搴旂粨鏋滐細" + time1);
+ String time2 = SetHeartbeatPacketTimeCharging(c3Mac, C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME), true);
+ LogUtils.error("C3鍏呯數鏃跺績璺冲寘鏃堕棿鍚屾鍝嶅簲缁撴灉锛�" + time2);
+
+
+ /**
+ * 鑾峰彇蹇冭烦鍖咃紝鍒ゆ柇鍦ㄧ嚎
+ */
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = ReadTheHeartbeatPackage(c3Mac);
+ if (aPackage == null) {
+ LogUtils.error("璇诲彇蹇冭烦鍖呬负绌�");
+ return false;
+ }
+ RedisUtils redisUtils = RedisUtils.getBean();
+ redisUtils.set(
+ C3mRedisConstant.C3_STATUS.getCode() + c3Mac,
+ JSON.toJSONString(aPackage),
+ C3mRedisConfig.OUTLINE_TIME
+ );
+
+ /**
+ * finally銆佸悓姝ョ粨鏉�
+ */
+ String end = EndOfTheSynchronization(c3Mac);
+ if (!"鎿嶄綔鎴愬姛".equals(end)) {
+ LogUtils.error("C3鍚屾缁撴潫鍝嶅簲缁撴灉" + end);
+ return false;
+ }
+ return flag;
}
/**
@@ -106,10 +158,45 @@
*
* @return
*/
- public List<C3mCharging> getC3ChargingList(BaseConditionVO baseConditionVO) {
+ public List<C3ChargingBo> getC3ChargingListByKeyword(BaseConditionVO baseConditionVO, C3ChargingParam c3ChargingParam) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- return list();
+ if (c3ChargingParam == null) {
+ c3ChargingParam = new C3ChargingParam();
+ }
+
+ //鍏抽敭瀛楀幓闄ょ┖鏍�
+ if (c3ChargingParam.getKeyword() != null) {
+ c3ChargingParam.setKeyword(c3ChargingParam.getKeyword().trim());
+ }
+
+ List<C3ChargingBo> c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword());
+ 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 c3Mac){
+ C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
+ String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
+ if(s != null){
+ one.setStatusBit(1);
+ }else{
+ one.setStatusBit(0);
+ }
+ return one;
+ }
+
/**
* 寮�濮嬪厖鐢�
@@ -186,6 +273,34 @@
new C3EndOfTheSynchronizationReqInnerFrame(c3Mac);
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3EndOfTheSynchronizationReqInnerFrame);
+ System.out.println(a5Frame + " -----a5Frame");
+
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
+ if (c3mCharging == null) {
+ throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
+ }
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+
+ System.out.println(commonFrame + " -----commonFrame");
+
+ A5C3OperationReportInnerFrame operationReportInnerFrame = new A5C3OperationReportInnerFrame().transformFrame(commonFrame.getPayload());
+
+ if (operationReportInnerFrame.isValidate()) {
+ return operationReportInnerFrame.getState();
+ } else {
+ throw new BusinessException("鏁版嵁鏍￠獙閿欒锛岃閲嶆柊璇锋眰");
+ }
+ }
+
+ /**
+ * 浜岀淮鐮�
+ *
+ * @param c3Mac
+ */
+ public String QrCode(String c3Mac, String qrCodeData) {
+ C3QrCodeReqInnerFrame c3QrCodeReqInnerFrame = new C3QrCodeReqInnerFrame(c3Mac, qrCodeData);
+
+ A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3QrCodeReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
@@ -454,22 +569,34 @@
throw new BusinessException("鍦板潃淇℃伅閿欒锛�");
}
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
+ if (c3mCharging == null) {
+ throw new BusinessException("C3MAC鍦板潃涓嶅瓨鍦�");
+ }
+
+ if (getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, address)) != null) {
+ throw new BusinessException("鏂扮殑鍦板潃淇℃伅宸插瓨鍦紒");
+ }
+
C3SetAddressReqInnerFrame setAddressReqInnerFrame =
new C3SetAddressReqInnerFrame(c3Mac, address);
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), setAddressReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
- if (c3mCharging == null) {
- throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
- }
+
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
System.out.println(commonFrame + " -----commonFrame");
A5C3OperationReportInnerFrame operationReportInnerFrame = new A5C3OperationReportInnerFrame().transformFrame(commonFrame.getPayload());
if (operationReportInnerFrame.isValidate()) {
+ if ("鎿嶄綔鎴愬姛".equals(operationReportInnerFrame.getState())) {
+ //淇敼鎴愬姛闇�瑕佹洿鏀规暟鎹簱鏁版嵁
+ C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
+ one.setC3Mac(address);
+ updateById(one);
+ }
return operationReportInnerFrame.getState();
} else {
throw new BusinessException("鏁版嵁鏍￠獙閿欒锛岃閲嶆柊璇锋眰");
@@ -639,4 +766,6 @@
}
return getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, one.getDeviceCode()));
}
+
+
}
--
Gitblit v1.9.3