autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-10 10:19:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 新电途

Browse Source
This commit is contained in:
Lemon
2024-01-05 14:17:45 +08:00
parent e87487aa68
commit 65332f1ed4
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,11 +12,9 @@ import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.dto.*; import com.jsowell.pile.dto.*;
import com.jsowell.thirdparty.lianlian.common.CommonResult; import com.jsowell.thirdparty.lianlian.common.CommonResult;
import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO; 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.Cryptos;
import com.jsowell.thirdparty.lianlian.util.Encodes; import com.jsowell.thirdparty.lianlian.util.Encodes;
import com.jsowell.thirdparty.xindiantu.service.XDTService; import com.jsowell.thirdparty.xindiantu.service.XDTService;
import com.jsowell.thirdparty.zhongdianlian.service.ZDLService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -99,8 +97,8 @@ public class XDTController extends BaseController {
* @param dto * @param dto
* @return * @return
*/ */
@PostMapping("/v1/query_station_stats") @PostMapping("/v1/query_station_status")
public CommonResult<?> queryStationStats(HttpServletRequest request, @RequestBody CommonParamsDTO dto) { public CommonResult<?> queryStationStatus(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
logger.info("新电途平台查询统计信息 params:{}", JSONObject.toJSONString(dto)); logger.info("新电途平台查询统计信息 params:{}", JSONObject.toJSONString(dto));
try { try {
// 校验令牌 // 校验令牌
@@ -126,7 +124,7 @@ public class XDTController extends BaseController {
// 转换成相应对象 // 转换成相应对象
QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class); QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class);
queryStationInfoDTO.setOperatorId(dto.getOperatorID()); queryStationInfoDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = xdtService.queryStationStats(queryStationInfoDTO); Map<String, String> map = xdtService.queryStationStatus(queryStationInfoDTO);
logger.info("新电途平台查询统计信息 result:{}", JSONObject.toJSONString(map)); logger.info("新电途平台查询统计信息 result:{}", JSONObject.toJSONString(map));
return CommonResult.success(0, "查询统计信息成功！", map.get("Data"), map.get("Sig")); return CommonResult.success(0, "查询统计信息成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) { } catch (Exception e) {

11
jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java
View File

@@ -395,8 +395,15 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler {
if (StringUtils.equals(ThirdPlatformTypeEnum.XIN_DIAN_TU.getCode(), relationInfo.getThirdPartyType())) { if (StringUtils.equals(ThirdPlatformTypeEnum.XIN_DIAN_TU.getCode(), relationInfo.getThirdPartyType())) {
// 新电途平台 // 新电途平台
log.info("推送新电途平台设备状态变化推送 pileConnectorCode:{}, connectorStatus:{}", pileConnectorCode, connectorStatus); log.info("推送新电途平台设备状态变化推送 pileConnectorCode:{}, connectorStatus:{}", pileConnectorCode, connectorStatus);
String result = xdtService.notificationStationStatus(pileConnectorCode, connectorStatus); String result1 = xdtService.notificationStationStatus(pileConnectorCode, connectorStatus);
log.info("推送新电途平台设备状态变化推送 result:{}", result); 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())) { if (StringUtils.equals(ThirdPlatformTypeEnum.YONG_CHENG_BO_CHE.getCode(), relationInfo.getThirdPartyType())) {

2
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java vendored
View File

@@ -670,7 +670,7 @@ public class NRServiceImpl implements NRService {
} }
public static void main(String[] args) { public static void main(String[] args) {
String s = RandomStringUtils.randomAlphanumeric(9).toUpperCase(Locale.ROOT); String s = RandomStringUtils.randomAlphanumeric(16);
System.out.println(s); System.out.println(s);
// String chargingTime = "30"; // String chargingTime = "30";

2
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/XDTService.java vendored
View File

@@ -49,7 +49,7 @@ public interface XDTService {
* @param dto * @param dto
* @return * @return
*/ */
Map<String, String> queryStationStats(QueryStationInfoDTO dto); Map<String, String> queryStationStatus(QueryStationInfoDTO dto);
/** /**
* 请求设备认证 * 请求设备认证

4
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java vendored
View File

@@ -66,8 +66,8 @@ public class XDTServiceImpl implements XDTService {
* @return * @return
*/ */
@Override @Override
public Map<String, String> queryStationStats(QueryStationInfoDTO dto) { public Map<String, String> queryStationStatus(QueryStationInfoDTO dto) {
return zdlService.queryStationStats(dto); return zdlService.queryStationStatus(dto);
} }
/** /**