From 96b93ccecedabe77676c57f8c41842a1dda21180 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 20 三月 2023 15:33:08 +0800
Subject: [PATCH] optimize charge port
---
service-api/src/main/java/com/java110/api/controller/app/charge/NotifyDingDingChargeController.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/controller/app/charge/NotifyDingDingChargeController.java b/service-api/src/main/java/com/java110/api/controller/app/charge/NotifyDingDingChargeController.java
index 869c2f8..059395f 100644
--- a/service-api/src/main/java/com/java110/api/controller/app/charge/NotifyDingDingChargeController.java
+++ b/service-api/src/main/java/com/java110/api/controller/app/charge/NotifyDingDingChargeController.java
@@ -36,7 +36,7 @@
private INotifyChargeV1InnerServiceSMO notifyChargeV1InnerServiceSMOImpl;
/**
- * <p>鏀粯鍥炶皟Api</p>
+ * <p>鍏呯數缁撴潫閫氱煡</p>
*
* @param request
* @throws Exception
@@ -80,25 +80,29 @@
* @param request
* @throws Exception
*/
- @RequestMapping(path = "/{id}/event", method = RequestMethod.POST)
- public ResponseEntity<String> heartbeat(
+ @RequestMapping(path = "/{id}/power", method = RequestMethod.POST)
+ public ResponseEntity<String> workHeartbeat(
@PathVariable String id,
@RequestBody String postInfo,
HttpServletRequest request) {
- if (!validateSign(request, "/equipments/" + id + "/event", postInfo)) {
+ if (!validateSign(request, "/equipments/" + id + "/power", postInfo)) {
return new ResponseEntity<>("{\n" +
"\"code\" : -1,\n" +
"\"msg\" : \"閴存潈澶辫触\"\n" +
"}", HttpStatus.OK);
}
- JSONObject param = JSONObject.parseObject(postInfo);
NotifyChargeOrderDto notifyChargeOrderDto = new NotifyChargeOrderDto();
notifyChargeOrderDto.setMachineCode(id);
notifyChargeOrderDto.setBodyParam(postInfo);
+ ResultVo resultVo = null;
+ resultVo = notifyChargeV1InnerServiceSMOImpl.workHeartbeat(notifyChargeOrderDto);
+ if (resultVo.getCode() == ResultVo.CODE_OK) {
+ resultVo.setCode(200);
+ resultVo.setMsg("success");
+ }
- return notifyChargeV1InnerServiceSMOImpl.heartbeat(notifyChargeOrderDto);
-
+ return ResultVo.createResponseEntity(resultVo);
}
private boolean validateSign(HttpServletRequest request, String url, String postInfo) {
--
Gitblit v1.8.0