XMPoleManager.git

			@@ -1,12 +1,15 @@
			package com.sandu.ximon.admin.manager.iot.amqp.processor;

			import com.sandu.common.util.SpringContextHolder;
			import com.sandu.ximon.admin.config.RedisConfig;
			import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3CommonReportInnerFrame;
			import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
			import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3OperationReportInnerFrame;
			import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
			import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3ChargingEnum;
			import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3mRedisConstant;
			import com.sandu.ximon.admin.service.C3ChargingService;
			import com.sandu.ximon.admin.utils.RedisUtils;
			import lombok.extern.slf4j.Slf4j;

			/**
			@@ -41,6 +44,9 @@
			, heartbeatReportInnerFrame.getHeartBeatDataPackage().getC3Mac()
			, heartbeatReportInnerFrame.getHeartBeatDataPackage().getStatusBit()
			, heartbeatReportInnerFrame.getHeartBeatDataPackage().getDeviceTemperature());

			RedisUtils.getBean().set(C3mRedisConstant.C3_STATUS.getCode() + heartbeatReportInnerFrame.getHeartBeatDataPackage().getC3Mac()
			, 1, 300L);
			}
			} else if (C3ChargingEnum.StartCharging.getCode().equals(functionCode)) {
			log.info("心跳响应——C3充电桩开始充电");
			@@ -58,7 +64,7 @@

			if (netRequestFrame.isValidate()) {
			boolean b = SpringContextHolder.getBean(C3ChargingService.class).saveReporEquipment(deviceName, netRequestFrame.getMcuUdid(), netRequestFrame.getDestinationAddress());
			if(!b){
			if (!b) {
			return;
			}
			}

			@@ -56,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);
			@@ -131,7 +131,7 @@
			* 获取心跳包，判断在线
			*/
			A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = ReadTheHeartbeatPackage(c3Mac);
			if(aPackage == null){
			if (aPackage == null) {
			LogUtils.error("读取心跳包为空");
			return false;
			}
			@@ -147,7 +147,7 @@
			*/
			String end = EndOfTheSynchronization(c3Mac);
			if (!"操作成功".equals(end)) {
			LogUtils.error("C3同步结束响应结果"+end);
			LogUtils.error("C3同步结束响应结果" + end);
			return false;
			}
			return flag;
			@@ -169,8 +169,16 @@
			c3ChargingParam.setKeyword(c3ChargingParam.getKeyword().trim());
			}

			List<C3ChargingBo> c3ChargingBoList
			= c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword());
			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;
			}

			@@ -742,7 +750,6 @@
			}
			return getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, one.getDeviceCode()));
			}



			}

	ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史