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

pc-start ipgr; hide msg sql log

Browse Source
This commit is contained in:
ZZ 2022-02-22 11:27:10 +08:00
parent 3e663da6f8
commit 263721ee33
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java
View File

@ -14,6 +14,7 @@ import com.xhpc.pp.tx.ServiceParameter;
import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.ServiceResult;
import com.xhpc.pp.tx.logic.ServiceLogic; import com.xhpc.pp.tx.logic.ServiceLogic;
import com.xhpc.pp.utils.HexUtils; import com.xhpc.pp.utils.HexUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
@ -51,12 +52,12 @@ public class PileStartChargingDataLogic implements ServiceLogic {
String accountOrCardNo = pileStartChargingData.getAccountOrCardNo(); String accountOrCardNo = pileStartChargingData.getAccountOrCardNo();
String corpNo = connectorId.substring(0, 6); String corpNo = connectorId.substring(0, 6);
String balance = "0000"; String balance = "0000";
String cardNo = "00000000"; String cardNo = "0000000000000000";
String orderNo = "00000000000000000000000000000000"; String orderNo = "00000000000000000000000000000000";
if (pileStartChargingData.getStartType().equals("01")) { //刷卡启动 if (pileStartChargingData.getStartType().equals("01")) { //刷卡启动
IccardInfoExample example = new IccardInfoExample(); IccardInfoExample example = new IccardInfoExample();
IccardInfoExample.Criteria criteria = example.createCriteria(); IccardInfoExample.Criteria criteria = example.createCriteria();
criteria.andCardidEqualTo(accountOrCardNo).andCorpnoEqualTo(corpNo); criteria.andCardidEqualTo(accountOrCardNo.startsWith("00000000") ? accountOrCardNo.substring(8) : accountOrCardNo).andCorpnoEqualTo(corpNo);
List<IccardInfo> iccardInfos = iccardInfoMapper.selectByExample(example); List<IccardInfo> iccardInfos = iccardInfoMapper.selectByExample(example);
if (iccardInfos.size() == 1) { if (iccardInfos.size() == 1) {
IccardInfo iccardInfo = iccardInfos.get(0); IccardInfo iccardInfo = iccardInfos.get(0);
@ -65,10 +66,12 @@ public class PileStartChargingDataLogic implements ServiceLogic {
} else { } else {
// 调用订单接口 todo // 调用订单接口 todo
orderNo = genOrder(connectorId); orderNo = genOrder(connectorId);
cardNo = iccardInfo.getCardno();
R r = cardService.cardStartup(cardNo, orderNo, pileStartChargingData.getRateModelId().toString()); R r = cardService.cardStartup(cardNo, orderNo, pileStartChargingData.getRateModelId().toString());
if (r.getCode() == 200) { if (r.getCode() == 200) {
result = ServiceResult.HEX_01; result = ServiceResult.HEX_01;
} }
cardNo = StringUtils.leftPad(iccardInfo.getCardno(), 16, "0");
resultStr = r.getMsg(); resultStr = r.getMsg();
} }
} else { } else {

3
xhpc-modules/xhpc-power-pile/src/main/resources/logback.xml
View File

@ -59,7 +59,8 @@
</appender> </appender>
<!-- 系统模块日志级别控制 --> <!-- 系统模块日志级别控制 -->
<logger name="com.xhpc.pp" level="debug"/> <logger name="com.xhpc.pp.logic" level="debug"/>
<logger name="com.xhpc.pp.server" level="debug"/>
<!-- Spring日志级别控制 --> <!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn"/> <logger name="org.springframework" level="warn"/>
<!-- nacos --> <!-- nacos -->