This commit is contained in:
2023-07-17 14:30:53 +08:00
parent eb69602e21
commit 2587110cc2
8 changed files with 53 additions and 75 deletions

View File

@@ -25,11 +25,11 @@ public interface AMapService {
/**
* 商家推送充电设备动态数据
* @param pileConnectorCode
* @param stationId
* @return
* @throws Exception
*/
String pushChargingDeviceDynamics(String pileConnectorCode) throws Exception;
String pushChargingDeviceDynamics(String stationId) throws Exception;
/**
* 商家推送充电订单信息

View File

@@ -6,7 +6,6 @@ import com.github.pagehelper.PageInfo;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.PageUtils;
import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.spring.SpringUtils;
@@ -18,7 +17,6 @@ import com.jsowell.pile.service.*;
import com.jsowell.pile.vo.base.ConnectorInfoVO;
import com.jsowell.pile.vo.base.PileInfoVO;
import com.jsowell.pile.vo.uniapp.BillingPriceVO;
import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO;
import com.jsowell.pile.vo.web.BillingDetailVO;
import com.jsowell.pile.vo.web.BillingTemplateVO;
import com.jsowell.pile.vo.web.PileModelInfoVO;
@@ -344,25 +342,26 @@ public class AMapServiceImpl implements AMapService {
/**
* 商家推送充电设备动态数据
* @param pileConnectorCode
* @param stationId 充电站id
* @return
* @throws Exception
*/
@Override
public String pushChargingDeviceDynamics(String pileConnectorCode) throws Exception {
public String pushChargingDeviceDynamics(String stationId) throws Exception {
// 根据枪口号查出桩信息
PileConnectorDetailVO pileConnectorDetailVO = pileBasicInfoService.queryPileConnectorDetail(pileConnectorCode);
if (pileConnectorDetailVO == null) {
throw new BusinessException("", "");
}
String stationId = pileConnectorDetailVO.getStationId();
Map<String, Integer> pileNumMap = pileConnectorInfoService.getPileTypeNum(Long.parseLong(stationId));
AMapConnectorStatusInfo info = new AMapConnectorStatusInfo();
info.setConnectorID(pileConnectorCode);
info.setEquipmentID(pileConnectorDetailVO.getPileSn());
info.setStatus(pileConnectorDetailVO.getConnectorStatus());
// 根据站点id查询枪口信息
List<AMapConnectorStatusInfo> connectorStatusInfoList = Lists.newArrayList();
AMapConnectorStatusInfo info;
List<ConnectorInfoVO> connectorList = pileConnectorInfoService.getUniAppConnectorList(Long.parseLong(stationId));
for (ConnectorInfoVO connectorInfoVO : connectorList) {
info = new AMapConnectorStatusInfo();
info.setConnectorID(connectorInfoVO.getPileConnectorCode());
info.setEquipmentID(connectorInfoVO.getPileSn());
info.setStatus(connectorInfoVO.getConnectorStatus());
connectorStatusInfoList.add(info);
}
// 拼装业务参数
JSONObject json = new JSONObject();
@@ -371,7 +370,7 @@ public class AMapServiceImpl implements AMapService {
json.put("fast_total", pileNumMap.get("fastTotal"));
json.put("slow_free", pileNumMap.get("slowFree"));
json.put("slow_total", pileNumMap.get("slowTotal"));
json.put("connectorStatusInfo", info);
json.put("connectorStatusInfo", connectorStatusInfoList);
String SPI = "amap.charging.pushStationStatus";