diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java index 1c45daa02..4184ee8c2 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java @@ -118,7 +118,6 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{ .inputPasswordByteArr(inputPasswordHexStr) .physicsCard(physicsCard) .vinCode(vinCode) - .build(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java index 7fdb2f3b6..9b73a8a4f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.core.page.PageResponse; import com.jsowell.common.util.BytesUtil; +import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.YKCUtils; import com.jsowell.pile.domain.PileMsgRecord; import com.jsowell.pile.dto.QueryPileDTO; @@ -67,7 +68,7 @@ public class PileMsgRecordServiceImpl implements IPileMsgRecordService { String frameType = pileMsgRecord.getFrameType(); vo.setFrameType(frameType); vo.setFrameTypeStr(YKCFrameTypeCode.getFrameTypeStr(frameType)); - vo.setDescription(pileMsgRecord.getJsonMsg()); + vo.setDescription(generateDescription(pileMsgRecord)); vo.setOriginalMsg(pileMsgRecord.getOriginalMsg()); vo.setPileSn(pileMsgRecord.getPileSn()); vo.setCreateTime(pileMsgRecord.getCreateTime()); @@ -100,7 +101,7 @@ public class PileMsgRecordServiceImpl implements IPileMsgRecordService { result = loginMsg(jsonMsg); break; case "0x31" : - result = loginMsg(jsonMsg); + result = requestStartChargingMsg(jsonMsg); break; default: @@ -125,7 +126,23 @@ public class PileMsgRecordServiceImpl implements IPileMsgRecordService { private String requestStartChargingMsg(String jsonMsg) { JSONObject jsonObject = JSONObject.parseObject(jsonMsg); - jsonObject.getString(""); - return null; + // 启动方式 + String startMode = jsonObject.getString("startMode"); + if (StringUtils.equals(startMode, "0x01")) { + startMode = "离线卡启动"; + } else if (StringUtils.equals(startMode, "0x02")) { + startMode = "帐号启动"; + } else if (StringUtils.equals(startMode, "0x03")) { + startMode = "VIN启动"; + } else { + startMode = "未知"; + } + String physicsCard = jsonObject.getString("physicsCard"); + String vinCode = jsonObject.getString("vinCode"); + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append("启动方式:").append(startMode).append(", "); + stringBuilder.append("物理卡号:").append(physicsCard).append(", "); + stringBuilder.append("vinCode:").append(vinCode).append(", "); + return stringBuilder.toString(); } }