autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-16 15:58:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

udpate 打印日志

Browse Source
This commit is contained in:
Lemon
2024-03-20 08:18:00 +08:00
parent 065311cfa2
commit 3106fd7992
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -240,16 +241,16 @@ public class HuaWeiControllerV2 extends BaseController {
* @return * @return
*/ */
@PostMapping("/v2/query_station_status") @PostMapping("/v2/query_station_status")
public String queryStationStatus(@RequestBody List<String> stationIds) { public Map<String, String> queryStationStatus(@RequestBody List<String> stationIds) {
logger.info("查询华为设备接口状态 stationIds:{}", stationIds); logger.info("查询华为设备接口状态 stationIds:{}", stationIds);
String result = null; Map<String, String> map = new LinkedHashMap<>();
try { try {
result = huaweiServiceV2.queryStationStatus(stationIds); map = huaweiServiceV2.queryStationStatus(stationIds);
} catch (Exception e) { } catch (Exception e) {
logger.error("查询华为设备接口状态 error", e); logger.error("查询华为设备接口状态 error", e);
} }
logger.info("查询华为设备接口状态 result:{}", result); logger.info("查询华为设备接口状态 result:{}", map);
return result; return map;
} }
/** /**

16
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -179,6 +179,9 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
@Autowired @Autowired
private ClearingBillDetailService clearingBillDetailService; private ClearingBillDetailService clearingBillDetailService;
@Autowired
private ThirdPartyStationRelationService thirdPartyStationRelationService;
@Override @Override
public int deleteByPrimaryKey(Integer id) { public int deleteByPrimaryKey(Integer id) {
return orderBasicInfoMapper.deleteByPrimaryKey(id); return orderBasicInfoMapper.deleteByPrimaryKey(id);
@@ -3062,6 +3065,19 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
sendStartCharging = false; sendStartCharging = false;
} }
// 判断该桩所在的站点是否推送了第三方站点（需要我方平台发送启动指令的，如：华为平台）
// List<ThirdPartyStationRelationVO> 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.setPayMode(dto.getPayMode());
orderInfo.setPayStatus(OrderPayStatusEnum.paid.getValue()); orderInfo.setPayStatus(OrderPayStatusEnum.paid.getValue());

2
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/util/AMapUtils.java vendored
View File

@@ -119,7 +119,7 @@ public class AMapUtils {
ResponseEntity<String> resp = restTemplate.postForEntity(API_URL, entity, String.class); ResponseEntity<String> resp = restTemplate.postForEntity(API_URL, entity, String.class);
if (resp.getBody() != null && !"".equals(resp.getBody())) { if (resp.getBody() != null && !"".equals(resp.getBody())) {
JSONObject respObj = JSONObject.parseObject(resp.getBody()); JSONObject respObj = JSONObject.parseObject(resp.getBody());
logger.info("高德返回结果:{}", respObj); // logger.info("高德返回结果:{}", respObj);
// System.out.println("高德返回结果:" + respObj); // System.out.println("高德返回结果:" + respObj);
return JSONObject.toJSONString(respObj); return JSONObject.toJSONString(respObj);
} }