From c66e26b5f30eabe6fbfefbe25ff5b5363796facd Mon Sep 17 00:00:00 2001 From: Lemon Date: Sat, 4 Nov 2023 09:01:29 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E4=BA=A4=E6=98=93=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=A4=84=E7=90=86=E5=B9=B3=E5=8F=B0=E6=9C=AA=E6=89=BE?= =?UTF-8?q?=E5=88=B0=E7=9A=84=E8=AE=A2=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E6=96=B9=E5=BC=8F=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yongchengboche/YCBCController.java | 51 +++++++++++++++++++ .../impl/OrderBasicInfoServiceImpl.java | 21 +++++--- .../yongchengboche/service/YCBCService.java | 8 +++ .../service/impl/YCBCServiceImpl.java | 12 +++++ 4 files changed, 85 insertions(+), 7 deletions(-) create mode 100644 jsowell-admin/src/main/java/com/jsowell/thirdparty/yongchengboche/YCBCController.java diff --git a/jsowell-admin/src/main/java/com/jsowell/thirdparty/yongchengboche/YCBCController.java b/jsowell-admin/src/main/java/com/jsowell/thirdparty/yongchengboche/YCBCController.java new file mode 100644 index 000000000..78c4fbd6a --- /dev/null +++ b/jsowell-admin/src/main/java/com/jsowell/thirdparty/yongchengboche/YCBCController.java @@ -0,0 +1,51 @@ +package com.jsowell.thirdparty.yongchengboche; + +import com.alibaba.fastjson2.JSONObject; +import com.jsowell.common.annotation.Anonymous; +import com.jsowell.common.core.controller.BaseController; +import com.jsowell.thirdparty.lianlian.common.CommonResult; +import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO; +import com.jsowell.thirdparty.yongchengboche.service.YCBCService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.io.UnsupportedEncodingException; +import java.util.Map; + +/** + * 甬城泊车controller + * + * @author Lemon + * @Date 2023/11/3 9:39:21 + */ +@Anonymous +@RestController +@RequestMapping("/ycbc") +public class YCBCController extends BaseController { + + @Autowired + private YCBCService ycbcService; + + /** + * 获取token接口 + * http://localhost:8080/zdl/v1/query_token + */ + @PostMapping("/v1/query_token") + public CommonResult queryToken(@RequestBody CommonParamsDTO dto) { + logger.info("甬城泊车平台请求令牌 params:{}", JSONObject.toJSONString(dto)); + try { + Map map = ycbcService.generateToken(dto); + logger.info("甬城泊车平台请求令牌 result:{}", JSONObject.toJSONString(map)); + return CommonResult.success(0, "请求令牌成功！", map.get("Data"), map.get("Sig")); + } catch (UnsupportedEncodingException e) { + logger.error("甬城泊车平台 请求令牌接口 异常"); + return CommonResult.failed("获取token发生异常"); + } + } + + + +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 478d40a76..8c19e462d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1747,14 +1747,21 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 启动方式 String transactionIdentifier = data.getTransactionIdentifier(); String startMode = null; - // if (StringUtils.equals(transactionIdentifier, "01")) { - // startMode = StartModeEnum.APP.getValue(); - // } else if (StringUtils.equals(transactionIdentifier, "02")) { - // // 卡启动 - // startMode = StartModeEnum.CARD.getValue(); - // } + if (StringUtils.equals(transactionIdentifier, "01")) { + startMode = StartModeEnum.APP.getValue(); + } else if (StringUtils.equals(transactionIdentifier, "02")) { + // 鉴权卡启动 + startMode = StartModeEnum.AUTH_CARD.getValue(); + } else if (StringUtils.equals(transactionIdentifier, "04")) { + // 离线卡启动 + startMode = StartModeEnum.OFFLINE_CARD.getValue(); + } else if (StringUtils.equals(transactionIdentifier, "05")) { + // VIN启动 + startMode = StartModeEnum.VIN_CODE.getValue(); + } + // 卡号 - if (StringUtils.isNotBlank(data.getLogicCard())) { + if (StringUtils.isNotBlank(data.getLogicCard()) && !StringUtils.equals(Constants.ZERO, data.getLogicCard())) { startMode = StartModeEnum.OFFLINE_CARD.getValue(); orderBasicInfo.setLogicCard(data.getLogicCard()); // 订单状态 (2023.4.6 要求改成“订单完成”) diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/YCBCService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/YCBCService.java index d05bac3a7..8d22fae18 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/YCBCService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/YCBCService.java @@ -4,6 +4,7 @@ import com.jsowell.pile.dto.QueryEquipChargeStatusDTO; import com.jsowell.pile.dto.QueryEquipmentDTO; import com.jsowell.pile.dto.QueryStartChargeDTO; import com.jsowell.pile.dto.QueryStationInfoDTO; +import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO; import com.jsowell.thirdparty.yongchengboche.dto.YCBCGetTokenDTO; import java.io.UnsupportedEncodingException; @@ -23,6 +24,13 @@ public interface YCBCService { */ public String YCBCGetToken(YCBCGetTokenDTO dto); + /** + * 生成token + * @param dto + * @return + */ + Map generateToken(CommonParamsDTO dto) throws UnsupportedEncodingException; + /** * 查询站点信息 * @param dto diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/impl/YCBCServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/impl/YCBCServiceImpl.java index c848b5ee0..56f64fea0 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/impl/YCBCServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/impl/YCBCServiceImpl.java @@ -4,6 +4,7 @@ import com.jsowell.pile.dto.QueryEquipChargeStatusDTO; import com.jsowell.pile.dto.QueryEquipmentDTO; import com.jsowell.pile.dto.QueryStartChargeDTO; import com.jsowell.pile.dto.QueryStationInfoDTO; +import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO; import com.jsowell.thirdparty.lianlian.service.LianLianService; import com.jsowell.thirdparty.yongchengboche.dto.YCBCGetTokenDTO; import com.jsowell.thirdparty.yongchengboche.service.YCBCService; @@ -40,6 +41,17 @@ public class YCBCServiceImpl implements YCBCService { return zdlService.ZDLGetToken(dto); } + /** + * 生成令牌 + * @param dto + * @return + * @throws UnsupportedEncodingException + */ + @Override + public Map generateToken(CommonParamsDTO dto) throws UnsupportedEncodingException { + return zdlService.generateToken(dto); + } + /** * 获取充电站信息 * @param dto