diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBasicInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBasicInfo.java index bb37f666b..768ff90a6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBasicInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBasicInfo.java @@ -56,9 +56,9 @@ public class PileBasicInfo extends BaseEntity { private String secretKey; /** - * 软件协议(1-云快充; 2-永联; 3-友电) + * 软件协议(yunkuaichongV150--云快充V1.5;yunkuaichongV160--云快充V1.6;yonglianV1--永联;youdianV1--友电) */ - @Excel(name = "软件协议", readConverterExp = "1=-云快充; 2-永联; 3-友电") + @Excel(name = "软件协议", readConverterExp = "yunkuaichongV150--云快充V1.5;yunkuaichongV160--云快充V1.6;yonglianV1--永联;youdianV1--友电") private String softwareProtocol; /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java index b89373ba6..1b50386c4 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java @@ -468,6 +468,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService { PileInfoVO pileInfoVO = PileInfoVO.builder() .pileId(String.valueOf(basicInfo.getId())) .pileSn(basicInfo.getSn()) + .softwareProtocol(basicInfo.getSoftwareProtocol()) .stationId(String.valueOf(basicInfo.getStationId())) .merchantId(String.valueOf(basicInfo.getMerchantId())) .build(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/PileInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/PileInfoVO.java index 1d232160d..6dc411e25 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/PileInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/PileInfoVO.java @@ -20,6 +20,12 @@ public class PileInfoVO { */ private String pileSn; + /** + * 软件协议 + * (yunkuaichongV150--云快充V1.5;yunkuaichongV160--云快充V1.6;yonglianV1--永联;youdianV1--友电) + */ + private String softwareProtocol; + /** * 所属运营商id */