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

todo: 优化第三方

Browse Source
This commit is contained in:
zz 2021-11-19 16:31:11 +08:00
parent c923d06869
commit e26004fd17
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryTokenController.java
View File

@ -52,7 +52,7 @@ public class QueryTokenController {
tokenResponse.setOperatorId("MA6DFCTD5"); tokenResponse.setOperatorId("MA6DFCTD5");
tokenResponse.setSuccStat(0); tokenResponse.setSuccStat(0);
tokenResponse.setFailReason(0); tokenResponse.setFailReason(0);
String data = null; String data = null; //todo 优化OperatorIdEvcs like
XhpcInternetUser xhpcInternetUser = XhpcInternetUser xhpcInternetUser =
xhpcInternetUserRepository.findByOperatorIdEvcsAndCooperationStartTimeBeforeAndCooperationEndTimeAfter(tokenRequest.getOperatorId(), Instant.now(), Instant.now()); xhpcInternetUserRepository.findByOperatorIdEvcsAndCooperationStartTimeBeforeAndCooperationEndTimeAfter(tokenRequest.getOperatorId(), Instant.now(), Instant.now());
if (xhpcInternetUser != null) { if (xhpcInternetUser != null) {

2
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java
View File

@ -68,7 +68,7 @@ public class OrderDataLogic implements ServiceLogic {
String resultStr = String resultStr =
"6815".concat(req.get("seqhex").toString()).concat("0040").concat(orderNo).concat(ServiceResult.HEX_00); "6815".concat(req.get("seqhex").toString()).concat("0040").concat(orderNo).concat(ServiceResult.HEX_00);
resultStr = resultStr.concat(CRCCalculator.calcCrc(resultStr)); resultStr = resultStr.concat(CRCCalculator.calcCrc(resultStr));
final R r = pileOrderService.pileEndOrder(orderNo); final R r = pileOrderService.pileEndOrder(orderNo); //todo 优化 通知第三方
if (r.getCode() == 200) if (r.getCode() == 200)
return new ServiceResult(HexUtils.toBytes(resultStr), ServiceResult.OK); return new ServiceResult(HexUtils.toBytes(resultStr), ServiceResult.OK);
else else

21
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java
View File

@ -23,7 +23,10 @@ import org.springframework.stereotype.Component;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.*; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static cn.hutool.core.util.NumberUtil.isInteger; import static cn.hutool.core.util.NumberUtil.isInteger;
import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
@ -187,12 +190,12 @@ public class RealtimeDataLogic implements ServiceLogic {
R r = null; R r = null;
final String stopResult = (String) cacheOrder.get("stopResult"); final String stopResult = (String) cacheOrder.get("stopResult");
if (cacheRData == null) { if (cacheRData == null) {
r = pileOrderService.abnormalOrder(orderNo); r = pileOrderService.abnormalOrder(orderNo); //todo 优化 通知第三方
} else if ("01".equals(stopResult)) { } else if ("01".equals(stopResult)) {
CacheOrderData lordAsOd = new CacheOrderData(cacheRData, (String) cacheOrder.get("orderstarttime"), CacheOrderData lordAsOd = new CacheOrderData(cacheRData, (String) cacheOrder.get("orderstarttime"),
(Integer) cacheOrder.get("startSoc"), (Integer) cacheOrder.get("stopSoc")); (Integer) cacheOrder.get("startSoc"), (Integer) cacheOrder.get("stopSoc"));
cacheOrder.put("orderData", lordAsOd); cacheOrder.put("orderData", lordAsOd);
r = pileOrderService.pileEndOrder(orderNo); r = pileOrderService.pileEndOrder(orderNo); //todo 优化 通知第三方
REDIS.setCacheMap(orderkey, cacheOrder); REDIS.setCacheMap(orderkey, cacheOrder);
} }
if (r == null || r.getCode() != 200) { if (r == null || r.getCode() != 200) {
@ -217,16 +220,16 @@ public class RealtimeDataLogic implements ServiceLogic {
Object orderData = problematicOrder.get("orderData"); Object orderData = problematicOrder.get("orderData");
String status = (String) problematicOrder.get("status"); String status = (String) problematicOrder.get("status");
if (!isInteger(status) && !status.equals("充电中") && orderData == null) { if (!isInteger(status) && !status.equals("充电中") && orderData == null) {
pileOrderService.abnormalOrder(orderNo); pileOrderService.abnormalOrder(orderNo); //todo 优化 通知第三方
log.error("abnormal.2 order[{}]", orderNo); log.error("abnormal.2 order[{}]", orderNo);
cacheGun.put("orderkey", null); cacheGun.put("orderkey", null);
idleCnt = 0; idleCnt = 0;
} }
} else { // } else {
Collection<String> cacheOrderKyes = REDIS.keys("order:".concat(terminalId).concat("*")); // Collection<String> cacheOrderKyes = REDIS.keys("order:".concat(terminalId).concat("*"));
for (String cacheOrderKye : cacheOrderKyes) { // for (String cacheOrderKye : cacheOrderKyes) { //todo ???
//
} // }
} }
} }
cacheGun.put("idleCnt", idleCnt); cacheGun.put("idleCnt", idleCnt);