yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Perfecting data, which will be used by evcs in redis.

Browse Source
This commit is contained in:
little-cat-sweet 2021-10-29 17:38:43 +08:00
parent ec01db172d
commit ac744d40c6
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java
View File

@ -59,19 +59,22 @@ public class QueryStartChargeController {
startChargeResponse.setFailReason(0); startChargeResponse.setFailReason(0);
startChargeResponse.setStartChargeSeqStat(5); startChargeResponse.setStartChargeSeqStat(5);
} else { } else {
Map<String, Object> etOrderData = (Map<String, Object>) res.getData();
EtOrderMapping etOrderMapping = new EtOrderMapping(); EtOrderMapping etOrderMapping = new EtOrderMapping();
etOrderMapping.setEvcsOrderNo(startChargeSeq); etOrderMapping.setEvcsOrderNo(startChargeSeq);
// etOrderMapping.setXhOrderNo(xhOrderNo);//todo 鸿运 etOrderMapping.setXhOrderNo(String.valueOf(etOrderData.get("orderNo")));
etOrderMappingRepo.save(etOrderMapping); etOrderMappingRepo.save(etOrderMapping);
startChargeResponse.setStartChargeSeqStat(2); startChargeResponse.setStartChargeSeqStat(2);
startChargeResponse.setSuccStat(0); startChargeResponse.setSuccStat(0);
startChargeResponse.setFailReason(0); startChargeResponse.setFailReason(0);
//insert a gunStatusData to redis //insert a gunStatusData to redis
Map<String, Object> pushOrder = new HashMap<>(); Map<String, Object> pushOrder = new HashMap<>();
//0 means charging. //1 means charging.
pushOrder.put("status", 0); pushOrder.put("startChargeSeqStat", 1);
String orderNo = (String) res.getData(); String orderNo = (String) res.getData();
pushOrder.put("internetSerialNumber", startChargeRequest.getStartChargeSeq()); pushOrder.put("internetSerialNumber", startChargeRequest.getStartChargeSeq());
pushOrder.put("connectorID", connectorID);
pushOrder.put("startTime", etOrderData.get("startTime"));
REDIS.setCacheMap("pushOrder:".concat(orderNo), pushOrder); REDIS.setCacheMap("pushOrder:".concat(orderNo), pushOrder);
} }
resp.setRet(String.valueOf(res.getCode())); resp.setRet(String.valueOf(res.getCode()));

11
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java
View File

@ -21,10 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Calendar; import java.util.*;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -454,11 +451,15 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService {
r.setCode(500); r.setCode(500);
return r; return r;
} }
String startTime = DateUtil.format(date, "yyyy-MM-dd HH: mm: ss");
int res = xhpcChargeOrderMapper.addBy3rd(internetSerialNumber, orderNo, driverId, chargingAmt, plateNum, status); int res = xhpcChargeOrderMapper.addBy3rd(internetSerialNumber, orderNo, driverId, chargingAmt, plateNum, status);
Map<String, Object> data = new HashMap<>();
System.out.println(res); System.out.println(res);
if (res != 0) { if (res != 0) {
r.setCode(200); r.setCode(200);
r.setData(orderNo); data.put("orderNo", orderNo);
data.put("startTime", startTime);
r.setData(data);
} else { } else {
r.setCode(500); r.setCode(500);
} }