autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-19 18:45:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 修改保存实时数据逻辑

Browse Source
This commit is contained in:
Guoqs
2024-05-07 15:10:58 +08:00
parent 97986e5ec7
commit 0b5d05c55f
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java
View File

@@ -6,6 +6,7 @@ import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;
import com.jsowell.common.core.redis.RedisCache;
import com.jsowell.common.enums.ykc.OrderStatusEnum;
import com.jsowell.common.enums.ykc.PileConnectorStatusEnum;
import com.jsowell.common.enums.ykc.YKCPileFaultReasonEnum;
import com.jsowell.common.util.BytesUtil;
import com.jsowell.common.util.StringUtils;
@@ -233,7 +234,8 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler {
}
realTimeMonitorData.setHardwareFault(faultReason);
if (!StringUtils.equals(connectorStatus, "02")) {
// if (!StringUtils.equals(connectorStatus, "02")) {
if (!StringUtils.equals(connectorStatus, PileConnectorStatusEnum.FREE.getValue())) {
log.info("0x13上传实时监测数据==交易流水号:{}, 桩编号:{}, 枪号:{}, 状态:{}, 枪是否归位(00-否;01-是;02-未知):{}, 是否插枪(00-否;01-是):{}, 输出电压:{}, 输出电流:{}, 枪线温度:{}, " +
"枪线编码:{}, SOC:{}, 电池组最高温度:{}, 累计充电时间:{}, 剩余时间:{}, 充电度数:{}, 记损充电度数:{}, 已充金额:{}, " +
"硬件故障:{}, 故障码转换结果:{}", transactionCode, pileSn, connectorCode, connectorStatus, homingFlag, putGunType, outputVoltage,
@@ -246,14 +248,16 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler {
pileBasicInfoService.updateStatus(BytesUtil.bcd2Str(ykcDataProtocol.getFrameType()), pileSn, connectorCode, connectorStatus, putGunType);
// 01表示故障
if (StringUtils.equals(connectorStatus, "01")) {
// if (StringUtils.equals(connectorStatus, "01")) {
if (StringUtils.equals(connectorStatus, PileConnectorStatusEnum.FAULT.getValue())) {
// 故障原因存入缓存
String redisKey = CacheConstants.PILE_HARDWARE_FAULT + pileSn + connectorCode;
redisCache.setCacheObject(redisKey, faultReason, 5, TimeUnit.MINUTES);
}
// 03表示充电中
if (StringUtils.equals(connectorStatus, "03")) {
// if (StringUtils.equals(connectorStatus, "03")) {
if (StringUtils.equals(connectorStatus, PileConnectorStatusEnum.OCCUPIED_CHARGING.getValue())) {
// 默认保存到redis
boolean saveRedisFlag = true;

7
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java vendored
View File

@@ -10,6 +10,7 @@ import com.jsowell.common.core.redis.RedisCache;
import com.jsowell.common.enums.parkplatform.ParkingPlatformEnum;
import com.jsowell.common.enums.thirdparty.BusinessInformationExchangeEnum;
import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
import com.jsowell.common.enums.ykc.PileConnectorStatusEnum;
import com.jsowell.common.enums.ykc.ReturnCodeEnum;
import com.jsowell.common.enums.ykc.StartModeEnum;
import com.jsowell.common.exception.BusinessException;
@@ -592,13 +593,13 @@ public class CommonService {
* @return 第三方平台枪口状态
*/
private String changeConnectorStatus(String connectorStatus, String putGunType) {
if (StringUtils.equals(connectorStatus, "02")) {
if (StringUtils.equals(connectorStatus, PileConnectorStatusEnum.FREE.getValue())) {
// 空闲
return Constants.ONE;
} else if (StringUtils.equals(connectorStatus, "02") && StringUtils.equals(putGunType, "01")) {
} else if (StringUtils.equals(connectorStatus, PileConnectorStatusEnum.FREE.getValue()) && StringUtils.equals(putGunType, "01")) {
// 占用（未充电）
return Constants.TWO;
} else if (StringUtils.equals(connectorStatus, "01")) {
} else if (StringUtils.equals(connectorStatus, PileConnectorStatusEnum.FAULT.getValue())) {
// 故障
return "255";
}else {