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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
yuyang 2022-01-13 14:25:22 +08:00
commit ead74e7822
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java
View File

@ -4,11 +4,11 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.nacos.api.exception.NacosException; import com.alibaba.nacos.api.exception.NacosException;
import com.xhpc.common.api.dto.ChargingStationDto; import com.xhpc.common.api.dto.ChargingStationDto;
import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.common.enums.StationDeviceEnum;
import com.xhpc.mapper.XhpcDeviceMessageMapper;
import com.xhpc.pp.domain.ServiceField; import com.xhpc.pp.domain.ServiceField;
import com.xhpc.pp.domain.XhpcDeviceMessage; import com.xhpc.pp.domain.XhpcDeviceMessage;
import com.xhpc.pp.logic.FieldLogic; import com.xhpc.pp.logic.FieldLogic;
import com.xhpc.pp.logic.ServiceMainLogic; import com.xhpc.pp.logic.ServiceMainLogic;
import com.xhpc.mapper.XhpcDeviceMessageMapper;
import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceParameter;
import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.ServiceResult;
import com.xhpc.pp.tx.TxException; import com.xhpc.pp.tx.TxException;
@ -21,7 +21,6 @@ import org.quickserver.net.server.ClientHandler;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import javax.annotation.Resource;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
@ -51,15 +50,13 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler {
// private static final String DATA_TYPE_HEX = "hex"; // private static final String DATA_TYPE_HEX = "hex";
private final ServiceMainLogic servicemainLogic; private final ServiceMainLogic servicemainLogic;
private final XhpcDeviceMessageMapper xhpcDeviceMessageMapper;
@Resource
XhpcDeviceMessageMapper deviceMessageMapper;
public ChargingPileBinaryHandler() { public ChargingPileBinaryHandler() {
servicemainLogic = SpringContextHolder.getBean("ServiceMainLogic"); servicemainLogic = SpringContextHolder.getBean("ServiceMainLogic");
xhpcDeviceMessageMapper = SpringContextHolder.getBean(XhpcDeviceMessageMapper.class);
} }
@Override @Override
@ -130,7 +127,7 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler {
deviceMessage.setStatus(0); deviceMessage.setStatus(0);
deviceMessage.setContent(HexUtils.toString(result.getBinary())); deviceMessage.setContent(HexUtils.toString(result.getBinary()));
deviceMessage.setChargeOrderNo((String) req.get("orderNo")); deviceMessage.setChargeOrderNo((String) req.get("orderNo"));
deviceMessageMapper.insertByDomain(deviceMessage); xhpcDeviceMessageMapper.insertByDomain(deviceMessage);
} }
if (SERVICE_HB.equals(serviceName) && OK.equals(resultCode)) { if (SERVICE_HB.equals(serviceName) && OK.equals(resultCode)) {
Boolean tcfg = (Boolean) cachePile.get("tcfg"); Boolean tcfg = (Boolean) cachePile.get("tcfg");