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

station_setting_relation ----> thirdparty_station_relation

Browse Source
This commit is contained in:
Lemon
2023-07-07 14:40:19 +08:00
parent 04b4859bcb
commit a1c8dfd525
12 changed files with 196 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java
View File

@@ -9,12 +9,11 @@ import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.YKCUtils;
import com.jsowell.netty.factory.YKCOperateFactory;
import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.domain.StationSettingRelation;
import com.jsowell.pile.domain.ThirdPartySettingInfo;
import com.jsowell.pile.domain.ThirdPartyStationRelation;
import com.jsowell.pile.service.IOrderBasicInfoService;
import com.jsowell.pile.service.IStationSettingRelationService;
import com.jsowell.pile.service.IThirdPartyStationRelationService;
import com.jsowell.pile.service.IThirdPartySettingInfoService;
import com.jsowell.pile.vo.base.StationSettingRelationVO;
import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
import com.jsowell.thirdparty.lianlian.service.LianLianService;
import io.netty.channel.Channel;
import lombok.extern.slf4j.Slf4j;
@@ -46,7 +45,7 @@ public class ChargeEndHandler extends AbstractHandler{
private LianLianService lianLianService;
@Autowired
private IStationSettingRelationService stationSettingRelationService;
private IThirdPartyStationRelationService thirdPartyStationRelationService;
@Override
public void afterPropertiesSet() throws Exception {
@@ -134,9 +133,9 @@ public class ChargeEndHandler extends AbstractHandler{
try {
// 查询该站点是否已对接互联互通平台，如果对接则发送充电结束
// 通过站点id查询相关配置信息
StationSettingRelation relation = new StationSettingRelation();
ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
relation.setStationId(Long.parseLong(orderInfo.getStationId()));
StationSettingRelationVO relationInfo = stationSettingRelationService.selectRelationInfo(relation);
ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation);
// ThirdPartySettingInfo info = thirdPartySettingInfoService.getInfoByStationId(Long.parseLong(orderInfo.getStationId()));
if (Objects.nonNull(relationInfo)) {
// 推送停止充电结果

8
jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java
View File

@@ -19,7 +19,7 @@ import com.jsowell.common.util.id.IdUtils;
import com.jsowell.netty.factory.YKCOperateFactory;
import com.jsowell.pile.domain.*;
import com.jsowell.pile.service.*;
import com.jsowell.pile.vo.base.StationSettingRelationVO;
import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
import com.jsowell.thirdparty.lianlian.service.LianLianService;
import io.netty.channel.Channel;
import lombok.extern.slf4j.Slf4j;
@@ -69,7 +69,7 @@ public class TransactionRecordsRequestHandler extends AbstractHandler {
private LianLianService lianLianService;
@Autowired
private IStationSettingRelationService stationSettingRelationService;
private IThirdPartyStationRelationService thirdPartyStationRelationService;
@Autowired
private IMemberPlateNumberRelationService memberPlateNumberRelationService;
@@ -630,9 +630,9 @@ public class TransactionRecordsRequestHandler extends AbstractHandler {
try {
// 联联平台 推送订单信息 notification_orderInfo
// 查询该站点是否推送联联平台
StationSettingRelation relation = new StationSettingRelation();
ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
relation.setStationId(Long.parseLong(orderBasicInfo.getStationId()));
StationSettingRelationVO relationInfo = stationSettingRelationService.selectRelationInfo(relation);
ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation);
// ThirdPartySettingInfo infoByStationId = thirdPartySettingInfoService.getInfoByStationId(Long.parseLong(stationId));
if (Objects.nonNull(relationInfo)) {
// 推送订单信息

12
jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java
View File

@@ -13,11 +13,9 @@ import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.YKCUtils;
import com.jsowell.netty.factory.YKCOperateFactory;
import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.domain.PileBasicInfo;
import com.jsowell.pile.domain.StationSettingRelation;
import com.jsowell.pile.domain.ThirdPartySettingInfo;
import com.jsowell.pile.domain.ThirdPartyStationRelation;
import com.jsowell.pile.service.*;
import com.jsowell.pile.vo.base.StationSettingRelationVO;
import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
import com.jsowell.thirdparty.lianlian.service.LianLianService;
import io.netty.channel.Channel;
import lombok.extern.slf4j.Slf4j;
@@ -62,7 +60,7 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler {
private LianLianService lianLianService;
@Autowired
private IStationSettingRelationService stationSettingRelationService;
private IThirdPartyStationRelationService thirdPartyStationRelationService;
@Override
public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) {
@@ -295,12 +293,12 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler {
}
// 状态不一样，传给联联
// 查询该站点是否推送联联平台
StationSettingRelation relation = new StationSettingRelation();
ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
if (StringUtils.isBlank(orderInfo.getStationId())) {
return null;
}
relation.setStationId(Long.parseLong(orderInfo.getStationId()));
StationSettingRelationVO relationInfo = stationSettingRelationService.selectRelationInfo(relation);
ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation);
// ThirdPartySettingInfo thirdPartySettingInfo = thirdPartySettingInfoService.getInfoByStationId(pileBasicInfo.getStationId());
if (Objects.nonNull(relationInfo)) {
String pileConnectorCode = pileSn + connectorCode;