From 008cd1cc43e112c0dfe737f5885ca53b7a585c02 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Fri, 13 Oct 2023 11:04:02 +0800
Subject: [PATCH] update

---
 .../pile/service/impl/PileMsgRecordServiceImpl.java  | 12 +++---------
 .../jsowell/pile/vo/web/PileCommunicationLogVO.java  |  5 +++++
 2 files changed, 8 insertions(+), 9 deletions(-)

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 2ea1ff110..9d17f04cb 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
@@ -5,7 +5,6 @@ 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;
@@ -65,17 +64,12 @@ public class PileMsgRecordServiceImpl implements IPileMsgRecordService {
 		for (PileMsgRecord pileMsgRecord : pageInfo.getList()) {
 			PileCommunicationLogVO vo = new PileCommunicationLogVO();
 			String frameType = pileMsgRecord.getFrameType();
-
-			String frameTypeStr = YKCFrameTypeCode.getFrameTypeStr(frameType);
-			if (StringUtils.isNotBlank(frameTypeStr)) {
-				vo.setDescription(frameTypeStr);
-			} else {
-				vo.setDescription(pileMsgRecord.getJsonMsg());
-			}
+			vo.setFrameType(frameType);
+			vo.setFrameTypeStr(YKCFrameTypeCode.getFrameTypeStr(frameType));
+			vo.setDescription(pileMsgRecord.getJsonMsg());
 			vo.setOriginalMsg(pileMsgRecord.getOriginalMsg());
 			vo.setPileSn(pileMsgRecord.getPileSn());
 			vo.setCreateTime(pileMsgRecord.getCreateTime());
-			vo.setFrameType(frameType);
 			list.add(vo);
 		}
 
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileCommunicationLogVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileCommunicationLogVO.java
index 88bb01115..8c9f63f9e 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileCommunicationLogVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileCommunicationLogVO.java
@@ -31,6 +31,11 @@ public class PileCommunicationLogVO {
      */
     private String frameType;
 
+    /**
+     * 帧类型名称
+     */
+    private String frameTypeStr;
+
     /**
      * 描述
      */