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

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source 
# Conflicts:
#	jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java
This commit is contained in:
Lemon
2024-03-20 08:20:35 +08:00
parent 04c5082fdc 89ad6c06db
commit f76b436c03
100 changed files with 473 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jsowell-admin/src/main/java/com/jsowell/api/uniapp/AgentDevController.java
View File

@@ -1,6 +1,6 @@
package com.jsowell.api.uniapp;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.google.common.collect.ImmutableMap;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
@@ -97,7 +97,7 @@ public class AgentDevController extends BaseController {
*/
@PostMapping("/getComponentToken")
public RestApiResponse<?> getComponentToken(@RequestBody GetComponentTokenDTO dto) {
logger.info("获取第三方平台令牌 params:{}", JSONObject.toJSONString(dto));
logger.info("获取第三方平台令牌 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String componentToken = agentDevService.getComponentToken(dto);
@@ -139,7 +139,7 @@ public class AgentDevController extends BaseController {
*/
@PostMapping("/concatenateAuthLinks")
public RestApiResponse<?> concatenateAuthLinks(@RequestBody ConcatenateAuthLinkDTO dto) {
logger.info("第三方平台 拼接授权链接 params:{}", JSONObject.toJSONString(dto));
logger.info("第三方平台 拼接授权链接 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String url = agentDevService.concatenateAuthLinks(dto);
@@ -183,7 +183,7 @@ public class AgentDevController extends BaseController {
*/
@PostMapping("/commitCode")
public RestApiResponse<?> commitCode(@RequestBody CommitCodeDTO dto) {
logger.info("提交代码并生成体验版小程序 params:{}", JSONObject.toJSONString(dto));
logger.info("提交代码并生成体验版小程序 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String commitResult = agentDevService.commitCode(dto);
@@ -224,7 +224,7 @@ public class AgentDevController extends BaseController {
*/
@PostMapping("/submitAudit")
public RestApiResponse<?> submitAudit(@RequestBody SubmitAuditDTO dto) {
logger.info("提交代码审核 params:{}", JSONObject.toJSONString(dto));
logger.info("提交代码审核 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String result = agentDevService.submitAudit(dto);
@@ -245,7 +245,7 @@ public class AgentDevController extends BaseController {
*/
@PostMapping("/getAuditStatus")
public RestApiResponse<?> getAuditStatus(@RequestBody GetAuditStatusDTO dto) {
logger.info("获取审核状态 params:{}", JSONObject.toJSONString(dto));
logger.info("获取审核状态 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String result = agentDevService.getAuditStatus(dto);
@@ -286,7 +286,7 @@ public class AgentDevController extends BaseController {
*/
@PostMapping("/setPrivacySetting")
public RestApiResponse<?> setPrivacySetting (@RequestBody PrivacySettingDTO dto) {
logger.info("设置小程序用户隐私保护指引 params:{}", JSONObject.toJSONString(dto));
logger.info("设置小程序用户隐私保护指引 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String result = agentDevService.setPrivacySetting(dto);
@@ -306,7 +306,7 @@ public class AgentDevController extends BaseController {
*/
@PostMapping("/wechatLogin")
public RestApiResponse<?> wechatLogin(@RequestBody AgentWechatLoginDTO dto) {
logger.info("第三方平台微信一键登录 params:{}", JSONObject.toJSONString(dto));
logger.info("第三方平台微信一键登录 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberToken = agentDevService.wechatLogin(dto);

6
jsowell-admin/src/main/java/com/jsowell/api/uniapp/AuthCardController.java
View File

@@ -1,6 +1,6 @@
package com.jsowell.api.uniapp;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.enums.ykc.ReturnCodeEnum;
@@ -66,7 +66,7 @@ public class AuthCardController extends BaseController {
*/
@PostMapping("/bindAuthCard")
public RestApiResponse<?> bindAuthCard(HttpServletRequest request, @RequestBody PileAuthCardDTO dto) {
logger.info("用户绑定鉴权卡 params: {}", JSONObject.toJSONString(dto));
logger.info("用户绑定鉴权卡 params: {}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -101,7 +101,7 @@ public class AuthCardController extends BaseController {
*/
@PostMapping("/unbindAuthCard")
public RestApiResponse<?> unbindAuthCard(HttpServletRequest request, @RequestBody PileAuthCardDTO dto) {
logger.info("用户解绑鉴权卡 params:{}", JSONObject.toJSONString(dto));
logger.info("用户解绑鉴权卡 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);

6
jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java
View File

@@ -1,6 +1,6 @@
package com.jsowell.api.uniapp;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.domain.AjaxResult;
@@ -60,7 +60,7 @@ public class JumpController extends BaseController {
logger.error("app-xcx-h5查询充电桩详情 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_PILE_DETAIL_ERROR);
}
logger.info("app-xcx-h5查询充电桩详情 param:{}, result:{}", pileSn, JSONObject.toJSONString(response));
logger.info("app-xcx-h5查询充电桩详情 param:{}, result:{}", pileSn, JSON.toJSONString(response));
return response;
}
@@ -105,7 +105,7 @@ public class JumpController extends BaseController {
logger.error("app-xcx-h5查询充电枪口详情 error param:{}", pileConnectorCode, e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_PILE_DETAIL_ERROR);
}
logger.info("app-xcx-h5查询充电枪口详情 param:{} result:{}", pileConnectorCode, JSONObject.toJSONString(response));
logger.info("app-xcx-h5查询充电枪口详情 param:{} result:{}", pileConnectorCode, JSON.toJSONString(response));
return response;
}

6
jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpXixiaoController.java
View File

@@ -1,6 +1,6 @@
package com.jsowell.api.uniapp;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.domain.AjaxResult;
@@ -51,7 +51,7 @@ public class JumpXixiaoController extends BaseController {
logger.error("app-xcx-h5查询充电桩详情 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_PILE_DETAIL_ERROR);
}
logger.info("app-xcx-h5查询充电桩详情 param:{}, result:{}", pileSn, JSONObject.toJSONString(response));
logger.info("app-xcx-h5查询充电桩详情 param:{}, result:{}", pileSn, JSON.toJSONString(response));
return response;
}
@@ -74,7 +74,7 @@ public class JumpXixiaoController extends BaseController {
logger.error("app-xcx-h5查询充电枪口详情 error param:{}", pileConnectorCode, e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_PILE_DETAIL_ERROR);
}
logger.info("app-xcx-h5查询充电枪口详情 param:{} result:{}", pileConnectorCode, JSONObject.toJSONString(response));
logger.info("app-xcx-h5查询充电枪口详情 param:{} result:{}", pileConnectorCode, JSON.toJSONString(response));
return response;
}

39
jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java
View File

@@ -57,7 +57,7 @@ public class MemberController extends BaseController {
*/
@PostMapping("/sendSMS")
public RestApiResponse<?> sendSMS(HttpServletRequest request, @RequestBody MemberRegisterAndLoginDTO dto) {
logger.info("下发短信接口 param:{}", JSONObject.toJSONString(dto));
// logger.info("下发短信接口 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
if (StringUtils.isBlank(dto.getMobileNumber())) {
@@ -69,7 +69,7 @@ public class MemberController extends BaseController {
logger.error("下发短信接口 发生异常 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_SEND_SMS_ERROR);
}
logger.info("下发短信接口 result:{}", JSONObject.toJSONString(response));
logger.info("下发短信接口, param:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response));
return response;
}
@@ -81,7 +81,7 @@ public class MemberController extends BaseController {
*/
@PostMapping("/memberRegisterAndLogin")
public RestApiResponse<?> memberRegisterAndLogin(HttpServletRequest request, @RequestBody MemberRegisterAndLoginDTO dto) {
logger.info("会员登录注册接口 param:{}", JSONObject.toJSONString(dto));
logger.info("会员登录注册接口 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String appId = request.getHeader("appId");
@@ -136,7 +136,7 @@ public class MemberController extends BaseController {
*/
@PostMapping("/saveUserInfo")
public RestApiResponse<?> saveUserInfo(HttpServletRequest request, @RequestBody MemberRegisterDTO dto) {
logger.info("接受前端用户信息并处理 param:{}", JSONObject.toJSONString(dto));
// logger.info("接受前端用户信息并处理 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -146,7 +146,7 @@ public class MemberController extends BaseController {
logger.error("处理用户信息异常", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_HANDLE_USER_INFO_ERROR);
}
logger.info("接受前端用户信息并处理 result:{}", response);
logger.info("接受前端用户信息并处理, param:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response));
return response;
}
@@ -266,19 +266,23 @@ public class MemberController extends BaseController {
*/
@GetMapping("/getMemberCarNoInfo")
public RestApiResponse<?> getMemberCarNoInfo(HttpServletRequest request) {
String memberId = getMemberIdByAuthorization(request);
logger.info("通过 memberId 查询用户个人基本信息 param:{}", memberId);
// logger.info("通过 memberId 查询用户个人基本信息 param:{}", memberId);
RestApiResponse<?> response = null;
String memberId = null;
try {
memberId = getMemberIdByAuthorization(request);
MemberPlateNumberRelation info = new MemberPlateNumberRelation();
info.setMemberId(memberId);
List<MemberPlateNumberRelation> resultList = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(info);
response = new RestApiResponse<>(resultList);
} catch (BusinessException e) {
logger.error("通过 memberId 查询用户个人基本信息 error", e);
response = new RestApiResponse<>(e.getCode(), e.getMessage());
} catch (Exception e) {
logger.error("通过 memberId 查询用户个人基本信息 error", e);
response = new RestApiResponse<>(e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_MEMBER_CAR_NO_INFO_ERROR);
}
logger.info("通过 memberId 查询用户个人基本信息 result:{}", response);
logger.info("通过memberId查询用户个人基本信息, memberId:{}, result:{}", memberId, JSON.toJSONString(response));
return response;
}
@@ -291,7 +295,8 @@ public class MemberController extends BaseController {
*/
@PostMapping("/memberBindingCarNo")
public RestApiResponse<?> memberBindingCarNo(HttpServletRequest request, @RequestBody BindingCarNoDTO dto) {
logger.info("用户绑定车牌号 param:{}", JSONObject.toJSONString(dto));
// logger.info("用户绑定车牌号 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
// 参数校验
@@ -309,7 +314,7 @@ public class MemberController extends BaseController {
logger.error("用户绑定车牌号 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_USER_BINDING_CARNO_ERROR);
}
logger.info("用户绑定车牌号 result:{}", response);
logger.info("用户绑定车牌号, param:{}, result:{}", JSON.toJSONString(dto), response);
return response;
}
@@ -321,7 +326,7 @@ public class MemberController extends BaseController {
*/
@PostMapping("/memberUpdatePlateNumber")
public RestApiResponse<?> memberUpdatePlateNumber(HttpServletRequest request, @RequestBody BindingCarNoDTO dto) {
logger.info("用户修改车牌号 params:{}", JSONObject.toJSONString(dto));
logger.info("用户修改车牌号 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -351,7 +356,7 @@ public class MemberController extends BaseController {
*/
@PostMapping("/memberUnbindCarNo")
public RestApiResponse<?> memberUnbindCarNo(@RequestBody BindingCarNoDTO dto) {
logger.info("用户解绑车牌号 params:{}", JSONObject.toJSONString(dto));
logger.info("用户解绑车牌号 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
// String memberId = getMemberIdByAuthorization(request);
@@ -376,7 +381,7 @@ public class MemberController extends BaseController {
*/
@PostMapping("/memberBindingCard")
public RestApiResponse<?> memberBindingCard(HttpServletRequest request, @RequestBody BindingCardDTO dto) {
logger.info("用户绑定鉴权卡 param:{}", JSONObject.toJSONString(dto));
logger.info("用户绑定鉴权卡 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -403,7 +408,7 @@ public class MemberController extends BaseController {
*/
@PostMapping("/memberUnbindingCard")
public RestApiResponse<?> memberUnbindingCard(HttpServletRequest request, @RequestBody BindingCardDTO dto) {
logger.info("用户解绑鉴权卡 param:{}", JSONObject.toJSONString(dto));
logger.info("用户解绑鉴权卡 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -449,7 +454,7 @@ public class MemberController extends BaseController {
*/
@PostMapping("/updateMemberInvoiceTitle")
public RestApiResponse<?> updateMemberInvoiceTitle(HttpServletRequest request, @RequestBody InvoiceTitleDTO dto) {
logger.info("修改会员发票抬头 param:{}", JSONObject.toJSONString(dto));
logger.info("修改会员发票抬头 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -475,7 +480,7 @@ public class MemberController extends BaseController {
*/
@PostMapping("/deleteMemberInvoiceTitle")
public RestApiResponse<?> deleteMemberInvoiceTitle(HttpServletRequest request, @RequestBody InvoiceTitleDTO dto) {
logger.info("修改会员发票抬头 param:{}", JSONObject.toJSONString(dto));
logger.info("修改会员发票抬头 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);

18
jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java
View File

@@ -113,20 +113,20 @@ public class OccupyOrderController extends BaseController {
*/
@GetMapping("/getUnPayOccupyOrder")
public RestApiResponse<?> getUnPayOccupyOrder(HttpServletRequest request) {
RestApiResponse<?> response = null;
RestApiResponse<?> response;
String memberId = null;
try {
String memberId = getMemberIdByAuthorization(request);
logger.info("查询用户: {} 是否有未支付的占桩订单", memberId);
// OrderPileOccupy orderPileOccupy = orderPileOccupyService.queryUnPayOrderByMemberId(memberId);
// if (Objects.nonNull(orderPileOccupy)) {
// response = new RestApiResponse<>(ImmutableMap.of("occupyCode", orderPileOccupy.getOccupyCode()));
// }
memberId = getMemberIdByAuthorization(request);
Map<String, Object> map = orderPileOccupyService.queryUnPayOrder(memberId);
response = new RestApiResponse<>(map);
} catch (BusinessException e) {
logger.error("查询用户是否有未支付的占桩订单 error", e);
response = new RestApiResponse<>(e.getCode(), e.getMessage());
} catch (Exception e) {
logger.error("查询用户是否有未支付的占桩订单 error,", e);
logger.error("查询用户是否有未支付的占桩订单 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_UNPAY_OCCUPY_ORDER_ERROR);
}
logger.info("查询用户是否有未支付的占桩订单 result:{}", response);
logger.info("查询用户是否有未支付的占桩订单, memberId:{}, result:{}", memberId, response);
return response;
}

34
jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java
View File

@@ -1,6 +1,6 @@
package com.jsowell.api.uniapp;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.google.common.collect.ImmutableMap;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.constant.Constants;
@@ -49,7 +49,7 @@ public class OrderController extends BaseController {
*/
@PostMapping("/generateOrder")
public RestApiResponse<?> generateOrder(HttpServletRequest request, @RequestBody GenerateOrderDTO dto) {
logger.info("生成订单 param:{}", JSONObject.toJSONString(dto));
logger.info("生成订单 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response;
try {
if ((StringUtils.isBlank(dto.getPileSn()) || StringUtils.isBlank(dto.getConnectorCode())) && StringUtils.isBlank(dto.getPileConnectorCode())) {
@@ -76,7 +76,7 @@ public class OrderController extends BaseController {
logger.error("生成订单 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GENERATE_ORDER_ERROR);
}
logger.info("生成订单 result:{}", JSONObject.toJSONString(response));
logger.info("生成订单 result:{}", JSON.toJSONString(response));
return response;
}
@@ -86,7 +86,7 @@ public class OrderController extends BaseController {
*/
@PostMapping ("/stopCharging")
public RestApiResponse<?> stopCharging(HttpServletRequest request, @RequestBody StopChargingDTO dto) {
logger.info("停止充电 param:{}", JSONObject.toJSONString(dto));
logger.info("停止充电 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -114,7 +114,7 @@ public class OrderController extends BaseController {
*/
@PostMapping("/settleOrderForWeb")
public RestApiResponse<?> settleOrder(HttpServletRequest request, @RequestBody SettleOrderDTO dto) {
logger.info("结算订单param:{}", JSONObject.toJSONString(dto));
logger.info("结算订单param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response;
try {
orderService.settleOrderForWeb(dto);
@@ -133,7 +133,7 @@ public class OrderController extends BaseController {
*/
@PostMapping("/getOrderList")
public RestApiResponse<?> getOrderInfo(HttpServletRequest request, @RequestBody UniAppQueryOrderDTO dto) {
logger.info("查询订单信息 param:{}", JSONObject.toJSONString(dto));
logger.info("查询订单信息 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -150,7 +150,7 @@ public class OrderController extends BaseController {
logger.error("查询订单信息 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_ORDER_INFO_BY_MEMBER_ID_ERROR);
}
logger.info("查询订单信息, result:{}", JSONObject.toJSONString(response));
logger.info("查询订单信息, result:{}", JSON.toJSONString(response));
return response;
}
@@ -163,7 +163,7 @@ public class OrderController extends BaseController {
*/
@PostMapping("/getOrderDetail")
public RestApiResponse<?> getOrderDetail(HttpServletRequest request, @RequestBody UniAppQueryOrderDTO dto) {
logger.info("小程序获取订单详情 param:{}", JSONObject.toJSONString(dto));
logger.info("小程序获取订单详情 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -179,7 +179,7 @@ public class OrderController extends BaseController {
logger.error("小程序获取订单详情 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_ORDER_DETAIL_ERROR);
}
logger.info("小程序获取订单详情, orderCode:{}, result:{}", dto.getOrderCode(), JSONObject.toJSONString(response));
logger.info("小程序获取订单详情, orderCode:{}, result:{}", dto.getOrderCode(), JSON.toJSONString(response));
return response;
}
@@ -192,7 +192,7 @@ public class OrderController extends BaseController {
*/
@PostMapping("/getOrderDetailV2")
public RestApiResponse<?> getOrderDetailV2(HttpServletRequest request, @RequestBody UniAppQueryOrderDTO dto) {
logger.info("小程序获取订单详情V2 param:{}", JSONObject.toJSONString(dto));
logger.info("小程序获取订单详情V2 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -208,7 +208,7 @@ public class OrderController extends BaseController {
logger.error("小程序获取订单详情V2 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_ORDER_DETAIL_ERROR);
}
logger.info("小程序获取订单详情V2, result:{}", JSONObject.toJSONString(response));
logger.info("小程序获取订单详情V2, result:{}", JSON.toJSONString(response));
return response;
}
@@ -218,7 +218,7 @@ public class OrderController extends BaseController {
*/
@PostMapping("/selectPileStarterStatus")
public RestApiResponse<?> selectPileStarterStatus(HttpServletRequest request, @RequestBody UniAppQueryOrderDTO dto) {
// logger.info("根据订单号查询充电桩启动状态 param:{}", JSONObject.toJSONString(dto));
// logger.info("根据订单号查询充电桩启动状态 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
// String memberId = getMemberIdByAuthorization(request);
@@ -231,7 +231,7 @@ public class OrderController extends BaseController {
logger.error("根据订单号查询充电桩启动状态 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_ORDER_DETAIL_ERROR);
}
logger.info("根据订单号查询充电桩启动状态param:{}, result:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(response));
logger.info("根据订单号查询充电桩启动状态param:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response));
return response;
}
@@ -243,7 +243,7 @@ public class OrderController extends BaseController {
*/
@PostMapping("/uniAppStartChargingSendMsg")
public RestApiResponse<?> uniAppStartChargingSendMsg(HttpServletRequest request, @RequestBody WechatSendMsgDTO dto) {
logger.info("微信小程序发送启动充电推送消息 param:{}", JSONObject.toJSONString(dto));
logger.info("微信小程序发送启动充电推送消息 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -264,7 +264,7 @@ public class OrderController extends BaseController {
*/
@PostMapping("/closeStartFailedOrder")
public RestApiResponse<?> closeStartFailedOrder(@RequestBody QueryOrderDTO dto) {
logger.info("关闭支付未启动的订单 param:{}", JSONObject.toJSONString(dto));
logger.info("关闭支付未启动的订单 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
orderService.closeStartFailedOrder(dto);
@@ -284,7 +284,7 @@ public class OrderController extends BaseController {
*/
@PostMapping("/queryUninvoicedOrderList")
public RestApiResponse<?> queryUninvoicedOrderList(HttpServletRequest request, @RequestBody QueryOrderDTO dto) {
logger.info("查询未开发票订单 param:{}", JSONObject.toJSONString(dto));
logger.info("查询未开发票订单 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -313,7 +313,7 @@ public class OrderController extends BaseController {
*/
@PostMapping("/queryUninvoicedStationList")
public RestApiResponse<?> queryUninvoicedStationList(HttpServletRequest request, @RequestBody QueryOrderDTO dto) {
logger.info("查询未开发票的站点list param:{}", JSONObject.toJSONString(dto));
logger.info("查询未开发票的站点list param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response;
try {
String memberId = getMemberIdByAuthorization(request);

14
jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
View File

@@ -1,6 +1,6 @@
package com.jsowell.api.uniapp;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.google.common.collect.ImmutableMap;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
@@ -89,7 +89,7 @@ public class PayController extends BaseController {
PaymentScenarioDTO paymentScenarioDTO = new PaymentScenarioDTO();
paymentScenarioDTO.setType(ScenarioEnum.BALANCE.getValue());
paymentScenarioDTO.setMemberId(memberId);
dto.setAttach(JSONObject.toJSONString(paymentScenarioDTO));
dto.setAttach(JSON.toJSONString(paymentScenarioDTO));
dto.setDescription("会员充值余额");
Map<String, Object> weixinMap = orderService.weixinPayV3(dto);
response = new RestApiResponse<>(ImmutableMap.of("weixinMap", weixinMap));
@@ -150,7 +150,7 @@ public class PayController extends BaseController {
redisCache.unLock(lockKey);
}
}
logger.info("支付订单接口 param:{}, result:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(response));
logger.info("支付订单接口 param:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response));
return response;
}
@@ -182,7 +182,7 @@ public class PayController extends BaseController {
*/
@PostMapping("/wechatPayCallback")
public RestApiResponse<?> wechatPayCallback(HttpServletRequest request, @RequestBody WechatPayNotifyParameter body) {
logger.info("1----------->微信支付回调开始 body:{}", JSONObject.toJSONString(body));
logger.info("1----------->微信支付回调开始 body:{}", JSON.toJSONString(body));
RestApiResponse<?> response;
try {
// orderService.wechatPayCallback(request, body);
@@ -205,7 +205,7 @@ public class PayController extends BaseController {
*/
@PostMapping("/wechatPayRefundCallback")
public RestApiResponse<?> wechatPayRefundCallback(HttpServletRequest request, @RequestBody WechatPayNotifyParameter body) {
logger.info("微信退款回调接口 body:{}", JSONObject.toJSONString(body));
logger.info("微信退款回调接口 body:{}", JSON.toJSONString(body));
RestApiResponse<?> response;
try {
orderService.wechatPayRefundCallback(request, body);
@@ -255,7 +255,7 @@ public class PayController extends BaseController {
*/
@PostMapping("/rechargeBalance")
public RestApiResponse<?> rechargeBalance(HttpServletRequest request, @RequestBody WeixinPayDTO dto) {
logger.info("adapay会员充值余额 param:{}", JSONObject.toJSONString(dto));
logger.info("adapay会员充值余额 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response;
try {
if (StringUtils.isBlank(dto.getCode()) || StringUtils.isBlank(dto.getAmount())) {
@@ -393,7 +393,7 @@ public class PayController extends BaseController {
redisCache.unLock(lockKey);
}
}
logger.info("支付占桩订单 result:{}", JSONObject.toJSONString(response));
logger.info("支付占桩订单 result:{}", JSON.toJSONString(response));
return response;
}

14
jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java
View File

@@ -1,6 +1,6 @@
package com.jsowell.api.uniapp;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.page.PageResponse;
@@ -53,7 +53,7 @@ public class PersonPileController extends BaseController {
*/
@RequestMapping("/pileMemberBinding")
public RestApiResponse<?> pileMemberBinding(HttpServletRequest request, @RequestBody PileMemberBindingDTO dto){
logger.info("绑定个人桩信息 params:{}", JSONObject.toJSONString(dto));
logger.info("绑定个人桩信息 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -78,7 +78,7 @@ public class PersonPileController extends BaseController {
*/
@RequestMapping("/userUnbindPile")
public RestApiResponse<?> userUnbindPile(HttpServletRequest request, @RequestBody PileMemberBindingDTO dto) {
logger.info("用户解绑个人桩信息 params:{}", JSONObject.toJSONString(dto));
logger.info("用户解绑个人桩信息 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -108,7 +108,7 @@ public class PersonPileController extends BaseController {
*/
@RequestMapping("/adminIssuePile")
public RestApiResponse<?> adminIssuePile(HttpServletRequest request, @RequestBody PileMemberBindingDTO dto){
logger.info("桩管理员下发个人桩 params: {}", JSONObject.toJSONString(dto));
logger.info("桩管理员下发个人桩 params: {}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String appId = request.getHeader("appId");
@@ -169,7 +169,7 @@ public class PersonPileController extends BaseController {
*/
@PostMapping("/getConnectorRealTimeInfo")
public RestApiResponse<?> getConnectorRealTimeInfo(HttpServletRequest request, @RequestBody QueryPersonPileDTO dto){
logger.info("获取个人桩枪口实时数据 params:{}", JSONObject.toJSONString(dto));
logger.info("获取个人桩枪口实时数据 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -198,7 +198,7 @@ public class PersonPileController extends BaseController {
*/
@RequestMapping("/getAccumulativeInfo")
public RestApiResponse<?> getAccumulativeInfo(HttpServletRequest request, @RequestBody QueryPersonPileDTO dto) {
logger.info("获取某枪口某段时间内累计信息 params:{}", JSONObject.toJSONString(dto));
logger.info("获取某枪口某段时间内累计信息 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -227,7 +227,7 @@ public class PersonPileController extends BaseController {
*/
@RequestMapping("/getChargingRecord")
public RestApiResponse<?> getChargingRecord(HttpServletRequest request, @RequestBody QueryPersonPileDTO dto){
logger.info("获取个人桩充电记录 params:{}", JSONObject.toJSONString(dto));
logger.info("获取个人桩充电记录 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);

11
jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java
View File

@@ -1,7 +1,6 @@
package com.jsowell.api.uniapp;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.page.PageResponse;
@@ -53,7 +52,7 @@ public class PileController extends BaseController {
*/
@PostMapping("/queryStationInfos")
public RestApiResponse<?> queryStationInfos(HttpServletRequest request, @RequestBody QueryStationDTO queryStationDTO) {
logger.info("查询充电站信息列表 param:{}", JSONObject.toJSONString(queryStationDTO));
logger.info("查询充电站信息列表 param:{}", JSON.toJSONString(queryStationDTO));
RestApiResponse<?> response;
try {
// 获取appid（第三方平台用）
@@ -73,7 +72,7 @@ public class PileController extends BaseController {
logger.error("查询充电站信息列表异常 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_PILE_STATION_INFO_ERROR);
}
logger.info("查询充电站信息列表 result:{}", JSONObject.toJSONString(response));
logger.info("查询充电站信息列表 result:{}", JSON.toJSONString(response));
return response;
}
@@ -109,7 +108,7 @@ public class PileController extends BaseController {
*/
@PostMapping("/selectConnectorListByParams")
public RestApiResponse<?> selectConnectorListByParams(HttpServletRequest request, @RequestBody QueryConnectorListDTO dto) {
logger.info("查询充电枪口列表 params:{}", JSONObject.toJSONString(dto));
logger.info("查询充电枪口列表 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
PageResponse pageResponse = pileConnectorInfoService.getUniAppConnectorInfoListByParams(dto);
@@ -131,7 +130,7 @@ public class PileController extends BaseController {
*/
@PostMapping("/selectStationConnectorList")
public RestApiResponse<?> selectStationConnectorList(HttpServletRequest request, @RequestBody QueryConnectorListDTO dto) {
logger.info("查询充电枪口列表 params:{}", JSONObject.toJSONString(dto));
logger.info("查询充电枪口列表 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
PageResponse pageResponse = pileConnectorInfoService.selectStationConnectorList(dto);
@@ -149,7 +148,7 @@ public class PileController extends BaseController {
*/
@PostMapping("/remoteGroundLock")
public RestApiResponse<?> remoteGroundLock(HttpServletRequest request, @RequestBody RemoteGroundLockDTO dto) {
// logger.info("遥控地锁指令 params:{}", JSONObject.toJSONString(dto));
// logger.info("遥控地锁指令 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
// 校验参数

15
jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
View File

@@ -1,7 +1,6 @@
package com.jsowell.api.uniapp;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.jsowell.adapay.dto.BalancePaymentRequestDTO;
import com.jsowell.adapay.service.AdapayService;
import com.jsowell.common.annotation.Anonymous;
@@ -92,7 +91,7 @@ public class TempController extends BaseController {
logger.error("临时刷数据接口 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_PILE_DETAIL_ERROR);
}
logger.info("临时刷数据接口 result:{}", JSONObject.toJSONString(response));
logger.info("临时刷数据接口 result:{}", JSON.toJSONString(response));
return response;
}
@@ -115,7 +114,7 @@ public class TempController extends BaseController {
logger.error("临时订单退款接口 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_WEIXIN_REFUND_ERROR);
}
logger.info("临时刷数据接口 result:{}", JSONObject.toJSONString(response));
logger.info("临时刷数据接口 result:{}", JSON.toJSONString(response));
return response;
}
@@ -139,7 +138,7 @@ public class TempController extends BaseController {
logger.error("临时订单退款接口 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_WEIXIN_REFUND_ERROR);
}
logger.info("临时刷数据接口 result:{}", JSONObject.toJSONString(response));
logger.info("临时刷数据接口 result:{}", JSON.toJSONString(response));
return response;
}
@@ -174,7 +173,7 @@ public class TempController extends BaseController {
logger.error("临时接口计算站点订单报表 error", e);
response = new RestApiResponse<>("00300003", "临时接口计算站点订单报表error");
}
logger.info("临时接口计算站点订单报表 result:{}", JSONObject.toJSONString(response));
logger.info("临时接口计算站点订单报表 result:{}", JSON.toJSONString(response));
return response;
}
@@ -277,7 +276,7 @@ public class TempController extends BaseController {
logger.error("手动接口执行订单分账逻辑-error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_WEIXIN_REFUND_ERROR);
}
logger.info("手动接口执行订单分账逻辑-result:{}", JSONObject.toJSONString(response));
logger.info("手动接口执行订单分账逻辑-result:{}", JSON.toJSONString(response));
return response;
}
@@ -298,7 +297,7 @@ public class TempController extends BaseController {
logger.error("测试余额支付接口error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_WEIXIN_REFUND_ERROR);
}
logger.info("测试余额支付接口result:{}", JSONObject.toJSONString(response));
logger.info("测试余额支付接口result:{}", JSON.toJSONString(response));
return response;
}
@@ -311,7 +310,7 @@ public class TempController extends BaseController {
*/
@PostMapping("/batchWechatRefund")
public RestApiResponse<?> batchWechatRefund(@RequestBody ApplyRefundDTO dto) {
logger.info("批量余额退款接口 params:{}", JSONObject.toJSONString(dto));
logger.info("批量余额退款接口 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
List<String> memberIdList = dto.getMemberIdList();
try {

39
jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java
View File

@@ -1,5 +1,6 @@
package com.jsowell.service;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.jsowell.common.constant.CacheConstants;
@@ -207,7 +208,7 @@ public class AgentDevService {
String result = HttpUtils.sendPost(url, jsonObject.toString());
JSONObject jsonResult = JSONObject.parseObject(result);
logger.info("获取第三方平台 token 请求结果:{}", JSONObject.toJSONString(jsonResult));
logger.info("获取第三方平台 token 请求结果:{}", JSON.toJSONString(jsonResult));
// 获取返回值中的 token
token = jsonResult.getString("component_access_token");
if (token == null) {
@@ -240,8 +241,8 @@ public class AgentDevService {
jsonObject.put("component_appid", PLATFORM_APP_ID);
jsonObject.put("authorization_code", authorizationCode);
String result = HttpUtils.sendPost(url, JSONObject.toJSONString(jsonObject));
logger.info("获取第三方平台 使用授权码获取授权信息 请求参数:{}, 请求结果:{}", JSONObject.toJSONString(jsonObject), result);
String result = HttpUtils.sendPost(url, JSON.toJSONString(jsonObject));
logger.info("获取第三方平台 使用授权码获取授权信息 请求参数:{}, 请求结果:{}", JSON.toJSONString(jsonObject), result);
// 将结果转换成json对象
JSONObject resultJson = JSONObject.parseObject(result);
if (Objects.isNull(resultJson)) {
@@ -249,7 +250,7 @@ public class AgentDevService {
}
// AuthInfoVO authInfoVO = (AuthInfoVO) resultJson.get("authorization_info");
AuthInfoVO authInfoVO = JSONObject.parseObject(JSONObject.toJSONString(resultJson.get("authorization_info")), AuthInfoVO.class);
AuthInfoVO authInfoVO = JSONObject.parseObject(JSON.toJSONString(resultJson.get("authorization_info")), AuthInfoVO.class);
if (authInfoVO == null) {
throw new RuntimeException("获取第三方平台 使用授权码获取授权信息 error");
}
@@ -305,8 +306,8 @@ public class AgentDevService {
jsonObject.put("authorizer_appid", authAppId);
jsonObject.put("authorizer_refresh_token", refreshToken);
// 发送请求
String result = HttpUtils.sendPost(url, JSONObject.toJSONString(jsonObject));
logger.info("微信第三方平台 通过刷新令牌获取接口令牌 请求参数:{}\n, 请求结果:{}", JSONObject.toJSONString(jsonObject), result);
String result = HttpUtils.sendPost(url, JSON.toJSONString(jsonObject));
logger.info("微信第三方平台 通过刷新令牌获取接口令牌 请求参数:{}\n, 请求结果:{}", JSON.toJSONString(jsonObject), result);
// 将返回结果转成 json 对象
JSONObject resultJson = JSONObject.parseObject(result);
@@ -341,12 +342,12 @@ public class AgentDevService {
String url = "https://api.weixin.qq.com/wxa/commit?access_token=" + authAccessToken;
JSONObject jsonObject = new JSONObject();
jsonObject.put("template_id", dto.getTemplateId());
jsonObject.put("ext_json", JSONObject.toJSONString(dto.getExtJson()));
jsonObject.put("ext_json", JSON.toJSONString(dto.getExtJson()));
jsonObject.put("user_version", dto.getUserVersion());
jsonObject.put("user_desc", dto.getUserDesc());
String result = HttpUtils.sendPost(url, JSONObject.toJSONString(jsonObject));
logger.info("获取第三方平台 提交代码 请求参数:{}, 请求结果:{}", JSONObject.toJSONString(jsonObject), result);
String result = HttpUtils.sendPost(url, JSON.toJSONString(jsonObject));
logger.info("获取第三方平台 提交代码 请求参数:{}, 请求结果:{}", JSON.toJSONString(jsonObject), result);
// 将返回结果转为json对象
JSONObject resultJson = JSONObject.parseObject(result);
@@ -407,13 +408,13 @@ public class AgentDevService {
String url = "https://api.weixin.qq.com/wxa/submit_audit?access_token=" + authAccessToken;
// List --> JsonArray
JSONArray itemArray = JSONArray.parseArray(JSONObject.toJSONString(itemList));
JSONArray itemArray = JSONArray.parseArray(JSON.toJSONString(itemList));
// 发送请求
JSONObject jsonObject = new JSONObject();
jsonObject.put("item_list", itemArray);
String result = HttpUtils.sendPost(url, JSONObject.toJSONString(jsonObject));
logger.info("微信第三方平台 提交代码审核 请求参数:{}, 请求结果:{}", JSONObject.toJSONString(jsonObject), result);
String result = HttpUtils.sendPost(url, JSON.toJSONString(jsonObject));
logger.info("微信第三方平台 提交代码审核 请求参数:{}, 请求结果:{}", JSON.toJSONString(jsonObject), result);
// 将返回结果转为json对象
JSONObject resultJson = JSONObject.parseObject(result);
int errCode = (int) resultJson.get("errcode");
@@ -450,7 +451,7 @@ public class AgentDevService {
JSONObject jsonObject = new JSONObject();
jsonObject.put("auditid", dto.getAuditId());
// 发送请求
String result = HttpUtils.sendPost(url, JSONObject.toJSONString(jsonObject));
String result = HttpUtils.sendPost(url, JSON.toJSONString(jsonObject));
// 将返回结果转为json对象
JSONObject resultJson = JSONObject.parseObject(result);
int errCode = (int) resultJson.get("errcode");
@@ -494,8 +495,8 @@ public class AgentDevService {
JSONObject jsonObject = new JSONObject();
jsonObject.put("component_appid", PLATFORM_APP_ID);
// 发送请求
String result = HttpUtils.sendPost(url, JSONObject.toJSONString(jsonObject));
logger.info("微信第三方平台 获取预授权码请求 params:{}, result:{}", JSONObject.toJSONString(jsonObject), result);
String result = HttpUtils.sendPost(url, JSON.toJSONString(jsonObject));
logger.info("微信第三方平台 获取预授权码请求 params:{}, result:{}", JSON.toJSONString(jsonObject), result);
// 将返回结果转成json对象
JSONObject resultJson = JSONObject.parseObject(result);
preAuthCode = resultJson.getString("pre_auth_code");
@@ -548,7 +549,7 @@ public class AgentDevService {
// }
String url = "https://api.weixin.qq.com/wxa/release?access_token=" + authAccessToken;
JSONObject jsonObject = new JSONObject();
String result = HttpUtils.sendPost(url, JSONObject.toJSONString(jsonObject));
String result = HttpUtils.sendPost(url, JSON.toJSONString(jsonObject));
// 将返回结果转为json对象
JSONObject resultJson = JSONObject.parseObject(result);
// int errCode = (int) resultJson.get("errcode");
@@ -603,7 +604,7 @@ public class AgentDevService {
String url = "https://api.weixin.qq.com/cgi-bin/component/setprivacysetting?access_token=" + authAccessToken;
List<UserInfoSetting> settingList = dto.getSettingList();
// 转为 jsonArray
JSONArray itemArray = JSONArray.parseArray(JSONObject.toJSONString(settingList));
JSONArray itemArray = JSONArray.parseArray(JSON.toJSONString(settingList));
// 拼接参数
JSONObject jsonObject = new JSONObject();
jsonObject.put("privacy_ver", dto.getPrivacyVer());
@@ -611,7 +612,7 @@ public class AgentDevService {
jsonObject.put("owner_setting", dto.getOwnerSetting());
// 发送请求
String result = HttpUtils.sendPost(url, JSONObject.toJSONString(jsonObject));
String result = HttpUtils.sendPost(url, JSON.toJSONString(jsonObject));
// 转为 json 对象
JSONObject resultJson = JSONObject.parseObject(result);
@@ -647,7 +648,7 @@ public class AgentDevService {
String url = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=" + authAccessToken;
JSONObject jsonObject = new JSONObject();
jsonObject.put("code", code);
String result = HttpUtils.sendPost(url, JSONObject.toJSONString(jsonObject));
String result = HttpUtils.sendPost(url, JSON.toJSONString(jsonObject));
// 将返回值转成 json 对象
JSONObject resultJson = JSONObject.parseObject(result);
Integer errCode = resultJson.getInteger("errcode");

6
jsowell-admin/src/main/java/com/jsowell/service/CameraService.java
View File

@@ -1,5 +1,6 @@
package com.jsowell.service;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.jsowell.common.constant.CacheConstants;
@@ -20,8 +21,8 @@ import com.jsowell.pile.dto.camera.Camera2GroundLockCommand;
import com.jsowell.pile.dto.camera.CameraHeartBeatDTO;
import com.jsowell.pile.dto.camera.CameraIdentifyResultsDTO;
import com.jsowell.pile.service.MemberBasicInfoService;
import com.jsowell.pile.service.PileCameraInfoService;
import com.jsowell.pile.service.OrderPileOccupyService;
import com.jsowell.pile.service.PileCameraInfoService;
import com.jsowell.pile.vo.uniapp.MemberVO;
import com.jsowell.pile.vo.web.OccupyOrderVO;
import org.apache.commons.collections4.CollectionUtils;
@@ -30,13 +31,12 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.*;
import javax.imageio.ImageIO;
import java.util.concurrent.TimeUnit;
/**

8
jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
View File

@@ -617,7 +617,7 @@ public class MemberService {
PaymentScenarioDTO paymentScenarioDTO = new PaymentScenarioDTO();
paymentScenarioDTO.setType(ScenarioEnum.BALANCE.getValue());
paymentScenarioDTO.setMemberId(dto.getMemberId());
dto.setAttach(JSONObject.toJSONString(paymentScenarioDTO));
dto.setAttach(JSON.toJSONString(paymentScenarioDTO));
dto.setDescription("会员充值余额");
return orderService.weixinPayV3(dto);
}
@@ -648,7 +648,7 @@ public class MemberService {
createAdaPaymentParam.setPay_channel("wx_lite"); // todo 如果以后有支付宝等别的渠道，这里需要做修改，判断是什么渠道的请求
createAdaPaymentParam.setGoods_title("充值余额");
createAdaPaymentParam.setGoods_desc("会员充值余额");
createAdaPaymentParam.setExpend(JSONObject.toJSONString( ImmutableMap.of("open_id", dto.getOpenId())));
createAdaPaymentParam.setExpend(JSON.toJSONString( ImmutableMap.of("open_id", dto.getOpenId())));
//异步通知地址，url为http/https路径，服务器POST回调，URL 上请勿附带参数
createAdaPaymentParam.setNotify_url(ADAPAY_CALLBACK_URL);
Map<String, String> map = Maps.newHashMap();
@@ -661,9 +661,9 @@ public class MemberService {
createAdaPaymentParam.setPay_mode(payMode);
}
try {
log.info("创建汇付支付参数:{}", JSONObject.toJSONString(createAdaPaymentParam));
log.info("创建汇付支付参数:{}", JSON.toJSONString(createAdaPaymentParam));
Map<String, Object> response = Payment.create(BeanMap.create(createAdaPaymentParam), config.getWechatAppId());
log.info("创建汇付支付参数反参:{}", JSONObject.toJSONString(response));
log.info("创建汇付支付参数反参:{}", JSON.toJSONString(response));
if (response != null && !response.isEmpty()) {
JSONObject jsonObject = JSONObject.parseObject(response.get("expend").toString());
JSONObject pay_info = jsonObject.getJSONObject("pay_info");

2
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -324,7 +324,7 @@ public class OrderService {
* @param dto
*/
public void weChatRefund(ApplyRefundDTO dto) {
log.info("微信退款接口 param:{}", JSONObject.toJSONString(dto));
log.info("微信退款接口 param:{}", JSON.toJSONString(dto));
orderBasicInfoService.weChatRefund(dto);
}

12
jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java
View File

@@ -1,11 +1,11 @@
package com.jsowell.web.controller.index;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.response.RestApiResponse;
import com.jsowell.pile.dto.IndexQueryDTO;
import com.jsowell.pile.service.PileBasicInfoService;
import com.jsowell.pile.service.OrderBasicInfoService;
import com.jsowell.pile.service.PileBasicInfoService;
import com.jsowell.pile.vo.web.IndexGeneralSituationVO;
import com.jsowell.pile.vo.web.IndexOrderInfoVO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +33,7 @@ public class indexController extends BaseController {
@PostMapping("/getGeneralSituation")
public RestApiResponse<?> getGeneralSituation(@RequestBody IndexQueryDTO dto) {
logger.info("首页基础数据查询 param:{}", JSONObject.toJSONString(dto));
logger.info("首页基础数据查询 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response;
try {
IndexGeneralSituationVO generalSituation = pileBasicInfoService.getGeneralSituation(dto);
@@ -42,7 +42,7 @@ public class indexController extends BaseController {
logger.error("首页数据查询错误:{}", e.getMessage());
response = new RestApiResponse<>("00200001", "首页基础数据查询错误");
}
logger.info("首页数据查询 result:{}", JSONObject.toJSONString(response));
logger.info("首页数据查询 result:{}", JSON.toJSONString(response));
return response;
}
@@ -54,7 +54,7 @@ public class indexController extends BaseController {
*/
@PostMapping("/getOrderInfo")
public RestApiResponse<?> getOrderInfo(@RequestBody IndexQueryDTO dto) {
logger.info("首页订单相关信息查询 param:{}", JSONObject.toJSONString(dto));
logger.info("首页订单相关信息查询 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response;
try {
List<IndexOrderInfoVO> indexOrderInfo = orderBasicInfoService.getIndexOrderInfo(dto);
@@ -63,7 +63,7 @@ public class indexController extends BaseController {
logger.error("首页订单相关信息查询错误！{}", e.getMessage());
response = new RestApiResponse<>("00200002", "首页订单数据查询错误");
}
logger.info("首页订单相关信息查询 result:{}", JSONObject.toJSONString(response));
logger.info("首页订单相关信息查询 result:{}", JSON.toJSONString(response));
return response;
}

22
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java
View File

@@ -1,6 +1,6 @@
package com.jsowell.web.controller.pile;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.jsowell.common.annotation.Log;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.domain.AjaxResult;
@@ -11,7 +11,6 @@ import com.jsowell.common.response.RestApiResponse;
import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.poi.ExcelUtil;
import com.jsowell.pile.domain.PileBasicInfo;
import com.jsowell.pile.domain.ThirdpartySnRelation;
import com.jsowell.pile.dto.BatchCreatePileDTO;
import com.jsowell.pile.dto.QueryPileDTO;
import com.jsowell.pile.dto.ReplaceMerchantStationDTO;
@@ -25,14 +24,7 @@ import com.jsowell.pile.vo.web.ThirdPartySnRelationVO;
import com.jsowell.service.PileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -112,7 +104,7 @@ public class PileBasicInfoController extends BaseController {
@Log(title = "设备管理", businessType = BusinessType.INSERT)
@PostMapping("/batchAdd")
public AjaxResult batchAdd(@RequestBody BatchCreatePileDTO dto) {
logger.info("批量生成充电桩 param:{}", JSONObject.toJSONString(dto));
logger.info("批量生成充电桩 param:{}", JSON.toJSONString(dto));
return toAjax(pileService.batchCreatePile(dto));
}
@@ -136,7 +128,7 @@ public class PileBasicInfoController extends BaseController {
@Log(title = "设备管理", businessType = BusinessType.UPDATE)
@PostMapping("/updatePileName")
public RestApiResponse<?> updatePileName(@RequestBody PileBasicInfo pileBasicInfo) {
logger.info("修改桩别名 params:{}", JSONObject.toJSONString(pileBasicInfo));
logger.info("修改桩别名 params:{}", JSON.toJSONString(pileBasicInfo));
RestApiResponse<?> response = null;
try {
int i = pileBasicInfoService.updatePileBasicInfo(pileBasicInfo);
@@ -166,7 +158,7 @@ public class PileBasicInfoController extends BaseController {
*/
@PostMapping("/batchUpdatePileList")
public AjaxResult batchUpdatePileList( @RequestBody ReplaceMerchantStationDTO dto) {
logger.info("批量更新充电桩 param:{}", JSONObject.toJSONString(dto));
logger.info("批量更新充电桩 param:{}", JSON.toJSONString(dto));
return toAjax(pileBasicInfoService.replaceMerchantStationByPileIds(dto));
}
@@ -176,7 +168,7 @@ public class PileBasicInfoController extends BaseController {
*/
@PostMapping("/getPileDetailById")
public AjaxResult getPileDetailById(@RequestBody QueryPileDTO queryPileDTO) {
logger.info("查询充电桩详情 param:{}", JSONObject.toJSONString(queryPileDTO));
logger.info("查询充电桩详情 param:{}", JSON.toJSONString(queryPileDTO));
if (StringUtils.isBlank(queryPileDTO.getPileId())) {
return AjaxResult.error("充电桩id不能为空");
}
@@ -217,7 +209,7 @@ public class PileBasicInfoController extends BaseController {
@PreAuthorize("@ss.hasPermi('pile:basic:edit')")
@PostMapping("/updateThirdPartySnRelation")
public RestApiResponse<?> updateThirdPartySnRelation(@RequestBody ThirdPartySnRelationDTO dto) {
logger.info("修改第三方平台对应编号 params:{}", JSONObject.toJSONString(dto));
logger.info("修改第三方平台对应编号 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
int i = thirdpartySnRelationService.updateThirdPartySnRelation(dto);

23
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java
View File

@@ -1,6 +1,6 @@
package com.jsowell.web.controller.pile;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.jsowell.common.annotation.Log;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.controller.BaseController;
@@ -13,20 +13,13 @@ import com.jsowell.pile.dto.CreateOrUpdateBillingTemplateDTO;
import com.jsowell.pile.dto.ImportBillingTemplateDTO;
import com.jsowell.pile.dto.PublishBillingTemplateDTO;
import com.jsowell.pile.service.PileBillingTemplateService;
import com.jsowell.pile.vo.web.BillingTemplateVO;
import com.jsowell.pile.service.PileRemoteService;
import com.jsowell.pile.vo.web.BillingTemplateVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -120,7 +113,7 @@ public class PileBillingTemplateController extends BaseController {
@Log(title = "计费模板", businessType = BusinessType.INSERT)
@PostMapping("/createBillingTemplate")
public AjaxResult createBillingTemplate(@RequestBody CreateOrUpdateBillingTemplateDTO dto) {
logger.info("新增计费模板 param:{}", JSONObject.toJSONString(dto));
logger.info("新增计费模板 param:{}", JSON.toJSONString(dto));
pileBillingTemplateService.createBillingTemplate(dto);
return AjaxResult.success();
}
@@ -132,7 +125,7 @@ public class PileBillingTemplateController extends BaseController {
*/
@PostMapping("/updateBillingTemplate")
public AjaxResult updateBillingTemplate(@RequestBody CreateOrUpdateBillingTemplateDTO dto) {
logger.info("修改计费模板 param:{}", JSONObject.toJSONString(dto));
logger.info("修改计费模板 param:{}", JSON.toJSONString(dto));
pileBillingTemplateService.updateBillingTemplate(dto);
return AjaxResult.success();
}
@@ -152,7 +145,7 @@ public class PileBillingTemplateController extends BaseController {
*/
@PostMapping("/stationImportBillingTemplate")
public AjaxResult stationImportBillingTemplate(@RequestBody ImportBillingTemplateDTO dto) {
logger.info("站点导入计费模板 param:{}", JSONObject.toJSONString(dto));
logger.info("站点导入计费模板 param:{}", JSON.toJSONString(dto));
return toAjax(pileBillingTemplateService.stationImportBillingTemplate(dto));
}
@@ -163,7 +156,7 @@ public class PileBillingTemplateController extends BaseController {
public TableDataInfo queryStationBillingTemplateList(@PathVariable("stationId") String stationId) {
logger.info("查询站点计费模板 param:{}", stationId);
List<BillingTemplateVO> list = pileBillingTemplateService.queryStationBillingTemplateList(stationId);
logger.info("查询站点计费模板 result：{}", JSONObject.toJSONString(list));
logger.info("查询站点计费模板 result：{}", JSON.toJSONString(list));
return getDataTable(list);
}
@@ -174,7 +167,7 @@ public class PileBillingTemplateController extends BaseController {
public TableDataInfo queryStationPreferentialBillingTemplateList(@PathVariable("stationId") String stationId) {
logger.info("查询站点优惠计费模板 param:{}", stationId);
List<BillingTemplateVO> list = pileBillingTemplateService.queryStationPreferentialBillingTemplateList(stationId);
logger.info("查询站点优惠计费模板 result：{}", JSONObject.toJSONString(list));
logger.info("查询站点优惠计费模板 result：{}", JSON.toJSONString(list));
return getDataTable(list);
}

14
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java
View File

@@ -1,6 +1,6 @@
package com.jsowell.web.controller.pile;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.jsowell.common.annotation.Log;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.page.TableDataInfo;
@@ -15,11 +15,7 @@ import com.jsowell.pile.service.PileConnectorInfoService;
import com.jsowell.pile.vo.web.PileConnectorInfoVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
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 org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -66,9 +62,9 @@ public class PileConnectorInfoController extends BaseController {
*/
@PostMapping("/getConnectorInfoListByParams")
public TableDataInfo getConnectorInfoListByParams(@RequestBody QueryConnectorListDTO dto) {
logger.info("查询接口列表 param:{}", JSONObject.toJSONString(dto));
logger.info("查询接口列表 param:{}", JSON.toJSONString(dto));
List<PileConnectorInfoVO> list = pileConnectorInfoService.getConnectorInfoListByParams(dto);
logger.info("查询接口列表 result:{}", JSONObject.toJSONString(list));
logger.info("查询接口列表 result:{}", JSON.toJSONString(list));
return getDataTable(list);
}
@@ -81,7 +77,7 @@ public class PileConnectorInfoController extends BaseController {
@Log(title = "充电桩枪口信息", businessType = BusinessType.UPDATE)
@PostMapping("/updateParkNo")
public RestApiResponse<?> updateParkNo(@RequestBody UpdateConnectorParkNoDTO dto) {
logger.info("修改车位号 param:{}", JSONObject.toJSONString(dto));
logger.info("修改车位号 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
int i = pileConnectorInfoService.updateConnectorParkNo(dto);

17
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java
View File

@@ -1,13 +1,11 @@
package com.jsowell.web.controller.pile;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.jsowell.common.annotation.Log;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.domain.AjaxResult;
import com.jsowell.common.core.page.TableDataInfo;
import com.jsowell.common.enums.BusinessType;
import com.jsowell.common.enums.DelFlagEnum;
import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
import com.jsowell.common.enums.ykc.ReturnCodeEnum;
import com.jsowell.common.exception.BusinessException;
@@ -15,7 +13,6 @@ import com.jsowell.common.response.RestApiResponse;
import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.poi.ExcelUtil;
import com.jsowell.pile.domain.PileStationInfo;
import com.jsowell.pile.domain.ThirdPartyStationRelation;
import com.jsowell.pile.domain.ThirdPartySettingInfo;
import com.jsowell.pile.domain.ThirdpartyParkingConfig;
import com.jsowell.pile.dto.FastCreateStationDTO;
@@ -25,18 +22,12 @@ import com.jsowell.pile.dto.amap.EditAmapFlagDTO;
import com.jsowell.pile.dto.lutongyunting.BindParkingPlatformDTO;
import com.jsowell.pile.service.PileStationInfoService;
import com.jsowell.pile.service.ThirdPartyParkingConfigService;
import com.jsowell.pile.service.ThirdPartyStationRelationService;
import com.jsowell.pile.service.ThirdPartySettingInfoService;
import com.jsowell.pile.service.ThirdPartyStationRelationService;
import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
import com.jsowell.pile.vo.web.PileStationVO;
import com.jsowell.service.PileService;
import com.jsowell.thirdparty.common.CommonService;
import com.jsowell.thirdparty.huawei.HuaWeiService;
import com.jsowell.thirdparty.lianlian.service.LianLianService;
import com.jsowell.thirdparty.nanrui.service.NRService;
import com.jsowell.thirdparty.xindiantu.service.XDTService;
import com.jsowell.thirdparty.yongchengboche.service.YCBCService;
import com.jsowell.thirdparty.zhongdianlian.service.ZDLService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -105,7 +96,7 @@ public class PileStationInfoController extends BaseController {
// @PreAuthorize("@ss.hasPermi('pile:station:add')")
@PostMapping("/fastCreateStation")
public AjaxResult fastCreateStation(@RequestBody FastCreateStationDTO dto) {
logger.info("快速建站接口 param:{}", JSONObject.toJSONString(dto));
logger.info("快速建站接口 param:{}", JSON.toJSONString(dto));
int i = 0;
try {
i = pileStationInfoService.fastCreateStation(dto);
@@ -188,7 +179,7 @@ public class PileStationInfoController extends BaseController {
@Log(title = "修改对接高德标识", businessType = BusinessType.UPDATE)
@PostMapping("/editAmapFlag")
public AjaxResult editAmapFlag(@RequestBody EditAmapFlagDTO dto) {
logger.info("修改对接高德标识 param:{}", JSONObject.toJSONString(dto));
logger.info("修改对接高德标识 param:{}", JSON.toJSONString(dto));
return toAjax(pileStationInfoService.updateAmapFlag(dto.getStationId(), dto.getAmapFlag()));
}
@@ -286,7 +277,7 @@ public class PileStationInfoController extends BaseController {
*/
@PostMapping("/pushStationInfo")
public RestApiResponse<?> pushStationInfo(@RequestBody PushStationInfoDTO dto) {
logger.info("推送第三方平台充电站信息 params:{}", JSONObject.toJSONString(dto));
logger.info("推送第三方平台充电站信息 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
Long stationId = dto.getStationId();
List<String> types = dto.getThirdPartyTypes();

4
jsowell-admin/src/main/java/com/jsowell/web/controller/system/SysLoginController.java
View File

@@ -1,6 +1,6 @@
package com.jsowell.web.controller.system;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.domain.AjaxResult;
import com.jsowell.common.core.domain.entity.SysMenu;
@@ -46,7 +46,7 @@ public class SysLoginController {
*/
@PostMapping("/login")
public AjaxResult login(@RequestBody LoginBody loginBody) {
logs.info("登录param：{}", JSONObject.toJSONString(loginBody));
logs.info("登录param：{}", JSON.toJSONString(loginBody));
AjaxResult ajax = AjaxResult.success();
// 生成令牌
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),

2
jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/amap/AMapController.java vendored
View File

@@ -63,7 +63,7 @@ public class AMapController extends BaseController {
@PostMapping("/pushStationStatus")
public AMapCommonResult pushStationStatus(@RequestBody QueryPileDTO dto) {
AMapCommonResult result = new AMapCommonResult();
logger.info("商家推送充电设备动态数据 params:{}", JSONObject.toJSONString(dto));
logger.info("商家推送充电设备动态数据 params:{}", JSON.toJSONString(dto));
try {
String pushResult = aMapService.pushChargingDeviceDynamics(dto.getStationId());
return result.successResponse(pushResult);

39
jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/hainan/HaiNanPlatformController.java vendored
View File

@@ -1,5 +1,6 @@
package com.jsowell.web.controller.thirdparty.hainan;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
@@ -11,12 +12,12 @@ 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.platform.hainan.service.HaiNanPlatformLogic;
import com.jsowell.thirdparty.lianlian.common.CommonResult;
import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO;
import com.jsowell.thirdparty.lianlian.util.Cryptos;
import com.jsowell.thirdparty.lianlian.util.Encodes;
import com.jsowell.thirdparty.platform.AbsInterfaceWithPlatformLogic;
import com.jsowell.thirdparty.platform.hainan.service.HaiNanPlatformLogic;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -41,10 +42,10 @@ public class HaiNanPlatformController extends BaseController {
*/
@PostMapping("/v1/query_token")
public CommonResult<?> queryToken(@RequestBody CommonParamsDTO dto) {
logger.info("海南平台请求令牌 params:{}", JSONObject.toJSONString(dto));
logger.info("海南平台请求令牌 params:{}", JSON.toJSONString(dto));
try {
Map<String, String> map = platformLogic.generateToken(dto);
logger.info("海南平台请求令牌 result:{}", JSONObject.toJSONString(map));
logger.info("海南平台请求令牌 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求令牌成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.error("海南平台 请求令牌接口 异常", e);
@@ -60,7 +61,7 @@ public class HaiNanPlatformController extends BaseController {
*/
@PostMapping("/v1/query_stations_info")
public CommonResult<?> query_stations_info(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("海南平台查询充电站信息 params:{}", JSONObject.toJSONString(dto));
logger.info("海南平台查询充电站信息 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
// String token = request.getHeader("Authorization");
@@ -87,7 +88,7 @@ public class HaiNanPlatformController extends BaseController {
queryStationInfoDTO.setOperatorId(dto.getOperatorID());
queryStationInfoDTO.setThirdPlatformType(ThirdPlatformTypeEnum.HAI_NAN_1.getCode());
Map<String, String> map = platformLogic.queryStationsInfo(queryStationInfoDTO);
logger.info("海南平台查询充电站信息 result:{}", JSONObject.toJSONString(map));
logger.info("海南平台查询充电站信息 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "查询充电站信息成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.info("海南平台查询充电站信息 error:", e);
@@ -103,7 +104,7 @@ public class HaiNanPlatformController extends BaseController {
*/
@PostMapping("/v1/query_station_stats")
public CommonResult<?> queryStationStats(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("海南平台查询统计信息 params:{}", JSONObject.toJSONString(dto));
logger.info("海南平台查询统计信息 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
if (!JWTUtils.checkThirdPartyToken(request)) {
@@ -128,7 +129,7 @@ public class HaiNanPlatformController extends BaseController {
QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class);
queryStationInfoDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = platformLogic.queryStationStats(queryStationInfoDTO);
logger.info("海南平台查询统计信息 result:{}", JSONObject.toJSONString(map));
logger.info("海南平台查询统计信息 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "查询统计信息成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.info("海南平台查询统计信息 error:", e);
@@ -145,7 +146,7 @@ public class HaiNanPlatformController extends BaseController {
*/
@PostMapping("/v1/query_station_status")
public CommonResult<?> queryStationStatus(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("海南平台设备接口状态查询 params:{}", JSONObject.toJSONString(dto));
logger.info("海南平台设备接口状态查询 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
// String token = request.getHeader("Authorization");
@@ -171,7 +172,7 @@ public class HaiNanPlatformController extends BaseController {
QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class);
queryStationInfoDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = platformLogic.queryStationStatus(queryStationInfoDTO);
logger.info("海南平台设备接口状态查询 result:{}", JSONObject.toJSONString(map));
logger.info("海南平台设备接口状态查询 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "设备接口状态查询成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.info("海南平台设备接口状态查询 error:", e);
@@ -187,7 +188,7 @@ public class HaiNanPlatformController extends BaseController {
*/
@PostMapping("/v1/query_equip_auth")
public CommonResult<?> queryEquipAuth(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("请求设备认证 param:{}", JSONObject.toJSONString(dto));
logger.info("请求设备认证 param:{}", JSON.toJSONString(dto));
try {
// 校验令牌
// String token = request.getHeader("Authorization");
@@ -212,7 +213,7 @@ public class HaiNanPlatformController extends BaseController {
QueryEquipmentDTO queryEquipmentDTO = JSONObject.parseObject(dataStr, QueryEquipmentDTO.class);
queryEquipmentDTO.setOperatorID(dto.getOperatorID());
Map<String, String> map = platformLogic.queryEquipAuth(queryEquipmentDTO);
logger.info("请求设备认证 result:{}", JSONObject.toJSONString(map));
logger.info("请求设备认证 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求设备认证成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.info("请求设备认证 error:", e);
@@ -228,7 +229,7 @@ public class HaiNanPlatformController extends BaseController {
*/
@PostMapping("/v1/query_equip_business_policy")
public CommonResult<?> queryEquipBusinessPolicy(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("查询业务策略信息 params:{}", JSONObject.toJSONString(dto));
logger.info("查询业务策略信息 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
// String token = request.getHeader("Authorization");
@@ -254,7 +255,7 @@ public class HaiNanPlatformController extends BaseController {
QueryStartChargeDTO queryStartChargeDTO = JSONObject.parseObject(dataStr, QueryStartChargeDTO.class);
queryStartChargeDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = platformLogic.queryEquipBusinessPolicy(queryStartChargeDTO);
logger.info("查询业务策略信息 result:{}", JSONObject.toJSONString(map));
logger.info("查询业务策略信息 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "查询业务策略信息成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
@@ -271,7 +272,7 @@ public class HaiNanPlatformController extends BaseController {
*/
@PostMapping("/v1/query_start_charge")
public CommonResult<?> query_start_charge(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("海南平台请求启动充电 params :{}", JSONObject.toJSONString(dto));
logger.info("海南平台请求启动充电 params :{}", JSON.toJSONString(dto));
try {
// 校验令牌
if (!JWTUtils.checkThirdPartyToken(request)) {
@@ -295,7 +296,7 @@ public class HaiNanPlatformController extends BaseController {
QueryStartChargeDTO queryStartChargeDTO = JSONObject.parseObject(dataStr, QueryStartChargeDTO.class);
queryStartChargeDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = platformLogic.queryStartCharge(queryStartChargeDTO);
logger.info("海南平台请求启动充电 result:{}", JSONObject.toJSONString(map));
logger.info("海南平台请求启动充电 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求启动充电成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.error("海南平台请求启动充电 error", e);
@@ -335,7 +336,7 @@ public class HaiNanPlatformController extends BaseController {
*/
@PostMapping("/v1/query_equip_charge_status")
public CommonResult<?> queryEquipChargeStatus(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("【{}】查询充电状态 params :{}", this.getClass().getSimpleName(), JSONObject.toJSONString(dto));
logger.info("【{}】查询充电状态 params :{}", this.getClass().getSimpleName(), JSON.toJSONString(dto));
try {
// 校验令牌
// String token = request.getHeader("Authorization");
@@ -360,7 +361,7 @@ public class HaiNanPlatformController extends BaseController {
QueryEquipChargeStatusDTO queryEquipChargeStatusDTO = JSONObject.parseObject(dataStr, QueryEquipChargeStatusDTO.class);
queryEquipChargeStatusDTO.setOperatorID(dto.getOperatorID());
Map<String, String> map = platformLogic.queryEquipChargeStatus(queryEquipChargeStatusDTO);
logger.info("【{}】查询充电状态 result:{}", this.getClass().getSimpleName(), JSONObject.toJSONString(map));
logger.info("【{}】查询充电状态 result:{}", this.getClass().getSimpleName(), JSON.toJSONString(map));
return CommonResult.success(0, "查询充电状态成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.error("【{}】平台查询充电状态 error", this.getClass().getSimpleName(), e);
@@ -400,7 +401,7 @@ public class HaiNanPlatformController extends BaseController {
*/
@PostMapping("/v1/query_stop_charge")
public CommonResult<?> queryStopCharge(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("请求停止充电 params :{}", JSONObject.toJSONString(dto));
logger.info("请求停止充电 params :{}", JSON.toJSONString(dto));
try {
// 校验令牌
// String token = request.getHeader("Authorization");
@@ -425,7 +426,7 @@ public class HaiNanPlatformController extends BaseController {
QueryStartChargeDTO queryStartChargeDTO = JSONObject.parseObject(dataStr, QueryStartChargeDTO.class);
queryStartChargeDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = platformLogic.queryStopCharge(queryStartChargeDTO);
logger.info("请求停止充电 result:{}", JSONObject.toJSONString(map));
logger.info("请求停止充电 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求停止充电成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.error("请求停止充电 error", e);

24
jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiController.java vendored
View File

@@ -45,10 +45,10 @@ public class HuaWeiController extends BaseController {
*/
@PostMapping("/v1/query_token")
public CommonResult<?> queryToken(@RequestBody CommonParamsDTO dto) {
logger.info("华为平台请求令牌 params:{}", JSONObject.toJSONString(dto));
logger.info("华为平台请求令牌 params:{}", JSON.toJSONString(dto));
try {
Map<String, String> map = huaWeiService.generateToken(dto);
logger.info("华为平台请求令牌 result:{}", JSONObject.toJSONString(map));
logger.info("华为平台请求令牌 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求令牌成功！", map.get("Data"), map.get("Sig"));
} catch (UnsupportedEncodingException e) {
logger.error("获取token接口 异常");
@@ -103,7 +103,7 @@ public class HuaWeiController extends BaseController {
*/
@PostMapping("/v1/query_station_status")
public CommonResult<?> queryStationStatus(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("华为平台查询统计信息 params:{}", JSONObject.toJSONString(dto));
logger.info("华为平台查询统计信息 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -129,7 +129,7 @@ public class HuaWeiController extends BaseController {
QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class);
queryStationInfoDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = huaWeiService.queryStationStatus(queryStationInfoDTO);
logger.info("华为平台查询统计信息 result:{}", JSONObject.toJSONString(map));
logger.info("华为平台查询统计信息 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "查询统计信息成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.info("华为平台查询统计信息 error:", e);
@@ -147,7 +147,7 @@ public class HuaWeiController extends BaseController {
*/
@PostMapping("/v1/query_equip_auth")
public CommonResult<?> query_equip_auth(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("华为平台请求设备认证 param:{}", JSONObject.toJSONString(dto));
logger.info("华为平台请求设备认证 param:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -172,7 +172,7 @@ public class HuaWeiController extends BaseController {
QueryEquipmentDTO queryEquipmentDTO = JSONObject.parseObject(dataStr, QueryEquipmentDTO.class);
queryEquipmentDTO.setOperatorID(dto.getOperatorID());
Map<String, String> map = huaWeiService.queryEquipAuth(queryEquipmentDTO);
logger.info("华为平台请求设备认证 result:{}", JSONObject.toJSONString(map));
logger.info("华为平台请求设备认证 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求设备认证成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.info("华为平台请求设备认证 error:", e);
@@ -189,7 +189,7 @@ public class HuaWeiController extends BaseController {
*/
@PostMapping("/v1/request_equip_business_policy")
public CommonResult<?> requestEquipBusinessPolicy(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("华为平台请求计费策略 params:{}", JSONObject.toJSONString(dto));
logger.info("华为平台请求计费策略 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -215,7 +215,7 @@ public class HuaWeiController extends BaseController {
QueryStartChargeDTO queryStartChargeDTO = JSONObject.parseObject(dataStr, QueryStartChargeDTO.class);
queryStartChargeDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = huaWeiService.requestEquipBusinessPolicy(queryStartChargeDTO);
logger.info("华为平台请求计费策略 result:{}", JSONObject.toJSONString(map));
logger.info("华为平台请求计费策略 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求计费策略成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
@@ -233,7 +233,7 @@ public class HuaWeiController extends BaseController {
*/
@PostMapping("/v1/query_equip_charge_status")
public CommonResult<?> query_equip_charge_status(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("华为平台查询充电状态 params :{}", JSONObject.toJSONString(dto));
logger.info("华为平台查询充电状态 params :{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -258,7 +258,7 @@ public class HuaWeiController extends BaseController {
QueryEquipChargeStatusDTO queryEquipChargeStatusDTO = JSONObject.parseObject(dataStr, QueryEquipChargeStatusDTO.class);
queryEquipChargeStatusDTO.setOperatorID(dto.getOperatorID());
Map<String, String> map = huaWeiService.queryEquipChargeStatus(queryEquipChargeStatusDTO);
logger.info("华为平台查询充电状态 result:{}", JSONObject.toJSONString(map));
logger.info("华为平台查询充电状态 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "查询充电状态成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.error("华为平台查询充电状态 error", e);
@@ -274,7 +274,7 @@ public class HuaWeiController extends BaseController {
*/
@PostMapping("/v1/query_stop_charge")
public CommonResult<?> query_stop_charge(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("华为平台请求停止充电 params :{}", JSONObject.toJSONString(dto));
logger.info("华为平台请求停止充电 params :{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -299,7 +299,7 @@ public class HuaWeiController extends BaseController {
QueryStartChargeDTO queryStartChargeDTO = JSONObject.parseObject(dataStr, QueryStartChargeDTO.class);
queryStartChargeDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = huaWeiService.queryStopCharge(queryStartChargeDTO);
logger.info("华为平台请求停止充电 result:{}", JSONObject.toJSONString(map));
logger.info("华为平台请求停止充电 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求停止充电成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.error("华为平台请求停止充电 error", e);

32
jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiControllerV2.java vendored
View File

@@ -1,5 +1,6 @@
package com.jsowell.web.controller.thirdparty.huawei;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
@@ -11,7 +12,6 @@ import com.jsowell.pile.vo.huawei.QueryStartChargeVO;
import com.jsowell.thirdparty.huawei.HuaweiServiceV2;
import com.jsowell.thirdparty.lianlian.common.CommonResult;
import com.jsowell.thirdparty.lianlian.domain.ConnectorStatusInfo;
import com.jsowell.thirdparty.lianlian.domain.StationStatusInfo;
import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO;
import com.jsowell.thirdparty.lianlian.util.Cryptos;
import com.jsowell.thirdparty.lianlian.util.Encodes;
@@ -45,10 +45,10 @@ public class HuaWeiControllerV2 extends BaseController {
*/
@PostMapping("/v2/query_token")
public CommonResult<?> queryToken(@RequestBody CommonParamsDTO dto) {
logger.info("华为平台请求令牌 params:{}", JSONObject.toJSONString(dto));
logger.info("华为平台请求令牌 params:{}", JSON.toJSONString(dto));
try {
Map<String, String> map = huaweiServiceV2.generateToken(dto);
logger.info("华为平台请求令牌 result:{}", JSONObject.toJSONString(map));
logger.info("华为平台请求令牌 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求令牌成功！", map.get("Data"), map.get("Sig"));
} catch (UnsupportedEncodingException e) {
logger.error("获取token接口 异常");
@@ -63,7 +63,7 @@ public class HuaWeiControllerV2 extends BaseController {
*/
@PostMapping("/v2/notification_stationStatus")
public CommonResult<?> receiveNotificationStationStatus(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("华为设备接口状态变化推送 params:{}", JSONObject.toJSONString(dto));
logger.info("华为设备接口状态变化推送 params:{}", JSON.toJSONString(dto));
String dataStr = checkAuth(request, dto);
// 转换成相应对象
ConnectorStatusInfo connectorStatusInfo = JSONObject.parseObject(dataStr, ConnectorStatusInfo.class);
@@ -82,7 +82,7 @@ public class HuaWeiControllerV2 extends BaseController {
*/
@PostMapping("/v2/request_equip_business_policy")
public CommonResult<?> requestEquipBusinessPolicy(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("华为请求设备计费信息 params:{}", JSONObject.toJSONString(dto));
logger.info("华为请求设备计费信息 params:{}", JSON.toJSONString(dto));
String dataStr = checkAuth(request, dto);
// 转换成相应对象
RequestEquipBusinessPolicyDTO requestEquipBusinessPolicyDTO = JSONObject.parseObject(dataStr, RequestEquipBusinessPolicyDTO.class);
@@ -101,7 +101,7 @@ public class HuaWeiControllerV2 extends BaseController {
*/
@PostMapping("/v2/notification_start_charge_result")
public CommonResult<?> receiveStartChargeResult(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("接收华为启动充电结果 params:{}", JSONObject.toJSONString(dto));
logger.info("接收华为启动充电结果 params:{}", JSON.toJSONString(dto));
String dataStr = checkAuth(request, dto);
// 转换成相应对象
ReceiveStartChargeResultDTO receiveStartChargeResultDTO = JSONObject.parseObject(dataStr, ReceiveStartChargeResultDTO.class);
@@ -120,7 +120,7 @@ public class HuaWeiControllerV2 extends BaseController {
*/
@PostMapping("/v2/notification_equip_charge_status")
public CommonResult<?> receiveEquipChargeStatus(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("接收华为设备充电状态 params:{}", JSONObject.toJSONString(dto));
logger.info("接收华为设备充电状态 params:{}", JSON.toJSONString(dto));
String dataStr = checkAuth(request, dto);
// 转换成相应对象
ReceiveEquipChargeStatusDTO receiveEquipChargeStatusDTO = JSONObject.parseObject(dataStr, ReceiveEquipChargeStatusDTO.class);
@@ -139,7 +139,7 @@ public class HuaWeiControllerV2 extends BaseController {
*/
@PostMapping("/v2/notification_stop_charge_result")
public CommonResult<?> receiveStopChargeResult(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("接收华为停止充电结果 params:{}", JSONObject.toJSONString(dto));
logger.info("接收华为停止充电结果 params:{}", JSON.toJSONString(dto));
String dataStr = checkAuth(request, dto);
// 转换成相应对象
ReceiveStopChargeResultVO receiveStopChargeResultVO = JSONObject.parseObject(dataStr, ReceiveStopChargeResultVO.class);
@@ -157,7 +157,7 @@ public class HuaWeiControllerV2 extends BaseController {
*/
@PostMapping("/v2/notification_charge_order_info")
public CommonResult<?> receiveOrderInfo(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("接收华为订单信息 params:{}", JSONObject.toJSONString(dto));
logger.info("接收华为订单信息 params:{}", JSON.toJSONString(dto));
String dataStr = checkAuth(request, dto);
// 转换成相应对象
ReceiveOrderInfoDTO receiveOrderInfoDTO = JSONObject.parseObject(dataStr, ReceiveOrderInfoDTO.class);
@@ -175,7 +175,7 @@ public class HuaWeiControllerV2 extends BaseController {
*/
@PostMapping("/v2/insert_start_charge")
public CommonResult<?> vinStartCharge(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("华为vin启动充电 params:{}", JSONObject.toJSONString(dto));
logger.info("华为vin启动充电 params:{}", JSON.toJSONString(dto));
String dataStr = checkAuth(request, dto);
// 转换成相应对象
VinStartChargeDTO vinStartChargeDTO = JSONObject.parseObject(dataStr, VinStartChargeDTO.class);
@@ -202,7 +202,7 @@ public class HuaWeiControllerV2 extends BaseController {
*/
@PostMapping("/v2/notification_deliver_equip_business_policy_result")
public CommonResult<?> receiveDeliverEquipBusinessPolicyResult(HttpServletRequest request, @RequestBody CommonParamsDTO dto){
logger.info("华为下发计费策略响应 params:{}", JSONObject.toJSONString(dto));
logger.info("华为下发计费策略响应 params:{}", JSON.toJSONString(dto));
String dataStr = checkAuth(request, dto);
// 转换成相应对象
DeliverBusinessPolicyResponseDTO deliverPolicyResponseDTO = JSONObject.parseObject(dataStr, DeliverBusinessPolicyResponseDTO.class);
@@ -267,7 +267,7 @@ public class HuaWeiControllerV2 extends BaseController {
} catch (Exception e) {
logger.error("请求华为设备认证 error", e);
}
logger.info("请求华为设备认证 result:{}", JSONObject.toJSONString(vo));
logger.info("请求华为设备认证 result:{}", JSON.toJSONString(vo));
return vo;
}
@@ -278,14 +278,14 @@ public class HuaWeiControllerV2 extends BaseController {
*/
@PostMapping("/v2/query_start_charge")
public QueryStartChargeVO queryStartCharge(@RequestBody HWQueryStartChargeDTO dto) {
logger.info("请求华为启动充电 param:{}", JSONObject.toJSONString(dto));
logger.info("请求华为启动充电 param:{}", JSON.toJSONString(dto));
QueryStartChargeVO vo = null;
try {
vo = huaweiServiceV2.queryStartCharge(dto);
} catch (Exception e) {
logger.error("请求华为启动充电 error", e);
}
logger.info("请求华为启动充电 result:{}", JSONObject.toJSONString(vo));
logger.info("请求华为启动充电 result:{}", JSON.toJSONString(vo));
return vo;
}
@@ -304,7 +304,7 @@ public class HuaWeiControllerV2 extends BaseController {
} catch (Exception e) {
logger.error("查询华为充电状态 error", e);
}
logger.info("查询华为充电状态 result:{}", JSONObject.toJSONString(vo));
logger.info("查询华为充电状态 result:{}", JSON.toJSONString(vo));
return vo;
}
@@ -323,7 +323,7 @@ public class HuaWeiControllerV2 extends BaseController {
}catch (Exception e) {
logger.error("请求华为停止充电 error", e);
}
logger.info("请求华为停止充电 result:{}", JSONObject.toJSONString(vo));
logger.info("请求华为停止充电 result:{}", JSON.toJSONString(vo));
return vo;
}

37
jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java vendored
View File

@@ -1,5 +1,6 @@
package com.jsowell.web.controller.thirdparty.lianlian;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
@@ -9,7 +10,6 @@ import com.jsowell.common.response.RestApiResponse;
import com.jsowell.common.util.JWTUtils;
import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.vo.lianlian.PushStationFeeVO;
import com.jsowell.thirdparty.lianlian.common.CommonResult;
import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO;
import com.jsowell.thirdparty.lianlian.service.LianLianService;
@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.util.Map;
/**
@@ -46,7 +45,7 @@ public class LianLianController extends BaseController {
*/
@PostMapping("/pushStationInfo")
public RestApiResponse<?> pushStationInfo(@RequestBody PushStationInfoDTO dto) {
logger.info("推送联联平台充电站信息 params:{}", JSONObject.toJSONString(dto));
logger.info("推送联联平台充电站信息 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
if (StringUtils.isBlank(String.valueOf(dto.getStationId()))) {
@@ -74,7 +73,7 @@ public class LianLianController extends BaseController {
*/
@PostMapping("/pushStationStatus")
public RestApiResponse<?> pushStationStatus(@RequestBody PushInfoParamDTO dto) {
logger.info("联联平台设备状态变化推送 params:{}", JSONObject.toJSONString(dto));
logger.info("联联平台设备状态变化推送 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
if (StringUtils.isBlank(String.valueOf(dto.getPileConnectorCode())) ||
@@ -153,7 +152,7 @@ public class LianLianController extends BaseController {
*/
// @PostMapping("/query_stations_info")
// public RestApiResponse<?> query_stations_info(@RequestBody QueryStationInfoDTO dto) {
// logger.info("联联平台查询充电站信息 params:{}", JSONObject.toJSONString(dto));
// logger.info("联联平台查询充电站信息 params:{}", JSON.toJSONString(dto));
// RestApiResponse<?> response = null;
// try {
// // 校验签名
@@ -207,7 +206,7 @@ public class LianLianController extends BaseController {
*/
// @PostMapping("/query_station_stats")
// public RestApiResponse<?> query_station_stats(@RequestBody QueryStationInfoDTO dto) {
// logger.info("联联平台查询统计信息 params :{}", JSONObject.toJSONString(dto));
// logger.info("联联平台查询统计信息 params :{}", JSON.toJSONString(dto));
// RestApiResponse<?> response;
// try {
// StationStatsInfo stationStatsInfo = lianLianService.query_station_stats(dto);
@@ -231,7 +230,7 @@ public class LianLianController extends BaseController {
*/
// @PostMapping("/query_equip_auth")
// public RestApiResponse<?> query_equip_auth(@RequestBody QueryEquipmentDTO dto) {
// logger.info("联联平台请求设备认证 params :{}", JSONObject.toJSONString(dto));
// logger.info("联联平台请求设备认证 params :{}", JSON.toJSONString(dto));
// RestApiResponse<?> response;
// try {
// EquipmentAuthVO equipmentAuthVO = lianLianService.query_equip_auth(dto);
@@ -255,7 +254,7 @@ public class LianLianController extends BaseController {
*/
@PostMapping("/v1/query_equip_auth")
public CommonResult<?> query_equip_auth(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("联联平台请求设备认证 param:{}", JSONObject.toJSONString(dto));
logger.info("联联平台请求设备认证 param:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -297,7 +296,7 @@ public class LianLianController extends BaseController {
*/
// @PostMapping("/query_start_charge")
// public RestApiResponse<?> query_start_charge(@RequestBody QueryStartChargeDTO dto) {
// logger.info("联联平台请求启动充电 params :{}", JSONObject.toJSONString(dto));
// logger.info("联联平台请求启动充电 params :{}", JSON.toJSONString(dto));
// RestApiResponse<?> response;
// try {
// QueryStartChargeVO queryStartChargeVO = lianLianService.query_start_charge(dto);
@@ -321,7 +320,7 @@ public class LianLianController extends BaseController {
*/
@PostMapping("/v1/query_start_charge")
public CommonResult<?> query_start_charge(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("联联平台请求启动充电 params :{}", JSONObject.toJSONString(dto));
logger.info("联联平台请求启动充电 params :{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -386,7 +385,7 @@ public class LianLianController extends BaseController {
*/
@PostMapping("/v1/query_equip_charge_status")
public CommonResult<?> query_equip_charge_status(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("联联平台查询充电状态 params :{}", JSONObject.toJSONString(dto));
logger.info("联联平台查询充电状态 params :{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -427,7 +426,7 @@ public class LianLianController extends BaseController {
*/
// @PostMapping("/query_stop_charge")
// public RestApiResponse<?> query_stop_charge(@RequestBody QueryStartChargeDTO dto) {
// logger.info("联联平台请求停止充电 params :{}", JSONObject.toJSONString(dto));
// logger.info("联联平台请求停止充电 params :{}", JSON.toJSONString(dto));
// RestApiResponse<?> response;
// try {
// QueryStopChargeVO queryStopChargeVO = lianLianService.query_stop_charge(dto);
@@ -451,7 +450,7 @@ public class LianLianController extends BaseController {
*/
@PostMapping("/v1/query_stop_charge")
public CommonResult<?> query_stop_charge(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("联联平台请求停止充电 params :{}", JSONObject.toJSONString(dto));
logger.info("联联平台请求停止充电 params :{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -490,10 +489,10 @@ public class LianLianController extends BaseController {
*/
@PostMapping("/v1/query_token")
public CommonResult<?> queryToken(@RequestBody CommonParamsDTO dto) {
logger.info("联联平台请求令牌 params:{}", JSONObject.toJSONString(dto));
logger.info("联联平台请求令牌 params:{}", JSON.toJSONString(dto));
try {
Map<String, String> map = lianLianService.generateToken(dto);
logger.info("联联平台请求令牌 result:{}", JSONObject.toJSONString(map));
logger.info("联联平台请求令牌 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求令牌成功！", map.get("Data"), map.get("Sig"));
} catch (UnsupportedEncodingException e) {
logger.error("获取token接口 异常");
@@ -509,7 +508,7 @@ public class LianLianController extends BaseController {
*/
@PostMapping("/v1/notification_order_settlement_info")
public CommonResult<?> notification_order_settlement_info(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("联联平台推送订单结算信息 params:{}", JSONObject.toJSONString(dto));
logger.info("联联平台推送订单结算信息 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -551,7 +550,7 @@ public class LianLianController extends BaseController {
*/
@PostMapping("/v1/query_stations_info")
public CommonResult<?> query_stations_info(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("联联平台查询充电站信息 params:{}", JSONObject.toJSONString(dto));
logger.info("联联平台查询充电站信息 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -594,7 +593,7 @@ public class LianLianController extends BaseController {
*/
@PostMapping("/v1/query_station_status")
public CommonResult<?> query_station_status(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("联联平台查询充电站状态信息 params:{}", JSONObject.toJSONString(dto));
logger.info("联联平台查询充电站状态信息 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -637,7 +636,7 @@ public class LianLianController extends BaseController {
*/
@PostMapping("/v1/query_station_stats")
public CommonResult<?> query_station_stats(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("联联平台查询统计信息 params:{}", JSONObject.toJSONString(dto));
logger.info("联联平台查询统计信息 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");

10
jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/nanrui/NRController.java vendored
View File

@@ -165,10 +165,10 @@ public class NRController extends BaseController {
*/
@PostMapping("/v1/query_token")
public CommonResult<?> queryToken(@RequestBody CommonParamsDTO dto) {
logger.info("江苏平台请求令牌 params:{}", JSONObject.toJSONString(dto));
logger.info("江苏平台请求令牌 params:{}", JSON.toJSONString(dto));
try {
Map<String, String> map = nrService.generateToken(dto);
logger.info("江苏平台请求令牌 result:{}", JSONObject.toJSONString(map));
logger.info("江苏平台请求令牌 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求令牌成功！", map.get("Data"), map.get("Sig"));
} catch (UnsupportedEncodingException e) {
logger.error("获取token接口 异常");
@@ -192,7 +192,7 @@ public class NRController extends BaseController {
*/
@PostMapping("/v1/pushStationInfo")
public RestApiResponse<?> pushStationInfo(@RequestBody PushStationInfoDTO dto) {
logger.info("推送江苏平台充电站信息 params:{}", JSONObject.toJSONString(dto));
logger.info("推送江苏平台充电站信息 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
if (StringUtils.isBlank(String.valueOf(dto.getStationId()))) {
@@ -219,7 +219,7 @@ public class NRController extends BaseController {
*/
@PostMapping("/v1/pushAlarmInfo")
public RestApiResponse<?> pushAlarmInfo(@RequestBody PushAlarmInfoDTO dto) {
logger.info("推送江苏平台告警信息 params:{}", JSONObject.toJSONString(dto));
logger.info("推送江苏平台告警信息 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
if (StringUtils.isBlank(String.valueOf(dto.getStationId()))) {
@@ -245,7 +245,7 @@ public class NRController extends BaseController {
*/
@PostMapping("/v1/pushPileStatus")
public RestApiResponse<?> pushPileStatus(@RequestBody RealTimeMonitorData data) {
logger.info("推送江苏平台设备状态变化推送 params:{}", JSONObject.toJSONString(data));
logger.info("推送江苏平台设备状态变化推送 params:{}", JSON.toJSONString(data));
RestApiResponse<?> response = null;
try {
String s = nrService.pushPileStatus(data);

14
jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ningxiajiaotou/NXJTController.java vendored
View File

@@ -1,10 +1,10 @@
package com.jsowell.web.controller.thirdparty.ningxiajiaotou;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.util.JWTUtils;
import com.jsowell.pile.dto.QueryStationInfoDTO;
import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryOrdersInfoDTO;
import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryStationInfoDTO;
import com.jsowell.thirdparty.lianlian.common.CommonResult;
@@ -47,10 +47,10 @@ public class NXJTController extends BaseController {
*/
@PostMapping("/v1/query_token")
public CommonResult<?> queryToken(@RequestBody CommonParamsDTO dto) {
logger.info("宁夏交投平台请求令牌 params:{}", JSONObject.toJSONString(dto));
logger.info("宁夏交投平台请求令牌 params:{}", JSON.toJSONString(dto));
try {
Map<String, String> map = nxjtService.generateToken(dto);
logger.info("宁夏交投平台请求令牌 result:{}", JSONObject.toJSONString(map));
logger.info("宁夏交投平台请求令牌 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求令牌成功！", map.get("Data"), map.get("Sig"));
} catch (UnsupportedEncodingException e) {
logger.error("获取token接口 异常");
@@ -66,7 +66,7 @@ public class NXJTController extends BaseController {
*/
@PostMapping("/v1/query_stations_info")
public CommonResult<?> queryStationsInfo(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("宁夏交投平台查询充电站信息 params:{}", JSONObject.toJSONString(dto));
logger.info("宁夏交投平台查询充电站信息 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -109,7 +109,7 @@ public class NXJTController extends BaseController {
*/
@PostMapping("/v1/query_free_pile_number")
public CommonResult<?> queryFreePileNumber(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("宁夏交投平台查询充电站中空闲桩数量 params:{}", JSONObject.toJSONString(dto));
logger.info("宁夏交投平台查询充电站中空闲桩数量 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -151,7 +151,7 @@ public class NXJTController extends BaseController {
*/
@PostMapping("/v1/query_orders_info_by_Plate_number")
public CommonResult<?> queryOrdersInfoByPlateNumber(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("宁夏交投平台查询某车牌号消费记录 params:{}", JSONObject.toJSONString(dto));
logger.info("宁夏交投平台查询某车牌号消费记录 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -194,7 +194,7 @@ public class NXJTController extends BaseController {
*/
@PostMapping("/v1/query_orders_info")
public CommonResult<?> queryOrdersInfo(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("宁夏交投平台查询某段时间内消费记录 params:{}", JSONObject.toJSONString(dto));
logger.info("宁夏交投平台查询某段时间内消费记录 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");

32
jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/xindiantu/XDTController.java vendored
View File

@@ -43,10 +43,10 @@ public class XDTController extends BaseController {
*/
@PostMapping("/v1/query_token")
public CommonResult<?> queryToken(@RequestBody CommonParamsDTO dto) {
logger.info("新电途平台请求令牌 params:{}", JSONObject.toJSONString(dto));
logger.info("新电途平台请求令牌 params:{}", JSON.toJSONString(dto));
try {
Map<String, String> map = xdtService.generateToken(dto);
logger.info("新电途平台请求令牌 result:{}", JSONObject.toJSONString(map));
logger.info("新电途平台请求令牌 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求令牌成功！", map.get("Data"), map.get("Sig"));
} catch (UnsupportedEncodingException e) {
logger.error("获取token接口 异常");
@@ -62,7 +62,7 @@ public class XDTController extends BaseController {
*/
@PostMapping("/pushStationInfo")
public RestApiResponse<?> pushStationInfo(@RequestBody PushStationInfoDTO dto) {
logger.info("推送新电途平台充电站信息 params:{}", JSONObject.toJSONString(dto));
logger.info("推送新电途平台充电站信息 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
if (StringUtils.isBlank(String.valueOf(dto.getStationId()))) {
@@ -127,7 +127,7 @@ public class XDTController extends BaseController {
*/
@PostMapping("/v1/query_station_status")
public CommonResult<?> queryStationStatus(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("新电途平台查询统计信息 params:{}", JSONObject.toJSONString(dto));
logger.info("新电途平台查询统计信息 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -153,7 +153,7 @@ public class XDTController extends BaseController {
QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class);
queryStationInfoDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = xdtService.queryStationStatus(queryStationInfoDTO);
logger.info("新电途平台查询统计信息 result:{}", JSONObject.toJSONString(map));
logger.info("新电途平台查询统计信息 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "查询统计信息成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.info("新电途平台查询统计信息 error:", e);
@@ -170,7 +170,7 @@ public class XDTController extends BaseController {
*/
@PostMapping("/v1/query_equip_business_policy")
public CommonResult<?> queryEquipBusinessPolicy(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("新电途平台查询业务策略信息 params:{}", JSONObject.toJSONString(dto));
logger.info("新电途平台查询业务策略信息 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -196,7 +196,7 @@ public class XDTController extends BaseController {
QueryStartChargeDTO queryStartChargeDTO = JSONObject.parseObject(dataStr, QueryStartChargeDTO.class);
queryStartChargeDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = xdtService.queryEquipBusinessPolicy(queryStartChargeDTO);
logger.info("新电途平台查询业务策略信息 result:{}", JSONObject.toJSONString(map));
logger.info("新电途平台查询业务策略信息 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "查询业务策略信息成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
@@ -214,7 +214,7 @@ public class XDTController extends BaseController {
*/
@PostMapping("/v1/query_equip_auth")
public CommonResult<?> query_equip_auth(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("新电途平台请求设备认证 param:{}", JSONObject.toJSONString(dto));
logger.info("新电途平台请求设备认证 param:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -239,7 +239,7 @@ public class XDTController extends BaseController {
QueryEquipmentDTO queryEquipmentDTO = JSONObject.parseObject(dataStr, QueryEquipmentDTO.class);
queryEquipmentDTO.setOperatorID(dto.getOperatorID());
Map<String, String> map = xdtService.queryEquipAuth(queryEquipmentDTO);
logger.info("新电途平台请求设备认证 result:{}", JSONObject.toJSONString(map));
logger.info("新电途平台请求设备认证 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求设备认证成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.info("新电途平台请求设备认证 error:", e);
@@ -256,7 +256,7 @@ public class XDTController extends BaseController {
*/
@PostMapping("/v1/query_start_charge")
public CommonResult<?> query_start_charge(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("新电途平台请求启动充电 params :{}", JSONObject.toJSONString(dto));
logger.info("新电途平台请求启动充电 params :{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -281,7 +281,7 @@ public class XDTController extends BaseController {
QueryStartChargeDTO queryStartChargeDTO = JSONObject.parseObject(dataStr, QueryStartChargeDTO.class);
queryStartChargeDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = xdtService.queryStartCharge(queryStartChargeDTO);
logger.info("新电途平台请求启动充电 result:{}", JSONObject.toJSONString(map));
logger.info("新电途平台请求启动充电 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求启动充电成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.error("新电途平台请求启动充电 error", e);
@@ -297,7 +297,7 @@ public class XDTController extends BaseController {
*/
@PostMapping("/v1/query_equip_charge_status")
public CommonResult<?> query_equip_charge_status(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("新电途平台查询充电状态 params :{}", JSONObject.toJSONString(dto));
logger.info("新电途平台查询充电状态 params :{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -322,7 +322,7 @@ public class XDTController extends BaseController {
QueryEquipChargeStatusDTO queryEquipChargeStatusDTO = JSONObject.parseObject(dataStr, QueryEquipChargeStatusDTO.class);
queryEquipChargeStatusDTO.setOperatorID(dto.getOperatorID());
Map<String, String> map = xdtService.queryEquipChargeStatus(queryEquipChargeStatusDTO);
logger.info("新电途平台查询充电状态 result:{}", JSONObject.toJSONString(map));
logger.info("新电途平台查询充电状态 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "查询充电状态成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.error("新电途平台查询充电状态 error", e);
@@ -338,7 +338,7 @@ public class XDTController extends BaseController {
*/
@PostMapping("/v1/query_stop_charge")
public CommonResult<?> query_stop_charge(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("新电途平台请求停止充电 params :{}", JSONObject.toJSONString(dto));
logger.info("新电途平台请求停止充电 params :{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -363,7 +363,7 @@ public class XDTController extends BaseController {
QueryStartChargeDTO queryStartChargeDTO = JSONObject.parseObject(dataStr, QueryStartChargeDTO.class);
queryStartChargeDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = xdtService.queryStopCharge(queryStartChargeDTO);
logger.info("新电途平台请求停止充电 result:{}", JSONObject.toJSONString(map));
logger.info("新电途平台请求停止充电 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求停止充电成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.error("新电途平台请求停止充电 error", e);
@@ -475,7 +475,7 @@ public class XDTController extends BaseController {
*/
@PostMapping("/pushStationStatus")
public RestApiResponse<?> pushStationStatus(@RequestBody PushInfoParamDTO dto) {
logger.info("新电途平台设备状态变化推送 params:{}", JSONObject.toJSONString(dto));
logger.info("新电途平台设备状态变化推送 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
if (StringUtils.isBlank(String.valueOf(dto.getPileConnectorCode())) ||

34
jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/yongchengboche/YCBCController.java vendored
View File

@@ -1,5 +1,6 @@
package com.jsowell.web.controller.thirdparty.yongchengboche;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
@@ -16,7 +17,6 @@ import com.jsowell.thirdparty.lianlian.util.Cryptos;
import com.jsowell.thirdparty.lianlian.util.Encodes;
import com.jsowell.thirdparty.yongchengboche.dto.YCBCGetTokenDTO;
import com.jsowell.thirdparty.yongchengboche.service.YCBCService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -48,10 +48,10 @@ public class YCBCController extends BaseController {
*/
@PostMapping("/v1/query_token")
public CommonResult<?> queryToken(@RequestBody CommonParamsDTO dto) {
logger.info("甬城泊车平台请求令牌 params:{}", JSONObject.toJSONString(dto));
logger.info("甬城泊车平台请求令牌 params:{}", JSON.toJSONString(dto));
try {
Map<String, String> map = ycbcService.generateToken(dto);
logger.info("甬城泊车平台请求令牌 result:{}", JSONObject.toJSONString(map));
logger.info("甬城泊车平台请求令牌 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求令牌成功！", map.get("Data"), map.get("Sig"));
} catch (UnsupportedEncodingException e) {
logger.error("甬城泊车平台 请求令牌接口 异常");
@@ -65,7 +65,7 @@ public class YCBCController extends BaseController {
*/
@PostMapping("/v1/ycbcQuery_token")
public String ycbcQueryToken(@RequestBody YCBCGetTokenDTO dto) {
logger.info("请求甬城泊车平台令牌 params:{}", JSONObject.toJSONString(dto));
logger.info("请求甬城泊车平台令牌 params:{}", JSON.toJSONString(dto));
String token = "";
try {
token = ycbcService.YCBCGetToken(dto);
@@ -86,7 +86,7 @@ public class YCBCController extends BaseController {
*/
@PostMapping("/v1/query_stations_info")
public CommonResult<?> query_stations_info(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("甬城泊车平台查询充电站信息 params:{}", JSONObject.toJSONString(dto));
logger.info("甬城泊车平台查询充电站信息 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -111,7 +111,7 @@ public class YCBCController extends BaseController {
QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class);
queryStationInfoDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = ycbcService.queryStationsInfo(queryStationInfoDTO);
logger.info("甬城泊车平台查询充电站信息 result:{}", JSONObject.toJSONString(map));
logger.info("甬城泊车平台查询充电站信息 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "查询充电站信息成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.info("甬城泊车平台查询充电站信息 error:", e);
@@ -129,7 +129,7 @@ public class YCBCController extends BaseController {
*/
@PostMapping("/v1/query_station_status")
public CommonResult<?> query_station_status(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("甬城泊车平台查询充电站状态信息 params:{}", JSONObject.toJSONString(dto));
logger.info("甬城泊车平台查询充电站状态信息 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -154,7 +154,7 @@ public class YCBCController extends BaseController {
QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class);
queryStationInfoDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = ycbcService.queryStationStatus(queryStationInfoDTO);
logger.info("甬城泊车平台查询充电站状态信息 result:{}", JSONObject.toJSONString(map));
logger.info("甬城泊车平台查询充电站状态信息 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "查询充电站状态信息成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.info("甬城泊车平台查询充电站状态信息 error:", e);
@@ -172,7 +172,7 @@ public class YCBCController extends BaseController {
*/
@PostMapping("/pushStationStatus")
public RestApiResponse<?> pushStationStatus(@RequestBody PushInfoParamDTO dto) {
logger.info("甬城泊车平台设备状态变化推送 params:{}", JSONObject.toJSONString(dto));
logger.info("甬城泊车平台设备状态变化推送 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
if (StringUtils.isBlank(String.valueOf(dto.getPileConnectorCode())) ||
@@ -224,7 +224,7 @@ public class YCBCController extends BaseController {
*/
@PostMapping("/v1/query_equip_auth")
public CommonResult<?> query_equip_auth(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("甬城泊车平台请求设备认证 param:{}", JSONObject.toJSONString(dto));
logger.info("甬城泊车平台请求设备认证 param:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -249,7 +249,7 @@ public class YCBCController extends BaseController {
QueryEquipmentDTO queryEquipmentDTO = JSONObject.parseObject(dataStr, QueryEquipmentDTO.class);
queryEquipmentDTO.setOperatorID(dto.getOperatorID());
Map<String, String> map = ycbcService.queryEquipAuth(queryEquipmentDTO);
logger.info("甬城泊车平台请求设备认证 result:{}", JSONObject.toJSONString(map));
logger.info("甬城泊车平台请求设备认证 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求设备认证成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.info("甬城泊车平台请求设备认证 error:", e);
@@ -266,7 +266,7 @@ public class YCBCController extends BaseController {
*/
@PostMapping("/v1/query_start_charge")
public CommonResult<?> query_start_charge(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("甬城泊车平台请求启动充电 params :{}", JSONObject.toJSONString(dto));
logger.info("甬城泊车平台请求启动充电 params :{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -291,7 +291,7 @@ public class YCBCController extends BaseController {
QueryStartChargeDTO queryStartChargeDTO = JSONObject.parseObject(dataStr, QueryStartChargeDTO.class);
queryStartChargeDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = ycbcService.queryStartCharge(queryStartChargeDTO);
logger.info("甬城泊车平台请求启动充电 result:{}", JSONObject.toJSONString(map));
logger.info("甬城泊车平台请求启动充电 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求启动充电成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.error("甬城泊车平台请求启动充电 error", e);
@@ -307,7 +307,7 @@ public class YCBCController extends BaseController {
*/
@PostMapping("/v1/query_equip_charge_status")
public CommonResult<?> query_equip_charge_status(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("甬城泊车平台查询充电状态 params :{}", JSONObject.toJSONString(dto));
logger.info("甬城泊车平台查询充电状态 params :{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -332,7 +332,7 @@ public class YCBCController extends BaseController {
QueryEquipChargeStatusDTO queryEquipChargeStatusDTO = JSONObject.parseObject(dataStr, QueryEquipChargeStatusDTO.class);
queryEquipChargeStatusDTO.setOperatorID(dto.getOperatorID());
Map<String, String> map = ycbcService.queryEquipChargeStatus(queryEquipChargeStatusDTO);
logger.info("甬城泊车平台查询充电状态 result:{}", JSONObject.toJSONString(map));
logger.info("甬城泊车平台查询充电状态 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "查询充电状态成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.error("甬城泊车平台查询充电状态 error", e);
@@ -372,7 +372,7 @@ public class YCBCController extends BaseController {
*/
@PostMapping("/v1/query_stop_charge")
public CommonResult<?> query_stop_charge(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("甬城泊车平台请求停止充电 params :{}", JSONObject.toJSONString(dto));
logger.info("甬城泊车平台请求停止充电 params :{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -397,7 +397,7 @@ public class YCBCController extends BaseController {
QueryStartChargeDTO queryStartChargeDTO = JSONObject.parseObject(dataStr, QueryStartChargeDTO.class);
queryStartChargeDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = ycbcService.queryStopCharge(queryStartChargeDTO);
logger.info("甬城泊车平台请求停止充电 result:{}", JSONObject.toJSONString(map));
logger.info("甬城泊车平台请求停止充电 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求停止充电成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.error("甬城泊车平台请求停止充电 error", e);

21
jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/zhongdianlian/ZDLController.java vendored
View File

@@ -1,5 +1,6 @@
package com.jsowell.web.controller.thirdparty.zhongdianlian;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
@@ -47,10 +48,10 @@ public class ZDLController extends BaseController {
*/
@PostMapping("/v1/query_token")
public CommonResult<?> queryToken(@RequestBody CommonParamsDTO dto) {
logger.info("中电联平台请求令牌 params:{}", JSONObject.toJSONString(dto));
logger.info("中电联平台请求令牌 params:{}", JSON.toJSONString(dto));
try {
Map<String, String> map = zdlService.generateToken(dto);
logger.info("中电联平台请求令牌 result:{}", JSONObject.toJSONString(map));
logger.info("中电联平台请求令牌 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "请求令牌成功！", map.get("Data"), map.get("Sig"));
} catch (UnsupportedEncodingException e) {
logger.error("中电联平台 请求令牌接口 异常");
@@ -66,7 +67,7 @@ public class ZDLController extends BaseController {
*/
@PostMapping("/v1/query_stations_info")
public CommonResult<?> query_stations_info(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("中电联平台查询充电站信息 params:{}", JSONObject.toJSONString(dto));
logger.info("中电联平台查询充电站信息 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -93,7 +94,7 @@ public class ZDLController extends BaseController {
queryStationInfoDTO.setOperatorId(dto.getOperatorID());
queryStationInfoDTO.setAddress("宁波");
Map<String, String> map = zdlService.queryStationsInfo(queryStationInfoDTO);
logger.info("中电联平台查询充电站信息 result:{}", JSONObject.toJSONString(map));
logger.info("中电联平台查询充电站信息 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "查询充电站信息成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.info("中电联平台查询充电站信息 error:", e);
@@ -110,7 +111,7 @@ public class ZDLController extends BaseController {
*/
@PostMapping("/v1/query_station_stats")
public CommonResult<?> queryStationStats(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("中电联平台查询统计信息 params:{}", JSONObject.toJSONString(dto));
logger.info("中电联平台查询统计信息 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -136,7 +137,7 @@ public class ZDLController extends BaseController {
QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class);
queryStationInfoDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = zdlService.queryStationStats(queryStationInfoDTO);
logger.info("中电联平台查询统计信息 result:{}", JSONObject.toJSONString(map));
logger.info("中电联平台查询统计信息 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "查询统计信息成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.info("中电联平台查询统计信息 error:", e);
@@ -153,7 +154,7 @@ public class ZDLController extends BaseController {
*/
@PostMapping("/v1/query_station_status")
public CommonResult<?> queryStationStatus(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("中电联平台设备接口状态查询 params:{}", JSONObject.toJSONString(dto));
logger.info("中电联平台设备接口状态查询 params:{}", JSON.toJSONString(dto));
try {
// 校验令牌
String token = request.getHeader("Authorization");
@@ -183,7 +184,7 @@ public class ZDLController extends BaseController {
QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class);
queryStationInfoDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = zdlService.queryStationStatus(queryStationInfoDTO);
logger.info("中电联平台设备接口状态查询 result:{}", JSONObject.toJSONString(map));
logger.info("中电联平台设备接口状态查询 result:{}", JSON.toJSONString(map));
return CommonResult.success(0, "设备接口状态查询成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) {
logger.info("中电联平台设备接口状态查询 error:", e);
@@ -201,7 +202,7 @@ public class ZDLController extends BaseController {
*/
@PostMapping("/pushStationInfo")
public RestApiResponse<?> pushStationInfo(@RequestBody PushStationInfoDTO dto) {
logger.info("推送中电联平台充电站信息 params:{}", JSONObject.toJSONString(dto));
logger.info("推送中电联平台充电站信息 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
if (StringUtils.isBlank(String.valueOf(dto.getStationId()))) {
@@ -228,7 +229,7 @@ public class ZDLController extends BaseController {
*/
@PostMapping("/pushStationStatus")
public RestApiResponse<?> pushStationStatus(@RequestBody PushInfoParamDTO dto) {
logger.info("中电联平台设备状态变化推送 params:{}", JSONObject.toJSONString(dto));
logger.info("中电联平台设备状态变化推送 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
if (StringUtils.isBlank(String.valueOf(dto.getPileConnectorCode())) ||