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..139456a0e 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 @@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -240,16 +241,16 @@ public class HuaWeiControllerV2 extends BaseController { * @return */ @PostMapping("/v2/query_station_status") - public String queryStationStatus(@RequestBody List stationIds) { + public Map queryStationStatus(@RequestBody List stationIds) { logger.info("查询华为设备接口状态 stationIds:{}", stationIds); - String result = null; + Map map = new LinkedHashMap<>(); try { - result = huaweiServiceV2.queryStationStatus(stationIds); + map = huaweiServiceV2.queryStationStatus(stationIds); } catch (Exception e) { logger.error("查询华为设备接口状态 error", e); } - logger.info("查询华为设备接口状态 result:{}", result); - return result; + logger.info("查询华为设备接口状态 result:{}", map); + return map; } /** 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..1cd2dcee7 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 @@ -179,6 +179,9 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { @Autowired private ClearingBillDetailService clearingBillDetailService; + @Autowired + private ThirdPartyStationRelationService thirdPartyStationRelationService; + @Override public int deleteByPrimaryKey(Integer id) { return orderBasicInfoMapper.deleteByPrimaryKey(id); @@ -3062,6 +3065,19 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { sendStartCharging = false; } + // 判断该桩所在的站点是否推送了第三方站点(需要我方平台发送启动指令的,如:华为平台) + // List relationInfoList = thirdPartyStationRelationService.getRelationInfoList(orderInfo.getStationId()); + // if (CollectionUtils.isNotEmpty(relationInfoList)) { + // for (ThirdPartyStationRelationVO vo : relationInfoList) { + // String startMode = vo.getStartMode(); + // if (StringUtils.equals(Constants.ONE, startMode)) { + // // todo 调用通用推送启动充电接口 + // String thirdPartyType = vo.getThirdPartyType(); + // + // sendStartCharging = false; + // } + // } + // } // 修改订单 orderInfo.setPayMode(dto.getPayMode()); orderInfo.setPayStatus(OrderPayStatusEnum.paid.getValue()); 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..3fc018faa 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 @@ -119,7 +119,7 @@ public class AMapUtils { ResponseEntity resp = restTemplate.postForEntity(API_URL, entity, String.class); if (resp.getBody() != null && !"".equals(resp.getBody())) { JSONObject respObj = JSONObject.parseObject(resp.getBody()); - logger.info("高德返回结果:{}", respObj); + // logger.info("高德返回结果:{}", respObj); // System.out.println("高德返回结果:" + respObj); return JSONObject.toJSONString(respObj); }