diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AgentDevController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AgentDevController.java index 30cf17f15..16a555ca2 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AgentDevController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AgentDevController.java @@ -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); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AuthCardController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AuthCardController.java index 1a6d1d1ea..1cb47b577 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AuthCardController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AuthCardController.java @@ -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); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java index edefe3c82..bf69f8650 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java @@ -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; } diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpXixiaoController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpXixiaoController.java index a0907947a..1053cbb91 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpXixiaoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpXixiaoController.java @@ -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; } diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java index f2b40f6d2..910f6422a 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java @@ -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); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java index 952c1f3d4..6e2c5c687 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java @@ -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 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; } diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java index 7aa1bdf49..164650ac2 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java @@ -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); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java index 82c93ee3e..6c72219b0 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java @@ -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 { // 校验参数 diff --git a/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java b/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java index 3600abe9b..59a7425df 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java @@ -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 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"); diff --git a/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java b/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java index 84508a53e..591ecb573 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java @@ -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; /** diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index d60e7f59e..0c1683400 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -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 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 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"); diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index cdc7363f8..68bc94c54 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -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); } diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java index 0ad802722..98cb5a951 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java @@ -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 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; } diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java index dbb9a079c..85b7b4832 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java @@ -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); diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java index 9eb26a176..df63fe439 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java @@ -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 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 list = pileBillingTemplateService.queryStationPreferentialBillingTemplateList(stationId); - logger.info("查询站点优惠计费模板 result：{}", JSONObject.toJSONString(list)); + logger.info("查询站点优惠计费模板 result：{}", JSON.toJSONString(list)); return getDataTable(list); } diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java index 31b5494ce..041f4761d 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java @@ -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 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); diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java index f30f60599..01ae0bc5a 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java @@ -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 types = dto.getThirdPartyTypes(); diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/system/SysLoginController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/system/SysLoginController.java index f36f9f043..b239f708f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/system/SysLoginController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/system/SysLoginController.java @@ -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(), diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/amap/AMapController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/amap/AMapController.java index 0e3556327..22de14ea8 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/amap/AMapController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/amap/AMapController.java @@ -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); diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/hainan/HaiNanPlatformController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/hainan/HaiNanPlatformController.java index 00cf9f4a2..dbe910fa4 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/hainan/HaiNanPlatformController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/hainan/HaiNanPlatformController.java @@ -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 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 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 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 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 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 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 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 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 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); diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiController.java index 8f2a64817..51d32bb73 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiController.java @@ -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 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 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 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 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 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 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); diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiControllerV2.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiControllerV2.java index 2eb53f27e..d5a728080 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiControllerV2.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiControllerV2.java @@ -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; @@ -44,10 +44,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 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接口 异常"); @@ -62,7 +62,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); @@ -81,7 +81,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); @@ -100,7 +100,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); @@ -119,7 +119,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); @@ -138,7 +138,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); @@ -156,7 +156,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); @@ -174,7 +174,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); @@ -201,7 +201,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); @@ -266,7 +266,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; } @@ -277,14 +277,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; } @@ -303,7 +303,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; } @@ -322,7 +322,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; } diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java index cd4fd4952..807bd37b6 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java @@ -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 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"); diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/nanrui/NRController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/nanrui/NRController.java index bb9fd6665..78fbf806e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/nanrui/NRController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/nanrui/NRController.java @@ -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 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); diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ningxiajiaotou/NXJTController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ningxiajiaotou/NXJTController.java index e28059d00..5cb91f79a 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ningxiajiaotou/NXJTController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ningxiajiaotou/NXJTController.java @@ -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 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"); diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/xindiantu/XDTController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/xindiantu/XDTController.java index 4d7e2659e..468adadd9 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/xindiantu/XDTController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/xindiantu/XDTController.java @@ -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 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 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 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 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 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 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 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())) || diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/yongchengboche/YCBCController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/yongchengboche/YCBCController.java index 055bf217f..e6d1b31dc 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/yongchengboche/YCBCController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/yongchengboche/YCBCController.java @@ -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 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 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 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 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 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 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 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); diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/zhongdianlian/ZDLController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/zhongdianlian/ZDLController.java index 1031b909c..0181d71f4 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/zhongdianlian/ZDLController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/zhongdianlian/ZDLController.java @@ -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 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 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 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 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())) || diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 212c1bf5b..c4b53b0e8 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -273,7 +273,7 @@ public class SpringBootTestController { @Test public void testnotificationOperationSystemInfo() { // HWStationInfo hwStationInfo = huaWeiService.notificationOperationSystemInfo("19"); - // String s = JSONObject.toJSONString(hwStationInfo); + // String s = JSON.toJSONString(hwStationInfo); // System.out.println(s); } @@ -296,7 +296,7 @@ public class SpringBootTestController { jsonObject.put("msg_type","GroundlockStatus"); jsonObject.put("msg_data",null); - // ChannelFuture future = cameraBusinessServiceImpl.sendMsg(channelId, topic, jsonObject.toJSONString()); + // ChannelFuture future = cameraBusinessServiceImpl.sendMsg(channelId, topic, JSON.toJSONString()); // System.out.println(future.toString()); } @@ -984,7 +984,7 @@ public class SpringBootTestController { List idList = Lists.newArrayList(); for (int i = 0; i < jsonList.size(); i++) { JSONObject jsonObject = (JSONObject) jsonList.get(i); - // System.out.println(jsonObject.toJSONString()); + // System.out.println(JSON.toJSONString()); BigDecimal refundAmount = jsonObject.getBigDecimal("refundAmount"); String paymentId = jsonObject.getString("paymentId"); @@ -9221,7 +9221,7 @@ public class SpringBootTestController { json.put("PageNo", 1); json.put("PageSize", 10); - String dataJson = JSONObject.toJSONString(json); + String dataJson = JSON.toJSONString(json); // 加密 byte[] encryptText = Cryptos.aesEncrypt(dataJson.getBytes(StandardCharsets.UTF_8), operatorSecret.getBytes(), operatorSecret.getBytes()); @@ -9310,7 +9310,7 @@ public class SpringBootTestController { jsonObject1.put("Seq", "0001"); jsonObject1.put("Sig", "1568D2D35B245A0205B33D0EF92E7981"); - String jsonString = JSONObject.toJSONString(jsonObject1); + String jsonString = JSON.toJSONString(jsonObject1); String result = HttpUtils.sendPostContentType("http://localhost:8080/LianLian/v1/query_stations_info", jsonString, "application/json"); JSONObject object = JSONObject.parseObject(result); @@ -9501,7 +9501,7 @@ public class SpringBootTestController { } catch (Exception e) { e.printStackTrace(); } - System.out.println(JSONObject.toJSONString(pay)); + System.out.println(JSON.toJSONString(pay)); } @Test @@ -9960,7 +9960,7 @@ public class SpringBootTestController { } // 保存报文 - String jsonMsg = JSONObject.toJSONString(loginRequestData); + String jsonMsg = JSON.toJSONString(loginRequestData); // pileMsgRecordService.save(pileSn, pileSn, type, jsonMsg, ykcDataProtocol.getHEXString()); // // 消息体 diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java b/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java index b2aaaf448..7406b0ae9 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java @@ -115,12 +115,12 @@ public class SecurityUtils { // 登录用户所属部门（运营商或站点 根据父级id判断） SysDept dept = user.getDept(); if (dept == null) { - log.info("用户id:{}, 获取不到所属部门信息", user.getUserId()); + log.info("用户id:{}, 获取不到所属部门信息", user.getUserId());365 return null; } String deptId = String.valueOf(dept.getDeptId()); resultVO.setDeptId(deptId); - log.info("用户id:{}, 所属部门信息:{}", user.getUserId(), JSONObject.toJSONString(dept)); + log.info("用户id:{}, 所属部门信息:{}", user.getUserId(), JSON.toJSONString(dept)); // 登录用户角色 Long parentId = dept.getParentId(); resultVO.setParentId(String.valueOf(parentId)); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSAbortDuringChargingPhaseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSAbortDuringChargingPhaseHandler.java index a3165961b..bfd3472de 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSAbortDuringChargingPhaseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSAbortDuringChargingPhaseHandler.java @@ -28,7 +28,7 @@ public class BMSAbortDuringChargingPhaseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===充电阶段 BMS 中止===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===充电阶段 BMS 中止===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSDemandAndChargerOutputHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSDemandAndChargerOutputHandler.java index e8db78507..1dc3f5e1e 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSDemandAndChargerOutputHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSDemandAndChargerOutputHandler.java @@ -28,7 +28,7 @@ public class BMSDemandAndChargerOutputHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===充电过程 BMS 需求与充电机输出===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===充电过程 BMS 需求与充电机输出===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSInformationHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSInformationHandler.java index cb2e04745..efe908a48 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSInformationHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSInformationHandler.java @@ -28,7 +28,7 @@ public class BMSInformationHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===充电过程 BMS 信息===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===充电过程 BMS 信息===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateRequestHandler.java index ea3077bf7..0b3796b27 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateRequestHandler.java @@ -38,7 +38,7 @@ public class BillingTemplateRequestHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===执行计费模板请求逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===执行计费模板请求逻辑===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体（此请求消息体只有桩编码） byte[] pileSnByte = ykcDataProtocol.getMsgBody(); String pileSn = BytesUtil.binary(pileSnByte, 16); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateResponseHandler.java index 436023fa8..77a484fce 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateResponseHandler.java @@ -27,7 +27,7 @@ public class BillingTemplateResponseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===执行计费模型设置应答逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===执行计费模型设置应答逻辑===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateSettingHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateSettingHandler.java index 539c6cdc0..0ea118eba 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateSettingHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateSettingHandler.java @@ -28,7 +28,7 @@ public class BillingTemplateSettingHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===执行计费模型设置逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===执行计费模型设置逻辑===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java index 1cbfae482..e81b4949c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java @@ -39,7 +39,7 @@ public class BillingTemplateValidateRequestHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===执行计费模板验证请求逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===执行计费模板验证请求逻辑===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java index f6e8b37e8..997312fde 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java @@ -38,7 +38,7 @@ public class ChargeEndHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===执行充电结束逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===执行充电结束逻辑===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargerAbortedDuringChargingPhaseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargerAbortedDuringChargingPhaseHandler.java index 6e2f55384..05a0897f4 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargerAbortedDuringChargingPhaseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargerAbortedDuringChargingPhaseHandler.java @@ -28,7 +28,7 @@ public class ChargerAbortedDuringChargingPhaseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===充电阶段充电机中止===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===充电阶段充电机中止===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargingHandshakeHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargingHandshakeHandler.java index ab6096858..426332eca 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargingHandshakeHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargingHandshakeHandler.java @@ -28,7 +28,7 @@ public class ChargingHandshakeHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===执行充电握手逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===执行充电握手逻辑===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java index d8824e60a..a50d6f724 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java @@ -1,6 +1,6 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.JSON; import com.google.common.primitives.Bytes; import com.jsowell.common.constant.Constants; import com.jsowell.common.core.domain.ykc.ConfirmStartChargingData; @@ -18,9 +18,9 @@ import com.jsowell.pile.domain.MemberPlateNumberRelation; import com.jsowell.pile.domain.PileAuthCard; import com.jsowell.pile.dto.GenerateOrderDTO; import com.jsowell.pile.service.MemberPlateNumberRelationService; -import com.jsowell.pile.service.PileMsgRecordService; import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.service.PileAuthCardService; +import com.jsowell.pile.service.PileMsgRecordService; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -59,7 +59,7 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===充电桩主动申请启动充电===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===充电桩主动申请启动充电===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); @@ -254,7 +254,7 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{ // accountBalanceByteArr = BytesUtil.checkLengthAndBehindAppendZero(accountBalanceByteArr, 8); // 保存报文 - String jsonMsg = JSONObject.toJSONString(confirmStartChargingData); + String jsonMsg = JSON.toJSONString(confirmStartChargingData); pileMsgRecordService.save(pileSn, pileSn, type, jsonMsg, ykcDataProtocol.getHEXString()); // 拼装消息体 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ErrorMessageHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ErrorMessageHandler.java index 07ecb9f8e..148c4f1ad 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ErrorMessageHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ErrorMessageHandler.java @@ -28,7 +28,7 @@ public class ErrorMessageHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===错误报文===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===错误报文===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java index 6c8ce9e90..184b09146 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java @@ -49,7 +49,7 @@ public class GroundLockDataUploadHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===地锁数据上送===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===地锁数据上送===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java index 1af34081b..dc6e86489 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java @@ -32,7 +32,7 @@ public class HeartbeatRequestHandler extends AbstractHandler { @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===充电桩心跳包===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===充电桩心跳包===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java index f1c0942b9..2c492c02b 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java @@ -1,6 +1,6 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.JSON; import com.google.common.collect.Lists; import com.google.common.primitives.Bytes; import com.jsowell.common.constant.Constants; @@ -244,7 +244,7 @@ public class LoginRequestHandler extends AbstractHandler { CompletableFuture.runAsync(() -> { // 保存报文 没有登录认证通过还要不要保存报文？ try { - String jsonMsg = JSONObject.toJSONString(loginRequestData); + String jsonMsg = JSON.toJSONString(loginRequestData); pileMsgRecordService.save(pileSn, pileSn, type, jsonMsg, ykcDataProtocol.getHEXString()); } catch (Exception e) { log.error("保存报文失败pileSn:{}", pileSn, e); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningHandler.java index 8239b8ac6..14ade9324 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningHandler.java @@ -28,7 +28,7 @@ public class OfflineCardDataCleaningHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===离线卡数据清除===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===离线卡数据清除===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningResponseHandler.java index ae9294927..01abe7d03 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningResponseHandler.java @@ -27,7 +27,7 @@ public class OfflineCardDataCleaningResponseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===离线卡数据清除应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===离线卡数据清除应答===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryHandler.java index 61195d759..4bf451ab7 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryHandler.java @@ -29,7 +29,7 @@ public class OfflineCardDataQueryHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===离线卡数据查询===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===离线卡数据查询===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编码 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryResponseHandler.java index c9f62365e..8f6289eb7 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryResponseHandler.java @@ -27,7 +27,7 @@ public class OfflineCardDataQueryResponseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===离线卡数据查询应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===离线卡数据查询应答===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationHandler.java index 3ef6747d8..b90519e95 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationHandler.java @@ -29,7 +29,7 @@ public class OfflineCardDataSynchronizationHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===离线卡数据同步===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===离线卡数据同步===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationResponseHandler.java index 9d15540ba..2fdbe9c8e 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationResponseHandler.java @@ -27,7 +27,7 @@ public class OfflineCardDataSynchronizationResponseHandler extends AbstractHandl @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===离线卡数据同步应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===离线卡数据同步应答===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); //消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java index efa962788..e83c7fcd0 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java @@ -36,7 +36,7 @@ public class ParameterConfigurationHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===参数配置===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===参数配置===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingHandler.java index c4bd88856..809e105fd 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingHandler.java @@ -28,7 +28,7 @@ public class PileWorkingParameterSettingHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===充电桩工作参数设置===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===充电桩工作参数设置===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingResponseHandler.java index 5024c0567..0f7f2d199 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingResponseHandler.java @@ -27,7 +27,7 @@ public class PileWorkingParameterSettingResponseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===充电桩工作参数设置应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===充电桩工作参数设置应答===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/QueryPileWorkParamsHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/QueryPileWorkParamsHandler.java index 4543554b4..68cc065c1 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/QueryPileWorkParamsHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/QueryPileWorkParamsHandler.java @@ -27,7 +27,7 @@ public class QueryPileWorkParamsHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[====充电桩査询工作参数回复====] param:{}", JSONObject.toJSONString(ykcDataProtocol)); + // log.info("[====充电桩査询工作参数回复====] param:{}", JSON.toJSONString(ykcDataProtocol)); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ReadRealTimeMonitorDataHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ReadRealTimeMonitorDataHandler.java index 80fac4acf..642fb25ac 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ReadRealTimeMonitorDataHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ReadRealTimeMonitorDataHandler.java @@ -36,7 +36,7 @@ public class ReadRealTimeMonitorDataHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===读取实时监测数据===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===读取实时监测数据===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 byte[] pileSnByteArr = new byte[]{}; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteAccountBalanceUpdateRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteAccountBalanceUpdateRequestHandler.java index 2c59f6271..2fc7a69fd 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteAccountBalanceUpdateRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteAccountBalanceUpdateRequestHandler.java @@ -27,7 +27,7 @@ public class RemoteAccountBalanceUpdateRequestHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===余额更新应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===余额更新应答===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockHandler.java index b22a617cc..b4492df99 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockHandler.java @@ -28,7 +28,7 @@ public class RemoteControlGroundLockHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===遥控地锁升锁与降锁命令===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===遥控地锁升锁与降锁命令===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编码 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockResponseHandler.java index 93055c28e..3146078af 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockResponseHandler.java @@ -35,7 +35,7 @@ public class RemoteControlGroundLockResponseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===充电桩返回遥控地锁升锁与降锁数据（上行）===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===充电桩返回遥控地锁升锁与降锁数据（上行）===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeHandler.java index 53c5133d5..61a4367ff 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeHandler.java @@ -34,7 +34,7 @@ public class RemoteIssuedQrCodeHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===后台远程下发二维码前缀指令===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===后台远程下发二维码前缀指令===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编码 String pileSn = "88000000000001"; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeResponseHandler.java index 40fc4a737..e9f560fb6 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeResponseHandler.java @@ -27,7 +27,7 @@ public class RemoteIssuedQrCodeResponseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===桩应答远程下发二维码前缀指令===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===桩应答远程下发二维码前缀指令===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartHandler.java index abe35be93..1dcb4f746 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartHandler.java @@ -29,7 +29,7 @@ public class RemoteRestartHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===远程重启===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===远程重启===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartResponseHandler.java index f0c1e2d36..bf976bd70 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartResponseHandler.java @@ -1,6 +1,6 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.JSON; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -33,7 +33,7 @@ public class RemoteRestartResponseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===远程重启应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===远程重启应答===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); @@ -48,7 +48,7 @@ public class RemoteRestartResponseHandler extends AbstractHandler{ saveLastTimeAndCheckChannel(pileSn, channel); // 保存报文 - String jsonMsg = JSONObject.toJSONString(ykcDataProtocol); + String jsonMsg = JSON.toJSONString(ykcDataProtocol); pileMsgRecordService.save(pileSn, null, type, jsonMsg, ykcDataProtocol.getHEXString()); // 设置结果 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java index d221e99f9..2f799d0f6 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java @@ -42,7 +42,7 @@ public class RemoteStartChargingRequestHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===远程启动充电命令回复===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===远程启动充电命令回复===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java index 329340352..71634b9bc 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java @@ -38,7 +38,7 @@ public class RemoteStopChargingRequestHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===远程停机命令回复===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===远程停机命令回复===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateHandler.java index 36800fcf0..334500369 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateHandler.java @@ -29,7 +29,7 @@ public class RemoteUpdateHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===远程更新===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===远程更新===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateResponseHandler.java index 03c23991c..49434ab67 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateResponseHandler.java @@ -27,7 +27,7 @@ public class RemoteUpdateResponseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[====远程更新应答====] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[====远程更新应答====] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/SettingPileWorkParamsHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/SettingPileWorkParamsHandler.java index 7a0237a77..f045374ed 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/SettingPileWorkParamsHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/SettingPileWorkParamsHandler.java @@ -27,7 +27,7 @@ public class SettingPileWorkParamsHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[====平台设置工作参数回复====] param:{}", JSONObject.toJSONString(ykcDataProtocol)); + // log.info("[====平台设置工作参数回复====] param:{}", JSON.toJSONString(ykcDataProtocol)); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingHandler.java index 48a11dbe9..f9d3e7997 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingHandler.java @@ -28,7 +28,7 @@ public class TimeCheckSettingHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===对时设置===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===对时设置===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingResponseHandler.java index a17a4eccf..2b7b53282 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingResponseHandler.java @@ -31,7 +31,7 @@ public class TimeCheckSettingResponseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===对时设置应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===对时设置应答===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java index 61203ee20..7d32cfaa9 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java @@ -1,6 +1,6 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.JSON; import com.google.common.primitives.Bytes; import com.jsowell.common.constant.Constants; import com.jsowell.common.core.domain.ykc.TransactionRecordsData; @@ -17,7 +17,9 @@ import com.jsowell.common.util.YKCUtils; import com.jsowell.common.util.id.IdUtils; import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.domain.OrderBasicInfo; -import com.jsowell.pile.service.*; +import com.jsowell.pile.service.OrderBasicInfoService; +import com.jsowell.pile.service.PileMerchantInfoService; +import com.jsowell.pile.service.PileMsgRecordService; import com.jsowell.pile.service.programlogic.AbstractProgramLogic; import com.jsowell.pile.service.programlogic.ProgramLogicFactory; import com.jsowell.thirdparty.common.CommonService; @@ -316,7 +318,7 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===交易记录===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===交易记录===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); @@ -550,7 +552,7 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { .build(); // 保存报文 - String jsonMsg = JSONObject.toJSONString(data); + String jsonMsg = JSON.toJSONString(data); pileMsgRecordService.save(pileSn, pileSn + connectorCode, type, jsonMsg, ykcDataProtocol.getHEXString()); // 处理订单加锁 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java index 7dde53443..1d29e5638 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java @@ -58,7 +58,7 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - // log.info("[===获取桩上传的实时监测数据===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===获取桩上传的实时监测数据===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); RealTimeMonitorData realTimeMonitorData = new RealTimeMonitorData(); // 获取消息体 diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java index e4c1d71f4..a9021bf49 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java @@ -134,7 +134,7 @@ public class AdapayService { createAdaPaymentParam.setDescription(JSON.toJSONString(map)); // 异步通知地址，url为http/https路径，服务器POST回调，URL 上请勿附带参数 createAdaPaymentParam.setNotify_url(ADAPAY_CALLBACK_URL); - createAdaPaymentParam.setExpend(JSONObject.toJSONString(ImmutableMap.of("open_id", openId))); + createAdaPaymentParam.setExpend(JSON.toJSONString(ImmutableMap.of("open_id", openId))); // 延时分账 if (StringUtils.isNotBlank(payMode)) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 566fbd1af..826df7074 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -588,7 +588,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { this.cleanCacheByOrderCode(orderBasicInfo.getOrderCode(), orderBasicInfo.getTransactionCode()); int i = orderBasicInfoMapper.updateOrderBasicInfo(orderBasicInfo); CompletableFuture.runAsync(() -> this.cleanCacheByOrderCode(orderBasicInfo.getOrderCode(), orderBasicInfo.getTransactionCode())); - logger.info("修改订单updateOrderBasicInfo:{}", JSONObject.toJSONString(orderBasicInfo)); + logger.info("修改订单updateOrderBasicInfo:{}", JSON.toJSONString(orderBasicInfo)); return i; } @@ -1105,7 +1105,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { // 计算需要退回的金额 Map returnAmountMap = calculateReturnAmount(principalPay, null, orderAmount); logger.info("结算订单:{}, 剩余金额退回余额, 订单消费金额:{}, 本金支付金额:{}, 赠送支付金额:{}, 退回金额map:{}", - orderCode, orderAmount, principalPay, null, JSONObject.toJSONString(returnAmountMap)); + orderCode, orderAmount, principalPay, null, JSON.toJSONString(returnAmountMap)); // 需要退回本金的金额 BigDecimal returnPrincipal = returnAmountMap.get("returnPrincipal"); @@ -1634,7 +1634,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { OrderMonitorData record = new OrderMonitorData(); record.setOrderCode(orderCode); record.setTransactionCode(transactionCode); - record.setMonitorData(JSONObject.toJSONString(list)); + record.setMonitorData(JSON.toJSONString(list)); int insert = orderMonitorDataService.insertSelective(record); if (insert > 0) { // 删除redis中缓存 @@ -1708,10 +1708,10 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { String refundType = dto.getRefundType(); if (StringUtils.equals(refundType, "1")) { WechatPayRefundResponse response = refundOrderWithWechatPay(dto); - logger.info("订单结算退款 result:{}", JSONObject.toJSONString(response)); + logger.info("订单结算退款 result:{}", JSON.toJSONString(response)); } else if (StringUtils.equals(refundType, "2")) { WechatPayRefundResponse response = refundBalanceWithWechatPay(dto); - logger.info("用户余额退款 result:{}", JSONObject.toJSONString(response)); + logger.info("用户余额退款 result:{}", JSON.toJSONString(response)); } else { logger.warn("没有找到退款处理逻辑"); } @@ -2230,7 +2230,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { for (WechatPayRefundRequest refundRequest : requestList) { try { WechatPayRefundResponse wechatPayRefundResponse = wechatPayService.ApplyForWechatPayRefundV3(refundRequest); - logger.info("调微信退款API退款====={}", JSONObject.toJSONString(wechatPayRefundResponse)); + logger.info("调微信退款API退款====={}", JSON.toJSONString(wechatPayRefundResponse)); } catch (Exception e) { logger.error("调微信退款API发生异常", e); } @@ -2943,7 +2943,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { @Override public OrderBasicInfo generateOrder(GenerateOrderDTO dto) throws ParseException { - logger.info("generateOrder param:{}", JSONObject.toJSONString(dto)); + logger.info("generateOrder param:{}", JSON.toJSONString(dto)); // 处理前端传的参数 analysisPileParameter(dto); @@ -3532,7 +3532,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { // 订单详情 BillingTemplateVO billingTemplate = dto.getBillingTemplate(); - logger.info("订单使用的计费模板-orderCode:{}, billingTemplate:{}", orderCode, JSONObject.toJSONString(billingTemplate)); + logger.info("订单使用的计费模板-orderCode:{}, billingTemplate:{}", orderCode, JSON.toJSONString(billingTemplate)); BigDecimal sharpElectricityPrice = billingTemplate.getSharpElectricityPrice() != null ? billingTemplate.getSharpElectricityPrice() : BigDecimal.ZERO; BigDecimal sharpServicePrice = billingTemplate.getSharpServicePrice() != null ? billingTemplate.getSharpServicePrice() : BigDecimal.ZERO; BigDecimal peakElectricityPrice = billingTemplate.getPeakElectricityPrice() != null ? billingTemplate.getPeakElectricityPrice() : BigDecimal.ZERO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java index b278fc4eb..17076973b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java @@ -1,6 +1,6 @@ package com.jsowell.pile.service.impl; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.JSON; import com.google.common.collect.Lists; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.constant.Constants; @@ -241,7 +241,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService { private List queryPileListByStatus(QueryPileDTO dto) { // StopWatch watch = new StopWatch("查询充电桩信息"); // watch.start("首先不分页查询所有符合条件的充电桩"); - log.info("queryPileInfos dto:{}", JSONObject.toJSONString(dto)); + log.info("queryPileInfos dto:{}", JSON.toJSONString(dto)); // 首先不分页查询所有符合条件的充电桩 List pileInfoVOS = queryPileInfoList(dto); // watch.stop(); @@ -249,13 +249,13 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService { // watch.start("查询充电桩状态"); // 获取桩sn列表 List pileSnList = pileInfoVOS.stream().map(PileDetailVO::getPileSn).collect(Collectors.toList()); - // log.info("获取桩sn列表:{}", JSONObject.toJSONString(pileSnList)); + // log.info("获取桩sn列表:{}", JSON.toJSONString(pileSnList)); // 批量获取桩状态 key:桩编号; value:状态 Map pileStatusMap = pileConnectorInfoService.getPileStatus(pileSnList); // watch.stop(); // watch.start("根据状态过滤"); - // log.info("批量获取桩状态:{}", JSONObject.toJSONString(pileStatusMap)); + // log.info("批量获取桩状态:{}", JSON.toJSONString(pileStatusMap)); // 根据状态过滤 List snList = Lists.newArrayList(); if (StringUtils.isNotBlank(dto.getStatus())) { @@ -564,7 +564,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService { .multiply(new BigDecimal(realTimeMonitorData.getOutputCurrent())).setScale(2, RoundingMode.HALF_UP).toString(); realTimeMonitorData.setOutputPower(power); // 保存json字符串 - String jsonMsg = JSONObject.toJSONString(realTimeMonitorData); + String jsonMsg = JSON.toJSONString(realTimeMonitorData); // 上传实时数据每10秒发送一次，1分钟6次，在同一分钟内，只保留最后一条实时数据 redisCache.hset(redisKey, DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00", now), jsonMsg); @@ -731,7 +731,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService { .collect(Collectors.toList()); stationIdList.addAll(stationList); } - log.info("后管首页基本信息查询 authorizedMap:{}, dto:{}", JSONObject.toJSONString(authorizedMap), JSONObject.toJSONString(dto)); + log.info("后管首页基本信息查询 authorizedMap:{}, dto:{}", JSON.toJSONString(authorizedMap), JSON.toJSONString(dto)); dto.setStationIdList(stationIdList); // IndexGeneralSituationVO generalInfo = pileBasicInfoMapper.getGeneralSituation(dto); IndexGeneralSituationVO generalInfo = pileBasicInfoMapper.getGeneralSituationInfo(dto); @@ -750,12 +750,12 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService { // demo账号 if (SecurityUtils.getUsername().equals("demo")) { BigDecimal bigDecimal = new BigDecimal(Constants.THREE); - log.info("demo账号, begin:{}", JSONObject.toJSONString(generalInfo)); + log.info("demo账号, begin:{}", JSON.toJSONString(generalInfo)); generalInfo.setTotalChargingAmount(new BigDecimal(generalInfo.getTotalChargingAmount()).multiply(bigDecimal).toString()); generalInfo.setTotalPileQuantity(new BigDecimal(generalInfo.getTotalPileQuantity()).multiply(bigDecimal).toString()); generalInfo.setTotalChargingDegree(new BigDecimal(generalInfo.getTotalChargingDegree()).multiply(bigDecimal).toString()); generalInfo.setTotalChargingQuantity(new BigDecimal(generalInfo.getTotalChargingQuantity()).multiply(bigDecimal).toString()); - log.info("demo账号, end:{}", JSONObject.toJSONString(generalInfo)); + log.info("demo账号, end:{}", JSON.toJSONString(generalInfo)); } return generalInfo; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java index 7c65ec72f..b935aeae9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java @@ -1,6 +1,6 @@ package com.jsowell.pile.service.impl; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.JSON; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.primitives.Bytes; @@ -690,7 +690,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic EchoBillingTemplateVO echoBillingTemplateVO = queryPileBillingTemplateById(Long.parseLong(billingTemplateVO.getTemplateId())); // 时段清单 List timeArray = echoBillingTemplateVO.getTimeArray(); - log.info("计费模板时段:{}", JSONObject.toJSONString(timeArray)); + log.info("计费模板时段:{}", JSON.toJSONString(timeArray)); List resultList = Lists.newArrayList(); for (BillingTimeDTO billingTimeDTO : timeArray) { @@ -761,7 +761,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic EchoBillingTemplateVO echoBillingTemplateVO = queryPileBillingTemplateById(Long.parseLong(billingTemplateVO.getTemplateId())); // 时段清单 List timeArray = echoBillingTemplateVO.getTimeArray(); - log.info("计费模板时段:{}", JSONObject.toJSONString(timeArray)); + log.info("计费模板时段:{}", JSON.toJSONString(timeArray)); List resultList = Lists.newArrayList(); for (BillingTimeDTO billingTimeDTO : timeArray) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index a8f37bb60..03e8db7ed 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -1,6 +1,6 @@ package com.jsowell.pile.service.impl; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.JSON; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; @@ -38,7 +38,10 @@ import org.springframework.stereotype.Service; import org.springframework.util.StopWatch; import java.math.BigDecimal; -import java.util.*; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -495,7 +498,7 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService { BigDecimal instantPower = instantPowerTemp.divide(new BigDecimal(1000), 2, BigDecimal.ROUND_HALF_UP); pileConnectorInfoVO.setInstantPower(instantPower); - log.info("枪口实时数据：{}", JSONObject.toJSONString(pileConnectorInfoVO)); + log.info("枪口实时数据：{}", JSON.toJSONString(pileConnectorInfoVO)); } // 查缓存是否故障 String redisKey = CacheConstants.PILE_HARDWARE_FAULT + pileConnectorInfoVO.getPileConnectorCode(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java index eeaf0f08d..602dc2369 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java @@ -694,7 +694,7 @@ public abstract class AbstractProgramLogic implements InitializingBean { OrderMonitorData record = new OrderMonitorData(); record.setOrderCode(orderCode); record.setTransactionCode(transactionCode); - record.setMonitorData(JSONObject.toJSONString(list)); + record.setMonitorData(JSON.toJSONString(list)); int insert = orderMonitorDataService.insertSelective(record); if (insert > 0) { // 删除redis中缓存 @@ -805,7 +805,7 @@ public abstract class AbstractProgramLogic implements InitializingBean { // // // 订单详情 // BillingTemplateVO billingTemplate = dto.getBillingTemplate(); - // logger.info("订单使用的计费模板-orderCode:{}, billingTemplate:{}", orderCode, JSONObject.toJSONString(billingTemplate)); + // logger.info("订单使用的计费模板-orderCode:{}, billingTemplate:{}", orderCode, JSON.toJSONString(billingTemplate)); // BigDecimal sharpElectricityPrice = billingTemplate.getSharpElectricityPrice() != null ? billingTemplate.getSharpElectricityPrice() : BigDecimal.ZERO; // BigDecimal sharpServicePrice = billingTemplate.getSharpServicePrice() != null ? billingTemplate.getSharpServicePrice() : BigDecimal.ZERO; // BigDecimal peakElectricityPrice = billingTemplate.getPeakElectricityPrice() != null ? billingTemplate.getPeakElectricityPrice() : BigDecimal.ZERO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java index c9886a510..4c785f37c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java @@ -65,7 +65,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { */ @Override public OrderBasicInfo generateOrder(GenerateOrderDTO dto) throws ParseException { - logger.info("【{}】-生成订单start, param:{}", this.getClass().getSimpleName(), JSONObject.toJSONString(dto)); + logger.info("【{}】-生成订单start, param:{}", this.getClass().getSimpleName(), JSON.toJSONString(dto)); // 处理前端传的参数 orderBasicInfoService.analysisPileParameter(dto); @@ -403,7 +403,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { // 从redis中取出实时记录保存到表中 realTimeMonitorDataRedis2DB(orderBasicInfo.getTransactionCode(), orderBasicInfo.getOrderCode()); - logger.info("结算订单end:{} OrderTransactionDTO:{}", orderBasicInfo.getOrderCode(), JSONObject.toJSONString(dto)); + logger.info("结算订单end:{} OrderTransactionDTO:{}", orderBasicInfo.getOrderCode(), JSON.toJSONString(dto)); } // uniApp 发送停止充电订阅消息 @@ -486,7 +486,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { createAdaPaymentParam.setPay_channel("wx_lite"); // todo 如果以后有支付宝等别的渠道，这里需要做修改，判断是什么渠道的请求 createAdaPaymentParam.setGoods_title(goodsTitle); createAdaPaymentParam.setGoods_desc(goodsDesc); - 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 map = Maps.newHashMap(); @@ -499,9 +499,9 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { createAdaPaymentParam.setPay_mode(payMode); } try { - logger.info("创建汇付支付参数:{}", JSONObject.toJSONString(createAdaPaymentParam)); + logger.info("创建汇付支付参数:{}", JSON.toJSONString(createAdaPaymentParam)); Map response = Payment.create(BeanMap.create(createAdaPaymentParam), config.getWechatAppId()); - logger.info("创建汇付支付参数反参:{}", JSONObject.toJSONString(response)); + logger.info("创建汇付支付参数反参:{}", JSON.toJSONString(response)); if (response != null && !response.isEmpty()) { JSONObject jsonObject = JSONObject.parseObject(response.get("expend").toString()); JSONObject pay_info = jsonObject.getJSONObject("pay_info"); @@ -639,7 +639,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { // 计算需要退回的金额 Map returnAmountMap = calculateReturnAmount(principalPay, giftPay, orderAmount, discountAmount); logger.info("结算订单:{}, 剩余金额退回余额, 订单消费金额:{}, 本金支付金额:{}, 赠送支付金额:{}, 退回金额map:{}", - orderCode, orderAmount, principalPay, null, JSONObject.toJSONString(returnAmountMap)); + orderCode, orderAmount, principalPay, null, JSON.toJSONString(returnAmountMap)); // 需要退回本金的金额 BigDecimal returnPrincipal = returnAmountMap.get("returnPrincipal"); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java index 4e7e8de29..7b03eb65d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java @@ -67,7 +67,7 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic { */ @Override public OrderBasicInfo generateOrder(GenerateOrderDTO dto) throws ParseException { - logger.info("【{}】-生成订单start, param:{}", this.getClass().getSimpleName(), JSONObject.toJSONString(dto)); + logger.info("【{}】-生成订单start, param:{}", this.getClass().getSimpleName(), JSON.toJSONString(dto)); // 处理前端传的参数 orderBasicInfoService.analysisPileParameter(dto); @@ -157,7 +157,7 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic { // // // 订单详情 // BillingTemplateVO billingTemplate = dto.getBillingTemplate(); - // logger.info("订单使用的计费模板-orderCode:{}, billingTemplate:{}", orderCode, JSONObject.toJSONString(billingTemplate)); + // logger.info("订单使用的计费模板-orderCode:{}, billingTemplate:{}", orderCode, JSON.toJSONString(billingTemplate)); // BigDecimal sharpElectricityPrice = billingTemplate.getSharpElectricityPrice() != null ? billingTemplate.getSharpElectricityPrice() : BigDecimal.ZERO; // BigDecimal sharpServicePrice = billingTemplate.getSharpServicePrice() != null ? billingTemplate.getSharpServicePrice() : BigDecimal.ZERO; // BigDecimal peakElectricityPrice = billingTemplate.getPeakElectricityPrice() != null ? billingTemplate.getPeakElectricityPrice() : BigDecimal.ZERO; @@ -410,7 +410,7 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic { // TODO 如果该站点的停车场优惠券信息配置不为空，则需绑定一张优惠券 - logger.info("结算订单end:{} OrderTransactionDTO:{}", orderBasicInfo.getOrderCode(), JSONObject.toJSONString(dto)); + logger.info("结算订单end:{} OrderTransactionDTO:{}", orderBasicInfo.getOrderCode(), JSON.toJSONString(dto)); } @Override @@ -477,7 +477,7 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic { createAdaPaymentParam.setPay_channel("wx_lite"); // todo 如果以后有支付宝等别的渠道，这里需要做修改，判断是什么渠道的请求 createAdaPaymentParam.setGoods_title(goodsTitle); createAdaPaymentParam.setGoods_desc(goodsDesc); - 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 map = Maps.newHashMap(); @@ -486,9 +486,9 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic { map.put("memberId", dto.getMemberId()); createAdaPaymentParam.setDescription(JSON.toJSONString(map)); try { - logger.info("创建汇付支付参数:{}", JSONObject.toJSONString(createAdaPaymentParam)); + logger.info("创建汇付支付参数:{}", JSON.toJSONString(createAdaPaymentParam)); Map response = Payment.create(BeanMap.create(createAdaPaymentParam), config.getWechatAppId()); - logger.info("创建汇付支付参数反参:{}", JSONObject.toJSONString(response)); + logger.info("创建汇付支付参数反参:{}", JSON.toJSONString(response)); if (response != null && !response.isEmpty()) { JSONObject jsonObject = JSONObject.parseObject(response.get("expend").toString()); JSONObject pay_info = jsonObject.getJSONObject("pay_info"); @@ -634,7 +634,7 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic { // 计算需要退回的金额 Map returnAmountMap = calculateReturnAmount(principalPay, null, orderAmount); logger.info("结算订单:{}, 剩余金额退回余额, 订单消费金额:{}, 本金支付金额:{}, 赠送支付金额:{}, 退回金额map:{}", - orderCode, orderAmount, principalPay, null, JSONObject.toJSONString(returnAmountMap)); + orderCode, orderAmount, principalPay, null, JSON.toJSONString(returnAmountMap)); // 需要退回本金的金额 BigDecimal returnPrincipal = returnAmountMap.get("returnPrincipal"); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java b/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java index 74bb9578d..0f163262e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java @@ -1,6 +1,6 @@ package com.jsowell.pile.util; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.JSON; import com.google.common.collect.Lists; import com.jsowell.common.constant.Constants; import com.jsowell.common.core.domain.entity.SysDept; @@ -69,7 +69,7 @@ public class UserUtils { } String deptId = String.valueOf(dept.getDeptId()); resultVO.setDeptId(deptId); - log.info("用户id:{}, 所属部门信息:{}", user.getUserId(), JSONObject.toJSONString(dept)); + log.info("用户id:{}, 所属部门信息:{}", user.getUserId(), JSON.toJSONString(dept)); // 登录用户角色 Long parentId = dept.getParentId(); resultVO.setParentId(String.valueOf(parentId)); diff --git a/jsowell-system/src/main/java/com/jsowell/system/service/impl/SysMenuServiceImpl.java b/jsowell-system/src/main/java/com/jsowell/system/service/impl/SysMenuServiceImpl.java index ba4b5a896..aac2f30dd 100644 --- a/jsowell-system/src/main/java/com/jsowell/system/service/impl/SysMenuServiceImpl.java +++ b/jsowell-system/src/main/java/com/jsowell/system/service/impl/SysMenuServiceImpl.java @@ -426,7 +426,7 @@ public class SysMenuServiceImpl implements SysMenuService { * 得到子节点列表 */ private List getChildList(List list, SysMenu t) { - // log.info("得到子节点列表 list:{}, SysMenu:{}", JSONObject.toJSONString(list), JSONObject.toJSONString(t)); + // log.info("得到子节点列表 list:{}, SysMenu:{}", JSON.toJSONString(list), JSON.toJSONString(t)); List tlist = new ArrayList(); Iterator it = list.iterator(); while (it.hasNext()) { diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/util/AMapUtils.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/util/AMapUtils.java index 003819c5e..f4cb4b8a5 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/util/AMapUtils.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/util/AMapUtils.java @@ -1,5 +1,6 @@ package com.jsowell.thirdparty.amap.util; +import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -85,7 +86,7 @@ public class AMapUtils { */ public static Map generateParamMap(JSONObject bizContent, String SPI) throws Exception { Map map = new LinkedHashMap<>(); - map.put("biz_content", JSONObject.toJSONString(bizContent)); + map.put("biz_content", JSON.toJSONString(bizContent)); map.put("app_id", APP_ID); map.put("utc_timestamp", String.valueOf(System.currentTimeMillis())); map.put("version", "1.0"); @@ -121,7 +122,7 @@ public class AMapUtils { JSONObject respObj = JSONObject.parseObject(resp.getBody()); logger.info("高德返回结果:{}", respObj); // System.out.println("高德返回结果:" + respObj); - return JSONObject.toJSONString(respObj); + return JSON.toJSONString(respObj); } return null; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java index a5ebcb9d2..2999b99bd 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java @@ -1,5 +1,6 @@ package com.jsowell.thirdparty.common; +import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.constant.Constants; @@ -23,12 +24,12 @@ import com.jsowell.pile.dto.ruanjie.UseCouponDTO; import com.jsowell.pile.service.*; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; import com.jsowell.pile.vo.web.PileStationVO; -import com.jsowell.thirdparty.platform.hainan.service.HaiNanPlatformLogic; import com.jsowell.thirdparty.huawei.HuaWeiService; import com.jsowell.thirdparty.lianlian.service.LianLianService; import com.jsowell.thirdparty.lianlian.util.HttpRequestUtil; import com.jsowell.thirdparty.lutongyunting.service.LTYTService; import com.jsowell.thirdparty.nanrui.service.NRService; +import com.jsowell.thirdparty.platform.hainan.service.HaiNanPlatformLogic; import com.jsowell.thirdparty.ruanjie.service.RJService; import com.jsowell.thirdparty.xindiantu.service.XDTService; import com.jsowell.thirdparty.yongchengboche.dto.YCBCGetTokenDTO; @@ -417,7 +418,7 @@ public class CommonService { json.put("StartChargeSeqStat", 2); // 一定要给 2-充电中 json.put("StartTime", DateUtils.getDateTime()); - String jsonString = JSONObject.toJSONString(json); + String jsonString = JSON.toJSONString(json); String token = ""; String result = ""; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java index 6e8d4a6ba..627902929 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java @@ -24,13 +24,11 @@ import com.jsowell.pile.domain.*; import com.jsowell.pile.domain.huawei.HWStationInfo; import com.jsowell.pile.domain.huawei.HWStationStatusInfo; import com.jsowell.pile.dto.GenerateOrderDTO; -import com.jsowell.pile.dto.PushStationInfoDTO; import com.jsowell.pile.dto.QueryStartChargeDTO; import com.jsowell.pile.dto.huawei.*; import com.jsowell.pile.service.*; import com.jsowell.pile.transaction.dto.OrderTransactionDTO; import com.jsowell.pile.transaction.service.TransactionService; -import com.jsowell.pile.vo.huawei.DeliverEquipBusinessPolicyVO; import com.jsowell.pile.vo.huawei.QueryChargeStatusVO; import com.jsowell.pile.vo.huawei.QueryEquipAuthVO; import com.jsowell.pile.vo.huawei.QueryStartChargeVO; @@ -38,16 +36,13 @@ import com.jsowell.pile.vo.uniapp.BillingPriceVO; import com.jsowell.pile.vo.web.PileStationVO; 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.service.LianLianService; import com.jsowell.thirdparty.lianlian.util.Cryptos; import com.jsowell.thirdparty.lianlian.util.Encodes; import com.jsowell.thirdparty.lianlian.util.GBSignUtils; -import com.jsowell.thirdparty.lianlian.util.HttpRequestUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -151,7 +146,7 @@ public class HuaweiServiceV2 { String sig = GBSignUtils.sign(request, signSecret); request.put("Sig", sig); - String tokenRequest = JSONObject.toJSONString(request); + String tokenRequest = JSON.toJSONString(request); // 向华为发送请求 String response = HttpUtil.post(requestUrl, tokenRequest); @@ -214,7 +209,7 @@ public class HuaweiServiceV2 { hwStationInfo.setEquipmentInfoNum(equipmentLogicInfos.size()); hwStationInfo.setEquipmentLogicInfos(equipmentLogicInfos); - String jsonString = JSONObject.toJSONString(hwStationInfo); + String jsonString = JSON.toJSONString(hwStationInfo); // 获取令牌 String token = getHuaWeiToken(); @@ -478,7 +473,7 @@ public class HuaweiServiceV2 { params.setSumChargePolicyInfos(pricePolicyInfos.size()); params.setChargePolicyInfos(chargePolicyInfos); - String jsonString = JSONObject.toJSONString(params); + String jsonString = JSON.toJSONString(params); // 向华为发送请求 // 获取令牌 @@ -619,7 +614,7 @@ public class HuaweiServiceV2 { } // 将源数据存储至缓存 String redisKey = "HUA_WEI_REAL_TIME_INFO_BY_ORDER_CODE:" + startChargeSeq; - String jsonMsg = JSONObject.toJSONString(dto); + String jsonMsg = JSON.toJSONString(dto); // 在同一分钟内，只保留最后一条实时数据 redisCache.hset(redisKey, DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00", new Date()), jsonMsg); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/impl/HuaWeiServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/impl/HuaWeiServiceImpl.java index 71ec9c52d..0645f912c 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/impl/HuaWeiServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/impl/HuaWeiServiceImpl.java @@ -1,14 +1,13 @@ package com.jsowell.thirdparty.huawei.impl; +import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.google.common.collect.Maps; import com.jsowell.common.constant.Constants; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.enums.ykc.StartModeEnum; import com.jsowell.common.exception.BusinessException; -import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.StringUtils; -import com.jsowell.common.util.YKCUtils; import com.jsowell.pile.domain.*; import com.jsowell.pile.domain.huawei.HWStationInfo; import com.jsowell.pile.dto.*; @@ -16,7 +15,6 @@ import com.jsowell.pile.dto.huawei.DeliverEquipBusinessDTO; import com.jsowell.pile.dto.huawei.ReceiveDeliverDTO; import com.jsowell.pile.dto.huawei.VinStartChargeDTO; import com.jsowell.pile.service.*; -import com.jsowell.pile.vo.base.ConnectorInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; import com.jsowell.pile.vo.uniapp.BillingPriceVO; import com.jsowell.pile.vo.web.PileStationVO; @@ -408,7 +406,7 @@ public class HuaWeiServiceImpl implements HuaWeiService { params.setSumChargePolicyInfos(pricePolicyInfos.size()); params.setChargePolicyInfos(chargePolicyInfos); - String jsonString = JSONObject.toJSONString(params); + String jsonString = JSON.toJSONString(params); // 获取请求参数 String operatorId = relationInfo.getOperatorId(); @@ -463,7 +461,7 @@ public class HuaWeiServiceImpl implements HuaWeiService { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(map).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(map).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -528,7 +526,7 @@ public class HuaWeiServiceImpl implements HuaWeiService { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(paramMap).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(paramMap).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -578,7 +576,7 @@ public class HuaWeiServiceImpl implements HuaWeiService { hwStationInfo.setEquipmentInfoNum(equipmentLogicInfos.size()); hwStationInfo.setEquipmentLogicInfos(equipmentLogicInfos); - String jsonString = JSONObject.toJSONString(hwStationInfo); + String jsonString = JSON.toJSONString(hwStationInfo); String url = urlAddress + "notification_operation_system_info"; // 获取令牌 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java index df1ac0f1d..b2c0f38f7 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java @@ -33,7 +33,6 @@ import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO; import com.jsowell.pile.vo.lianlian.PushStationFeeVO; import com.jsowell.pile.vo.uniapp.BillingPriceVO; import com.jsowell.pile.vo.web.PileConnectorInfoVO; -import com.jsowell.pile.vo.web.PileDetailVO; import com.jsowell.pile.vo.web.PileModelInfoVO; import com.jsowell.pile.vo.web.PileStationVO; import com.jsowell.thirdparty.common.CommonService; @@ -56,8 +55,6 @@ import org.springframework.stereotype.Service; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import java.nio.charset.StandardCharsets; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -242,11 +239,11 @@ public class LianLianServiceImpl implements LianLianService { // 调用联联平台接口 String url = urlAddress + "notification_stationInfo"; - String jsonStr = JSONObject.toJSONString(info); + String jsonStr = JSON.toJSONString(info); JSONObject data = new JSONObject(); data.put("StationInfo", jsonStr); - String jsonString = JSONObject.toJSONString(data); + String jsonString = JSON.toJSONString(data); System.out.println("jsonString : " + jsonString); // 获取令牌 @@ -365,11 +362,11 @@ public class LianLianServiceImpl implements LianLianService { // 调用联联平台接口 String url = urlAddress + "notification_stationInfo"; - String jsonStr = JSONObject.toJSONString(info); + String jsonStr = JSON.toJSONString(info); JSONObject data = new JSONObject(); data.put("StationInfo", jsonStr); - String jsonString = JSONObject.toJSONString(data); + String jsonString = JSON.toJSONString(data); System.out.println("jsonString : " + jsonString); // 获取令牌 @@ -404,7 +401,7 @@ public class LianLianServiceImpl implements LianLianService { // // Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - // byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(json).getBytes(), + // byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(json).getBytes(), // dataSecret.getBytes(), dataSecretIV.getBytes()); // String encryptData = Encodes.encodeBase64(encryptText); // @@ -497,7 +494,7 @@ public class LianLianServiceImpl implements LianLianService { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(map).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(map).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -590,7 +587,7 @@ public class LianLianServiceImpl implements LianLianService { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(map).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(map).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -689,7 +686,7 @@ public class LianLianServiceImpl implements LianLianService { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(map).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(map).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -745,7 +742,7 @@ public class LianLianServiceImpl implements LianLianService { vo.setFailReasonMsg("未查到该桩的数据"); } // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(vo).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(vo).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -819,7 +816,7 @@ public class LianLianServiceImpl implements LianLianService { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(vo).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(vo).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -906,7 +903,7 @@ public class LianLianServiceImpl implements LianLianService { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(vo).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(vo).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -962,7 +959,7 @@ public class LianLianServiceImpl implements LianLianService { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(vo).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(vo).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -1071,7 +1068,7 @@ public class LianLianServiceImpl implements LianLianService { // 调用联联平台接口 JSONObject json = new JSONObject(); json.put("ConnectorStatusInfo", info); - String jsonString = JSONObject.toJSONString(json); + String jsonString = JSON.toJSONString(json); // 获取令牌 String result = ""; String token = ""; @@ -1216,7 +1213,7 @@ public class LianLianServiceImpl implements LianLianService { // 调用联联平台接口 JSONObject json = new JSONObject(); json.put("OrderInfo", orderInfo); - String jsonString = JSONObject.toJSONString(json); + String jsonString = JSON.toJSONString(json); String result = HttpRequestUtil.sendPost(token, jsonString, url, dataSecret, dataSecretIv, operatorId, signSecret); @@ -1274,7 +1271,7 @@ public class LianLianServiceImpl implements LianLianService { json.put("StartChargeSeqStat", 2); // 一定要给 2-充电中 json.put("StartTime", DateUtils.getDateTime()); - String jsonString = JSONObject.toJSONString(json); + String jsonString = JSON.toJSONString(json); String token = ""; String result = ""; @@ -1343,7 +1340,7 @@ public class LianLianServiceImpl implements LianLianService { String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_EQUIP_CHARGE_STATUS.getValue(); // 调用联联平台接口 - String jsonString = JSONObject.toJSONString(vo); + String jsonString = JSON.toJSONString(vo); // 获取令牌 String token = ""; @@ -1419,7 +1416,7 @@ public class LianLianServiceImpl implements LianLianService { json.put("SuccStat", 0); json.put("FailReason", 0); - String jsonString = JSONObject.toJSONString(json); + String jsonString = JSON.toJSONString(json); // 获取token String token = ""; @@ -1491,7 +1488,7 @@ public class LianLianServiceImpl implements LianLianService { json.put("TotalMoney", orderDetail.getTotalOrderAmount().setScale(2, BigDecimal.ROUND_HALF_UP)); json.put("StopReason", 2); // 2：BMS 停止充电 - String jsonString = JSONObject.toJSONString(json); + String jsonString = JSON.toJSONString(json); // 获取令牌 String token = ""; @@ -1552,7 +1549,7 @@ public class LianLianServiceImpl implements LianLianService { Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(map).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(map).getBytes(), platformConfig.getDataSecret().getBytes(), platformConfig.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -1575,7 +1572,7 @@ public class LianLianServiceImpl implements LianLianService { JSONObject json = new JSONObject(); json.put("StartChargeSeq", orderCode); - String jsonString = JSONObject.toJSONString(json); + String jsonString = JSON.toJSONString(json); OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); @@ -1662,7 +1659,7 @@ public class LianLianServiceImpl implements LianLianService { if (StringUtils.isBlank(token)) { return null; } - String jsonString = JSONObject.toJSONString(json); + String jsonString = JSON.toJSONString(json); // 发送请求 String result = HttpRequestUtil.sendPost(token, jsonString, url, dataSecret, dataSecretIv, operatorId, signSecret); @@ -1725,7 +1722,7 @@ public class LianLianServiceImpl implements LianLianService { JSONObject json = new JSONObject(); json.put("ConnectorChargeStatusInfo", info); - String jsonString = JSONObject.toJSONString(json); + String jsonString = JSON.toJSONString(json); // 发送请求 String result = HttpRequestUtil.sendPost(token, jsonString, url, dataSecret, dataSecretIv, operatorId, signSecret); @@ -1792,7 +1789,7 @@ public class LianLianServiceImpl implements LianLianService { } JSONObject json = new JSONObject(); json.put("StationFee", vo); - String jsonString = JSONObject.toJSONString(json); + String jsonString = JSON.toJSONString(json); // 发送请求 String result = HttpRequestUtil.sendPost(token, jsonString, url, dataSecret, dataSecretIv, operatorId, signSecret); @@ -1854,7 +1851,7 @@ public class LianLianServiceImpl implements LianLianService { Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(vo).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(vo).getBytes(), dataSecret.getBytes(), dataSecretIv.getBytes()); String encryptData = Encodes.encodeBase64(encryptText); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java index 5f15c2cbb..cb21b7109 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java @@ -1,5 +1,6 @@ package com.jsowell.thirdparty.nanrui.service.impl; +import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; @@ -431,7 +432,7 @@ public class NRServiceImpl implements NRService { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(map).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(map).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -492,7 +493,7 @@ public class NRServiceImpl implements NRService { JSONObject data = new JSONObject(); data.put("AlarmInfos", nrAlarmInfos); - String jsonString = JSONObject.toJSONString(data); + String jsonString = JSON.toJSONString(data); System.out.println("jsonString : " + jsonString); // 获取令牌 @@ -566,7 +567,7 @@ public class NRServiceImpl implements NRService { // 发送请求 JSONObject json = new JSONObject(); json.put("ConnectorStatusInfo", nrConnectorStatusInfo); - String jsonString = JSONObject.toJSONString(json); + String jsonString = JSON.toJSONString(json); String result = HttpRequestUtil.nrSendPost(token, jsonString, url, dataSecret, dataSecretIv, operatorId, signSecret); return result; @@ -648,7 +649,7 @@ public class NRServiceImpl implements NRService { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(map).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(map).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -698,7 +699,7 @@ public class NRServiceImpl implements NRService { JSONObject jsonObject = new JSONObject(); jsonObject.put("OrderInfo", nrOrderInfo); - String jsonString = JSONObject.toJSONString(jsonObject); + String jsonString = JSON.toJSONString(jsonObject); String result = HttpRequestUtil.nrSendPost(token, jsonString, url, dataSecret, dataSecretIv, operatorId, signSecret); return result; @@ -728,7 +729,7 @@ public class NRServiceImpl implements NRService { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(resultList).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(resultList).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ningxiajiaotou/service/impl/NXJTServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ningxiajiaotou/service/impl/NXJTServiceImpl.java index 3cbbd9934..734dfddae 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ningxiajiaotou/service/impl/NXJTServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ningxiajiaotou/service/impl/NXJTServiceImpl.java @@ -1,6 +1,6 @@ package com.jsowell.thirdparty.ningxiajiaotou.service.impl; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.JSON; import com.github.pagehelper.PageInfo; import com.google.common.collect.Maps; import com.jsowell.common.util.DateUtils; @@ -108,7 +108,7 @@ public class NXJTServiceImpl implements NXJTService { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(map).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(map).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -155,7 +155,7 @@ public class NXJTServiceImpl implements NXJTService { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(map).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(map).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -214,7 +214,7 @@ public class NXJTServiceImpl implements NXJTService { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(map).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(map).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/AbsInterfaceWithPlatformLogic.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/AbsInterfaceWithPlatformLogic.java index 1b9a68c5a..79ebf6a51 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/AbsInterfaceWithPlatformLogic.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/AbsInterfaceWithPlatformLogic.java @@ -268,7 +268,7 @@ public abstract class AbsInterfaceWithPlatformLogic implements InitializingBean Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(vo).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(vo).getBytes(), dataSecret.getBytes(), dataSecretIv.getBytes()); String encryptData = Encodes.encodeBase64(encryptText); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/hainan/service/HaiNanPlatformLogic.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/hainan/service/HaiNanPlatformLogic.java index 2358dac1a..115cdc789 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/hainan/service/HaiNanPlatformLogic.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/hainan/service/HaiNanPlatformLogic.java @@ -164,7 +164,7 @@ public class HaiNanPlatformLogic extends AbsInterfaceWithPlatformLogic { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(map).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(map).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -259,7 +259,7 @@ public class HaiNanPlatformLogic extends AbsInterfaceWithPlatformLogic { // 调用联联平台接口 JSONObject json = new JSONObject(); json.put("ConnectorStatusInfo", info); - String jsonString = JSONObject.toJSONString(json); + String jsonString = JSON.toJSONString(json); // 获取令牌 String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret); String result = HttpRequestUtil.sendPost(token, jsonString, url, dataSecret, dataSecretIv, operatorId, signSecret); @@ -306,7 +306,7 @@ public class HaiNanPlatformLogic extends AbsInterfaceWithPlatformLogic { json.put("TotalMoney", orderDetail.getTotalOrderAmount().setScale(2, RoundingMode.HALF_UP)); json.put("StopReason", 2); // 2：BMS 停止充电 - String jsonString = JSONObject.toJSONString(json); + String jsonString = JSON.toJSONString(json); // 获取令牌 String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret); @@ -393,7 +393,7 @@ public class HaiNanPlatformLogic extends AbsInterfaceWithPlatformLogic { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(map).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(map).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -493,7 +493,7 @@ public class HaiNanPlatformLogic extends AbsInterfaceWithPlatformLogic { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(map).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(map).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -547,7 +547,7 @@ public class HaiNanPlatformLogic extends AbsInterfaceWithPlatformLogic { vo.setFailReasonMsg("未查到该桩的数据"); } // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(vo).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(vo).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -610,7 +610,7 @@ public class HaiNanPlatformLogic extends AbsInterfaceWithPlatformLogic { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(vo).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(vo).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -672,7 +672,7 @@ public class HaiNanPlatformLogic extends AbsInterfaceWithPlatformLogic { json.put("StartChargeSeqStat", 2); // 一定要给 2-充电中 json.put("StartTime", DateUtils.getDateTime()); - String jsonString = JSONObject.toJSONString(json); + String jsonString = JSON.toJSONString(json); String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret); String result = HttpRequestUtil.sendPost(token, jsonString, url, dataSecret, dataSecretIv, operatorId, signSecret); @@ -733,7 +733,7 @@ public class HaiNanPlatformLogic extends AbsInterfaceWithPlatformLogic { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(vo).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(vo).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -816,7 +816,7 @@ public class HaiNanPlatformLogic extends AbsInterfaceWithPlatformLogic { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(vo).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(vo).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -873,7 +873,7 @@ public class HaiNanPlatformLogic extends AbsInterfaceWithPlatformLogic { String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_EQUIP_CHARGE_STATUS.getValue(); // 调用联联平台接口 - String jsonString = JSONObject.toJSONString(vo); + String jsonString = JSON.toJSONString(vo); // 获取令牌 String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret); @@ -922,7 +922,7 @@ public class HaiNanPlatformLogic extends AbsInterfaceWithPlatformLogic { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(vo).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(vo).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -971,7 +971,7 @@ public class HaiNanPlatformLogic extends AbsInterfaceWithPlatformLogic { json.put("SuccStat", 0); json.put("FailReason", 0); - String jsonString = JSONObject.toJSONString(json); + String jsonString = JSON.toJSONString(json); // 获取token String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret); @@ -1018,7 +1018,7 @@ public class HaiNanPlatformLogic extends AbsInterfaceWithPlatformLogic { json.put("TotalMoney", orderDetail.getTotalOrderAmount().setScale(2, BigDecimal.ROUND_HALF_UP)); json.put("StopReason", 2); // 2：BMS 停止充电 - String jsonString = JSONObject.toJSONString(json); + String jsonString = JSON.toJSONString(json); // 获取令牌 String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java index cdb25f4b7..c537387e4 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java @@ -1,5 +1,6 @@ package com.jsowell.thirdparty.zhongdianlian.service.impl; +import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; @@ -165,7 +166,7 @@ public class ZDLServiceImpl implements ZDLService { JSONObject data = new JSONObject(); data.put("StationInfo", info); - String jsonString = JSONObject.toJSONString(data); + String jsonString = JSON.toJSONString(data); System.out.println("jsonString : " + jsonString); // 获取令牌 @@ -254,7 +255,7 @@ public class ZDLServiceImpl implements ZDLService { JSONObject data = new JSONObject(); data.put("StationInfo", info); - String jsonString = JSONObject.toJSONString(data); + String jsonString = JSON.toJSONString(data); System.out.println("jsonString : " + jsonString); // 获取令牌 @@ -383,7 +384,7 @@ public class ZDLServiceImpl implements ZDLService { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(map).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(map).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText); @@ -520,7 +521,7 @@ public class ZDLServiceImpl implements ZDLService { // 加密 Map resultMap = Maps.newLinkedHashMap(); // 加密数据 - byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(vo).getBytes(), + byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(vo).getBytes(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); String encryptData = Encodes.encodeBase64(encryptText);