diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java index 9e77b4f5b..f2d922bfc 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java @@ -245,4 +245,8 @@ public class PersonPileController extends BaseController { logger.info("获取个人桩充电记录 result:{}", response); return response; } + + /** + * 个人桩启动充电 + */ } diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java index a2c370613..1122398f1 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java @@ -7,6 +7,7 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.file.AliyunOssUploadUtils; import com.jsowell.common.util.file.FileUploadUtils; import com.jsowell.common.util.file.FileUtils; +import com.jsowell.common.util.file.FtpUtils; import com.jsowell.framework.config.ServerConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -99,6 +100,11 @@ public class CommonController { String filePath = JsowellConfig.getUploadPath(); // 上传并返回新文件名称 String fileName = FileUploadUtils.upload(filePath, file); + try { + FtpUtils.upLoad(filePath, file); + } catch (Exception e) { + log.error("FTP上传固件error", e); + } String url = serverConfig.getUrl() + fileName; AjaxResult ajax = AjaxResult.success(); ajax.put("url", url); 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 7b4f32724..93be2c4ec 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 @@ -8,9 +8,11 @@ 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.OrderBasicInfo; import com.jsowell.pile.domain.PileMsgRecord; import com.jsowell.pile.dto.QueryPileDTO; import com.jsowell.pile.mapper.PileMsgRecordMapper; +import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.service.PileMsgRecordService; import com.jsowell.pile.vo.web.PileCommunicationLogVO; import org.springframework.beans.factory.annotation.Autowired; @@ -25,6 +27,9 @@ public class PileMsgRecordServiceImpl implements PileMsgRecordService { @Autowired private PileMsgRecordMapper pileMsgRecordMapper; + @Autowired + private OrderBasicInfoService orderBasicInfoService; + @Override public void save(String pileSn, String connectorCode, String frameType, String jsonMsg, String originalMsg) { PileMsgRecord pileMsgRecord = PileMsgRecord.builder() @@ -191,16 +196,27 @@ public class PileMsgRecordServiceImpl implements PileMsgRecordService { */ private String transactionRecordMsg(String jsonMsg) { JSONObject jsonObject = JSONObject.parseObject(jsonMsg); + + // 订单号 String orderCode = jsonObject.getString("orderCode"); + + // 交易流水号 + String transactionCode = jsonObject.getString("transactionCode"); + OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode); + // 充电度数 String totalElectricity = jsonObject.getString("totalElectricity"); + // 消费金额 String consumptionAmount = jsonObject.getString("consumptionAmount"); + // 开始时间 String startTime = jsonObject.getString("startTime"); + // 结束时间 String endTime = jsonObject.getString("endTime"); + // 枪口编号 String pileConnectorCode = jsonObject.getString("pileSn") + jsonObject.getString("connectorCode"); diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index f40233f8c..c8cc3b377 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -2534,7 +2534,6 @@ limit 1 -