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 04598aede..9f75cf056 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 @@ -12,11 +12,9 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.pile.dto.*; import com.jsowell.thirdparty.lianlian.common.CommonResult; 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.xindiantu.service.XDTService; -import com.jsowell.thirdparty.zhongdianlian.service.ZDLService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -99,8 +97,8 @@ public class XDTController extends BaseController { * @param dto * @return */ - @PostMapping("/v1/query_station_stats") - public CommonResult queryStationStats(HttpServletRequest request, @RequestBody CommonParamsDTO dto) { + @PostMapping("/v1/query_station_status") + public CommonResult queryStationStatus(HttpServletRequest request, @RequestBody CommonParamsDTO dto) { logger.info("新电途平台查询统计信息 params:{}", JSONObject.toJSONString(dto)); try { // 校验令牌 @@ -126,7 +124,7 @@ public class XDTController extends BaseController { // 转换成相应对象 QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class); queryStationInfoDTO.setOperatorId(dto.getOperatorID()); - Map map = xdtService.queryStationStats(queryStationInfoDTO); + Map map = xdtService.queryStationStatus(queryStationInfoDTO); logger.info("新电途平台查询统计信息 result:{}", JSONObject.toJSONString(map)); return CommonResult.success(0, "查询统计信息成功!", map.get("Data"), map.get("Sig")); } catch (Exception e) { 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 3740556fc..6a8fb1fdd 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 @@ -395,8 +395,15 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { if (StringUtils.equals(ThirdPlatformTypeEnum.XIN_DIAN_TU.getCode(), relationInfo.getThirdPartyType())) { // 新电途平台 log.info("推送新电途平台设备状态变化推送 pileConnectorCode:{}, connectorStatus:{}", pileConnectorCode, connectorStatus); - String result = xdtService.notificationStationStatus(pileConnectorCode, connectorStatus); - log.info("推送新电途平台设备状态变化推送 result:{}", result); + String result1 = xdtService.notificationStationStatus(pileConnectorCode, connectorStatus); + log.info("推送新电途平台设备状态变化推送 result:{}", result1); + OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode); + if (orderInfo == null) { + return; + } + log.info("推送新电途平台 充电状态 params:{}", orderInfo.getOrderCode()); + String result = xdtService.notificationEquipChargeStatus(orderInfo.getOrderCode()); + log.info("推送新电途平台 充电状态 result:{}", result); } if (StringUtils.equals(ThirdPlatformTypeEnum.YONG_CHENG_BO_CHE.getCode(), relationInfo.getThirdPartyType())) { 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 243d6153e..25d73b9b7 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 @@ -670,7 +670,7 @@ public class NRServiceImpl implements NRService { } public static void main(String[] args) { - String s = RandomStringUtils.randomAlphanumeric(9).toUpperCase(Locale.ROOT); + String s = RandomStringUtils.randomAlphanumeric(16); System.out.println(s); // String chargingTime = "30"; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/XDTService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/XDTService.java index 2114dd1c2..b8d09deb1 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/XDTService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/XDTService.java @@ -49,7 +49,7 @@ public interface XDTService { * @param dto * @return */ - Map queryStationStats(QueryStationInfoDTO dto); + Map queryStationStatus(QueryStationInfoDTO dto); /** * 请求设备认证 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java index 435beedea..2fd6d0dbc 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java @@ -66,8 +66,8 @@ public class XDTServiceImpl implements XDTService { * @return */ @Override - public Map queryStationStats(QueryStationInfoDTO dto) { - return zdlService.queryStationStats(dto); + public Map queryStationStatus(QueryStationInfoDTO dto) { + return zdlService.queryStationStatus(dto); } /**