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

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-10-13 11:04:02 +08:00
parent c60d54bdca
commit 008cd1cc43
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java
View File

@@ -5,7 +5,6 @@ import com.github.pagehelper.PageInfo;
import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;
import com.jsowell.common.core.page.PageResponse; import com.jsowell.common.core.page.PageResponse;
import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.BytesUtil;
import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.YKCUtils; import com.jsowell.common.util.YKCUtils;
import com.jsowell.pile.domain.PileMsgRecord; import com.jsowell.pile.domain.PileMsgRecord;
import com.jsowell.pile.dto.QueryPileDTO; import com.jsowell.pile.dto.QueryPileDTO;
@@ -65,17 +64,12 @@ public class PileMsgRecordServiceImpl implements IPileMsgRecordService {
for (PileMsgRecord pileMsgRecord : pageInfo.getList()) { for (PileMsgRecord pileMsgRecord : pageInfo.getList()) {
PileCommunicationLogVO vo = new PileCommunicationLogVO(); PileCommunicationLogVO vo = new PileCommunicationLogVO();
String frameType = pileMsgRecord.getFrameType(); String frameType = pileMsgRecord.getFrameType();
vo.setFrameType(frameType);
String frameTypeStr = YKCFrameTypeCode.getFrameTypeStr(frameType); vo.setFrameTypeStr(YKCFrameTypeCode.getFrameTypeStr(frameType));
if (StringUtils.isNotBlank(frameTypeStr)) { vo.setDescription(pileMsgRecord.getJsonMsg());
vo.setDescription(frameTypeStr);
} else {
vo.setDescription(pileMsgRecord.getJsonMsg());
}
vo.setOriginalMsg(pileMsgRecord.getOriginalMsg()); vo.setOriginalMsg(pileMsgRecord.getOriginalMsg());
vo.setPileSn(pileMsgRecord.getPileSn()); vo.setPileSn(pileMsgRecord.getPileSn());
vo.setCreateTime(pileMsgRecord.getCreateTime()); vo.setCreateTime(pileMsgRecord.getCreateTime());
vo.setFrameType(frameType);
list.add(vo); list.add(vo);
} }

5
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileCommunicationLogVO.java
View File

@@ -31,6 +31,11 @@ public class PileCommunicationLogVO {
*/ */
private String frameType; private String frameType;
/**
* 帧类型名称
*/
private String frameTypeStr;
/** /**
* 描述 * 描述
*/ */