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 9b73a8a4f..62906702d 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
@@ -93,8 +93,7 @@ public class PileMsgRecordServiceImpl implements IPileMsgRecordService {
@Override
public String generateDescription(PileMsgRecord pileMsgRecord) {
String result = null;
-
- String frameType = YKCUtils.frameType2Str(pileMsgRecord.getFrameType().getBytes());
+ String frameType = pileMsgRecord.getFrameType();
String jsonMsg = pileMsgRecord.getJsonMsg();
switch (frameType) {
case "0x01" :
@@ -112,11 +111,35 @@ public class PileMsgRecordServiceImpl implements IPileMsgRecordService {
private String loginMsg(String jsonMsg) {
JSONObject jsonObject = JSONObject.parseObject(jsonMsg);
+
+ // iccid
String iccid = jsonObject.getString("iccid");
+
+ // 设备程序版本
String programVersion = jsonObject.getString("programVersion");
+
+ // 枪口数量
Integer connectorNum = jsonObject.getInteger("connectorNum");
+
+ // 网络链接类型
String internetConnection = jsonObject.getString("internetConnection");
+ if (StringUtils.equals(internetConnection, "00")) {
+ internetConnection = "SIM卡";
+ } else if (StringUtils.equals(internetConnection, "01")) {
+ internetConnection = "LAN";
+ } else if (StringUtils.equals(internetConnection, "02")) {
+ internetConnection = "WAN";
+ } else {
+ internetConnection = "其他";
+ }
+
+ // 桩类型
String pileType = jsonObject.getString("pileType");
+ if (StringUtils.equals(pileType, "1")) {
+ pileType = "运营桩";
+ } else {
+ pileType = "个人桩";
+ }
return "SIM卡号:" + iccid + ", " +
"设备程序版本:" + programVersion + ", " +
"桩类型:" + pileType + ", " +
diff --git a/jsowell-ui/src/views/pile/basic/detail.vue b/jsowell-ui/src/views/pile/basic/detail.vue
index cdcd74319..6fd96a82c 100644
--- a/jsowell-ui/src/views/pile/basic/detail.vue
+++ b/jsowell-ui/src/views/pile/basic/detail.vue
@@ -284,19 +284,19 @@
prop="createTime"
label="时间"
align="center"
- width="200"
+ width="150"
/>