From 15dcbd07dfb421e81bf2401cc37b8a6bca6d4211 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 十月 2025 18:34:49 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java | 1028 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 916 insertions(+), 112 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java
index 2689841..27425b7 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java
@@ -1,17 +1,24 @@
package com.ruoyi.integration.drainage;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.common.utils.JacksonUtils;
import com.ruoyi.chargingPile.api.feignClient.*;
import com.ruoyi.chargingPile.api.model.*;
-import com.ruoyi.chargingPile.api.vo.GetParkingRecord;
+import com.ruoyi.chargingPile.api.vo.GetChargingGunByChargingPileIdsVo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.integration.drainage.kuaidian.TCECKDUtil;
import com.ruoyi.integration.drainage.kuaidian.model.*;
import com.ruoyi.integration.drainage.model.*;
import com.ruoyi.integration.drainage.model.enu.*;
+import com.ruoyi.integration.drainage.util.AesEncryption;
+import com.ruoyi.integration.drainage.util.HMacMD5Util;
+import com.ruoyi.integration.drainage.util.SequenceGenerator;
+import com.ruoyi.integration.mongodb.service.UploadRealTimeMonitoringDataService;
import com.ruoyi.order.api.feignClient.ChargingOrderAccountingStrategyClient;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import com.ruoyi.order.api.model.AddTripartitePlatformOrder;
@@ -20,27 +27,30 @@
import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
import com.ruoyi.other.api.domain.Operator;
import com.ruoyi.other.api.feignClient.OperatorClient;
-import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.other.api.feignClient.SystemConfigurationClient;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
import java.util.stream.Collectors;
/**
* @author zhibing.pu
* @Date 2025/1/21 17:52
*/
+@Slf4j
@RestController
@RequestMapping("/evcs/v1.0")
public class TCECController {
@@ -67,17 +77,22 @@
private ChargingOrderAccountingStrategyClient chargingOrderAccountingStrategyClient;
@Resource
+ private UploadRealTimeMonitoringDataService uploadRealTimeMonitoringDataService;
+
+ @Resource
private TokenUtil tokenUtil;
-
- private static Map<Long, Integer> map = new HashMap<>();
-
+
@Resource
private ParkingLotClient parkingLotClient;
@Resource
private ParkingRecordClient parkingRecordClient;
-
+ @Resource
+ private SystemConfigurationClient systemConfigurationClient;
+ @Autowired
+ private TCECSuperviseUtil tcecSuperviseUtil;
+ private final static String operatorId = "906171535";
/**
* 请求校验
@@ -91,35 +106,24 @@
baseResult.setMsg("成功");
baseResult.setOperatorID(baseRequest.getOperatorID());
Long mapKey = Long.valueOf(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
- Integer integer = map.get(mapKey);
- if(null == integer){
- integer = 1;
- }else{
- integer++;
- }
- map.put(mapKey, integer);
baseResult.setTimeStamp(mapKey);
- baseResult.setSeq(String.format("%04d", integer));
- //清空小于当前时间的map中的无效数据
- for (Long k : map.keySet()) {
- if(k <= (mapKey - 10)){
- map.remove(k);
- }
- }
-
+ baseResult.setSeq("0001");
+
//校验token和签名
String operatorID = baseRequest.getOperatorID();
String sig = baseRequest.getSig();
Long timeStamp = baseRequest.getTimeStamp();
String data = baseRequest.getData();
String seq = baseRequest.getSeq();
+
if(StringUtils.isEmpty(operatorID) || StringUtils.isEmpty(sig) || StringUtils.isEmpty(data) || StringUtils.isEmpty(seq) || null == timeStamp){
baseResult.setRet(4003);
baseResult.setMsg("参数异常");
return baseResult;
}
-
+
R<Operator> r = operatorClient.getOperator(operatorID);
+
if(200 != r.getCode()){
baseResult.setRet(500);
baseResult.setMsg("系统异常");
@@ -127,7 +131,7 @@
}
//校验token
if(tokenCheck){
- LoginUser loginUser = tokenUtil.getLoginUser(request);
+ Operator loginUser = tokenUtil.getLoginUser(request);
if(null == loginUser){
baseResult.setRet(4002);
baseResult.setMsg("身份校验失败，无效的token");
@@ -136,18 +140,18 @@
}
Operator operator = r.getData();
+ baseResult.setOperator(operator);
baseRequest.setOperator(operator);
//校验签名
- String sign = TCECUtil.buildSign(baseRequest);
+ String sign = TCECUtil.ourBuildSign(baseRequest);
if(!sign.equals(sig)){
baseResult.setRet(4001);
baseResult.setMsg("签名校验失败");
return baseResult;
}
- baseResult.setOperator(operator);
return baseResult;
}
-
+
@@ -158,10 +162,13 @@
*/
@PostMapping("/query_token")
public BaseResult queryToken(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
+ log.info("三方平台获取token请求参数：" + JacksonUtils.toJson(baseRequest));
BaseResult baseResult = requestCheck(false, baseRequest, request);
if(0 != baseResult.getRet()){
+ log.info("三方平台获取token响应Data：");
baseResult.setData("");
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台获取token响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
QueryTokenResult queryTokenResult = new QueryTokenResult();
@@ -170,24 +177,29 @@
queryTokenResult.setSuccStat(1);
queryTokenResult.setFailReason(1);
//参数加密
- String jsonString = JSON.toJSONString(queryTokenResult);
+ String jsonString = JacksonUtils.toJson(queryTokenResult);
+ log.info("三方平台获取token响应Data：" + jsonString);
String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台获取token响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
//解密参数
- String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
+ log.info("三方平台获取token请求Data：" + decrypt);
QueryToken queryToken = JSON.parseObject(decrypt, QueryToken.class);
- if(!queryToken.getOperatorSecret().equals(operator.getOperatorSecret())){
+ if(!queryToken.getOperatorSecret().equals(operator.getOurOperatorSecret())){
queryTokenResult.setSuccStat(1);
queryTokenResult.setFailReason(2);
//参数加密
- String jsonString = JSON.toJSONString(queryTokenResult);
+ String jsonString = JacksonUtils.toJson(queryTokenResult);
+ log.info("三方平台获取token响应Data：" + jsonString);
String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台获取token响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
@@ -195,16 +207,61 @@
Map<String, Object> token = tokenUtil.createToken(operator);
String access_token = token.get("access_token").toString();
Long expires_in = Long.valueOf(token.get("expires_in").toString());
-
+
+ queryTokenResult.setOperatorID("906171535");
queryTokenResult.setSuccStat(0);
queryTokenResult.setFailReason(0);
queryTokenResult.setAccessToken(access_token);
queryTokenResult.setTokenAvailableTime(expires_in * 60);
//参数加密
- String jsonString = JSON.toJSONString(queryTokenResult);
+ String jsonString = JacksonUtils.toJson(queryTokenResult);
+ log.info("三方平台获取token响应Data：" + jsonString);
String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台获取token响应参数：" + JacksonUtils.toJson(baseResult));
+ return baseResult;
+ }
+ /**
+ * 获取token
+ * @return
+ */
+ @PostMapping("/query_token_jianguan")
+ public BaseResult queryTokenJianguan(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
+ log.info("三方平台获取token请求参数：" + JacksonUtils.toJson(baseRequest));
+ BaseResult baseResult = requestCheck(false, baseRequest, request);
+ if(0 != baseResult.getRet()){
+ log.info("三方平台获取token响应Data：");
+ baseResult.setData("");
+ baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台获取token响应参数：" + JacksonUtils.toJson(baseResult));
+ return baseResult;
+ }
+ QueryTokenResult queryTokenResult = new QueryTokenResult();
+ //生成token
+ Operator operator = baseResult.getOperator();
+ Map<String, Object> token = tokenUtil.createToken(operator);
+ String access_token = token.get("access_token").toString();
+ Long expires_in = Long.valueOf(token.get("expires_in").toString());
+
+ queryTokenResult.setOperatorID("906171535");
+ queryTokenResult.setSuccStat(0);
+ queryTokenResult.setFailReason(0);
+ queryTokenResult.setAccessToken(access_token);
+ queryTokenResult.setTokenAvailableTime(expires_in * 60);
+ //参数加密
+ String jsonString = JacksonUtils.toJson(queryTokenResult);
+ log.info("三方平台获取token响应Data：" + jsonString);
+// String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
+// baseResult.setData(encrypt);
+ String timeStamp = System.currentTimeMillis() + "";
+ SequenceGenerator generator = new SequenceGenerator();
+ String nextSequence = generator.getNextSequence();
+ String data = AesEncryption.encrypt(OurDataSecret, OurDataSecretIV,jsonString);
+ String hmacMD5 = HMacMD5Util.getHMacMD5(OperatorID,timeStamp, data,nextSequence,OurSigSecret);
+ baseResult.setData(data);
+ baseResult.setSig(hmacMD5);
+ log.info("三方平台获取token响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
@@ -218,16 +275,20 @@
*/
@PostMapping("/query_stations_info")
public BaseResult queryStationsInfo(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
+ log.info("三方平台查询充电站信息请求参数：" + JacksonUtils.toJson(baseRequest));
//校验token和签名
BaseResult baseResult = requestCheck(true, baseRequest, request);
if(0 != baseResult.getRet()){
+ log.info("三方平台查询充电站信息响应Data：");
baseResult.setData("");
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台查询充电站信息响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
Operator operator = baseResult.getOperator();
//解密参数
- String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
+ log.info("三方平台查询充电站信息请求Data：" + decrypt);
QueryStationsInfo queryStationsInfo = JSON.parseObject(decrypt, QueryStationsInfo.class);
Integer pageNo = queryStationsInfo.getPageNo();
Integer pageSize = queryStationsInfo.getPageSize();
@@ -237,7 +298,7 @@
if(null == pageSize){
pageSize = 10;
}
- PageInfo<Site> siteListPaging = siteClient.getSiteListPaging(pageNo, pageSize);
+ PageInfo<Site> siteListPaging = siteClient.getSiteListPaging(pageNo, pageSize, new ArrayList<>(), 1);
List<TParkingLot> parkingLots = parkingLotClient.getAllParkingLot().getData();
QueryStationsInfoResult queryStationsInfoResult = new QueryStationsInfoResult();
queryStationsInfoResult.setPageNo(pageNo);
@@ -245,10 +306,12 @@
queryStationsInfoResult.setItemSize(Long.valueOf(siteListPaging.getTotal()).intValue());
queryStationsInfoResult.setStationInfos(buildSite(parkingLots, siteListPaging.getRecords()));
//参数加密
- String jsonString = JSON.toJSONString(queryStationsInfoResult);
+ String jsonString = JacksonUtils.toJson(queryStationsInfoResult);
+ log.info("三方平台查询充电站信息响应Data：" + jsonString);
String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台查询充电站信息响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
@@ -262,20 +325,61 @@
List<Integer> siteIds = sites.stream().map(Site::getId).collect(Collectors.toList());
List<TChargingPile> tChargingPiles = chargingPileClient.getChargingPileBySiteIds(siteIds).getData();
List<Integer> collect1 = tChargingPiles.stream().map(TChargingPile::getId).collect(Collectors.toList());
- List<TChargingGun> chargingGunList = chargingGunClient.getChargingGunByChargingPileIds(collect1).getData();
-
+ GetChargingGunByChargingPileIdsVo vo = new GetChargingGunByChargingPileIdsVo();
+ vo.setChargingPileIds(collect1);
+ List<TChargingGun> chargingGunList = chargingGunClient.getChargingGunByChargingPileIds(vo).getData();
+ String serviceTel = systemConfigurationClient.getServerPhone().getData();
List<StationInfo> StationInfos = new ArrayList<>();
for (Site datum : sites) {
StationInfo stationInfo = new StationInfo();
+ stationInfo.setAreaCodeCountryside(datum.getAreaCodeCountryside());
+ stationInfo.setStationClassification(datum.getStationClassification());
+ stationInfo.setGeneralApplicationType(datum.getGeneralApplicationType());
+ if (org.springframework.util.StringUtils.hasLength(datum.getSwapMatchCars())){
+ stationInfo.setSwapMatchCars(Arrays.asList(datum.getSwapMatchCars().split(",")));
+ }
+ stationInfo.setBusineHours(datum.getStartServiceTime());
+ stationInfo.setRoundTheClock(datum.getRoundTheClock());
+ stationInfo.setParkType(datum.getParkType());
+ stationInfo.setElectricityFee("{"+datum.getElectricityFee()+"}");
+ stationInfo.setServiceFee("{"+datum.getServiceFee()+"}");
+ stationInfo.setParkFee("{\"rules\":"+datum.getParkFee()+","+"\"freeDuration\":"+datum.getParkFeeFree()+"}");
+ stationInfo.setElectricityType(datum.getElectricityType());
+ stationInfo.setBusinessExpandType(datum.getBusinessExpandType());
+ stationInfo.setCapacity(datum.getCapacity());
+ stationInfo.setRatedPower(datum.getRatedPower());
+ stationInfo.setPeriodFee(datum.getPeriodFee());
+ stationInfo.setOfficialRunTime(datum.getOfficialRunTime());
+ stationInfo.setStationOrientation(datum.getStationOrientation());
+ stationInfo.setStationArea(datum.getStationArea());
+ stationInfo.setHavePerson(datum.getHavePerson());
+ stationInfo.setVideoMonitor(datum.getVideoMonitor());
+ if (StringUtils.isNotEmpty(datum.getSupportingFacilities())){
+ String[] split = datum.getSupportingFacilities().split(",");
+ List<Integer> collect = Arrays.stream(split).map(Integer::parseInt).collect(Collectors.toList());
+ stationInfo.setSupportingFacilities(collect);
+ }
+ stationInfo.setPrinterFlag(datum.getPrinterFlag());
+ stationInfo.setBarrierFlag(datum.getBarrierFlag());
+ stationInfo.setParkingLockFlag(datum.getParkingLockFlag());
+ stationInfo.setEquipmentOwnerName(datum.getEquipmentOwnerName());
+ stationInfo.setResidentNo(datum.getResidentNo());
+ stationInfo.setSupplyType(datum.getSupplyType());
+ stationInfo.setWattHourMeterNo(datum.getWattHourMeterNo());
+ BigDecimal forwardPower = datum.getForwardPower();
+ if (forwardPower!=null){
+ stationInfo.setForwardPower(forwardPower.setScale(4, BigDecimal.ROUND_HALF_UP).toString());
+ }
+ stationInfo.setRecordUniqueNo(datum.getRecordUniqueNo());
stationInfo.setStationID(datum.getId().toString());
- stationInfo.setOperatorID("");
- stationInfo.setEquipmentOwnerID("91510903906171535D");
+ stationInfo.setOperatorID("906171535");
+ stationInfo.setEquipmentOwnerID("906171535");
stationInfo.setStationName(datum.getName());
- stationInfo.setCountryCode(datum.getCountryCode());
+ stationInfo.setCountryCode(StringUtils.isNotEmpty(datum.getCountryCode()) ? datum.getCountryCode() : "CN");
stationInfo.setAreaCode(datum.getDistrictsCode());
stationInfo.setAddress(datum.getAddress());
- stationInfo.setStationTel(datum.getPhone());
- stationInfo.setServiceTel(datum.getServicePhone());
+ stationInfo.setStationTel(StringUtils.isNotEmpty(serviceTel) ? serviceTel.split(",")[0] : "");
+ stationInfo.setServiceTel(StringUtils.isNotEmpty(serviceTel) ? serviceTel.split(",")[0] : "");
switch (datum.getSiteType()){
case 0:
stationInfo.setStationType(StationTypeEnum.OTHER.getType());
@@ -312,10 +416,10 @@
stationInfo.setStationLat(new BigDecimal(datum.getLat()).setScale(6, RoundingMode.DOWN));
stationInfo.setStationLng(new BigDecimal(datum.getLon()).setScale(6, RoundingMode.DOWN));
stationInfo.setConstruction(datum.getConstructionSite() == 0 ? ConstructionEnum.OTHER.getType() : datum.getConstructionSite());
- stationInfo.setPictures(Arrays.asList(datum.getImgUrl().split(",")));
+ stationInfo.setPictures(StringUtils.isNotEmpty(datum.getImgUrl()) ? Arrays.asList(datum.getImgUrl().split(",")) : new ArrayList<>());
stationInfo.setSiteGuide(datum.getGuide());
stationInfo.setMatchCars(datum.getVehicleDescription());
- stationInfo.setBusineHours(datum.getStartServiceTime() + "-" + datum.getEndServiceTime());
+// stationInfo.setBusineHours(datum.getStartServiceTime() + "-" + datum.getEndServiceTime());
stationInfo.setElectricityFee(datum.getRateDescription());
//添加停车费信息
Optional<TParkingLot> first = parkingLots.stream().filter(s -> s.getSiteId().equals(datum.getId())).findFirst();
@@ -323,7 +427,6 @@
TParkingLot tParkingLot = first.get();
buildPlaceHolder(tParkingLot, stationInfo);
}
-
//构建充电设备信息数据
stationInfo.setEquipmentInfos(buildEquipmentInfo(datum.getId(), tChargingPiles, chargingGunList));
StationInfos.add(stationInfo);
@@ -370,6 +473,8 @@
equipmentInfo.setManufacturerID(tChargingPile.getManufacturerCode());
equipmentInfo.setManufacturerName(tChargingPile.getManufacturer());
equipmentInfo.setEquipmentModel(tChargingPile.getEquipmentType());
+ equipmentInfo.setEquipmentUniqueNumber(tChargingPile.getEquipmentUniqueNumber());
+ equipmentInfo.setEquipmentClassification(tChargingPile.getEquipmentClassification());
if(null != tChargingPile.getProductionDate()){
equipmentInfo.setProductionDate(tChargingPile.getProductionDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
}
@@ -389,10 +494,17 @@
case 4:
equipmentInfo.setEquipmentType(EquipmentTypeEnum.WIRELESS_DEVICE.getType());
break;
+ case 5:
+ equipmentInfo.setEquipmentType(EquipmentTypeEnum.ORDER.getType());
+ break;
+ case 6:
+ equipmentInfo.setEquipmentType(EquipmentTypeEnum.V2G.getType());
+ break;
}
//构建设备接口信息
equipmentInfo.setConnectorInfos(buildConnectorInfos(tChargingPile.getId(), tChargingPile.getCode(), chargingGunList));
+ equipmentInfo.setPower(tChargingPile.getRatedPower());
equipmentInfos.add(equipmentInfo);
}
return equipmentInfos;
@@ -409,8 +521,16 @@
List<TChargingGun> collect = chargingGunList.stream().filter(s -> s.getChargingPileId().equals(chargingPileId)).collect(Collectors.toList());
for (TChargingGun chargingGun : collect) {
ConnectorInfo connectorInfo = new ConnectorInfo();
- connectorInfo.setConnectorID(chargingGun.getId().toString());
+ connectorInfo.setConnectorID(chargingGun.getFullNumber());
connectorInfo.setConnectorName(chargingGun.getName());
+ connectorInfo.setEquipmentClassification(chargingGun.getEquipmentClassification());
+ connectorInfo.setConstantVoltageLowerLimits(chargingGun.getConstantVoltageLowerLimits());
+ connectorInfo.setConstantVoltageUpperLimits(chargingGun.getConstantVoltageUpperLimits());
+ connectorInfo.setConstantCurrentLowerLimits(chargingGun.getConstantCurrentLowerLimits());
+ connectorInfo.setConstantCurrentUpperLimits(chargingGun.getConstantCurrentUpperLimits());
+ connectorInfo.setAuxPower(chargingGun.getAuxPower());
+ connectorInfo.setOpreateStatus(chargingGun.getOpreateStatus());
+ connectorInfo.setOpreateHours(chargingGun.getOpreateHours());
switch (chargingGun.getType()){
case 0:
connectorInfo.setConnectorType(ConnectorTypeEnum.OTHER.getType());
@@ -431,8 +551,6 @@
connectorInfo.setConnectorType(ConnectorTypeEnum.WIRELESS_CHARGING_STAND.getType());
break;
}
- connectorInfo.setVoltageUpperLimits(chargingGun.getUpperRatedVoltage().intValue());
- connectorInfo.setVoltageLowerLimits(chargingGun.getLowerLimitOfRatedVoltage().intValue());
connectorInfo.setCurrent(chargingGun.getRatedCurrent().intValue());
connectorInfo.setPower(chargingGun.getRatedPower());
connectorInfo.setParkNo(chargingGun.getParkingNumber());
@@ -449,9 +567,9 @@
* @return
*/
@PostMapping("/pushChargingGunStatus")
- public R pushChargingGunStatus(@RequestParam("id") Integer id, @RequestParam("status") Integer status){
+ public R pushChargingGunStatus(@RequestParam(value = "fullNumber") String fullNumber, @RequestParam(value = "status") Integer status){
ConnectorStatusInfo connectorStatusInfo = new ConnectorStatusInfo();
- connectorStatusInfo.setConnectorID(id.toString());
+ connectorStatusInfo.setConnectorID(fullNumber);
switch (status){
case 1:
connectorStatusInfo.setStatus(0);
@@ -475,6 +593,9 @@
connectorStatusInfo.setStatus(255);
break;
}
+ ConnectorStatusInfo connectorStatusInfo1 = new ConnectorStatusInfo();
+ BeanUtils.copyProperties(connectorStatusInfo, connectorStatusInfo1);
+ connectorStatusInfo.setConnectorStatusInfo(connectorStatusInfo1);
List<Operator> operators = operatorClient.getAllOperator().getData();
for (Operator operator : operators) {
TCECUtil.notificationStationStatus(operator, connectorStatusInfo);
@@ -490,22 +611,28 @@
*/
@PostMapping("/query_station_status")
public BaseResult queryStationStatus(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
+ log.info("三方平台获取设备接口状态请求参数：" + JacksonUtils.toJson(baseRequest));
BaseResult baseResult = requestCheck(true, baseRequest, request);
if(0 != baseResult.getRet()){
+ log.info("三方平台获取设备接口状态响应Data：");
baseResult.setData("");
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台获取设备接口状态响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
Operator operator = baseResult.getOperator();
//解密参数
- String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
+ log.info("三方平台获取设备接口状态请求Data：" + decrypt);
QueryStationStatus queryStationsInfo = JSON.parseObject(decrypt, QueryStationStatus.class);
List<Integer> collect = queryStationsInfo.getStationIDs().stream().map(Integer::valueOf).collect(Collectors.toList());
List<Site> data = siteClient.getSiteByIds(collect).getData();
List<Integer> siteIds = data.stream().map(Site::getId).collect(Collectors.toList());
List<TChargingPile> tChargingPiles = chargingPileClient.getChargingPileBySiteIds(siteIds).getData();
List<Integer> collect1 = tChargingPiles.stream().map(TChargingPile::getId).collect(Collectors.toList());
- List<TChargingGun> chargingGunList = chargingGunClient.getChargingGunByChargingPileIds(collect1).getData();
+ GetChargingGunByChargingPileIdsVo vo = new GetChargingGunByChargingPileIdsVo();
+ vo.setChargingPileIds(collect1);
+ List<TChargingGun> chargingGunList = chargingGunClient.getChargingGunByChargingPileIds(vo).getData();
QueryStationStatusResult result = new QueryStationStatusResult();
result.setTotal(data.size());
@@ -518,7 +645,7 @@
List<TChargingGun> collect2 = chargingGunList.stream().filter(s -> s.getSiteId().equals(datum.getId())).collect(Collectors.toList());
for (TChargingGun chargingGun : collect2) {
ConnectorStatusInfo info = new ConnectorStatusInfo();
- info.setConnectorID(chargingGun.getId().toString());
+ info.setConnectorID(chargingGun.getFullNumber());
switch (chargingGun.getStatus()){
case 1:
info.setStatus(0);
@@ -549,10 +676,12 @@
}
result.setStationStatusInfos(StationStatusInfos);
//参数加密
- String jsonString = JSON.toJSONString(result);
+ String jsonString = JacksonUtils.toJson(result);
+ log.info("三方平台获取设备接口状态响应Data：" + jsonString);
String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台获取设备接口状态响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
@@ -566,16 +695,20 @@
*/
@PostMapping("/query_station_stats")
public BaseResult queryStationStats(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
+ log.info("三方平台获取统计信息请求参数：" + JacksonUtils.toJson(baseRequest));
//校验token和签名
BaseResult baseResult = requestCheck(true, baseRequest, request);
if(0 != baseResult.getRet()){
+ log.info("三方平台获取统计信息响应Data：");
baseResult.setData("");
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台获取统计信息响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
Operator operator = baseResult.getOperator();
//解密参数
- String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
+ log.info("三方平台获取统计信息请求Data：" + decrypt);
QueryStationStats queryStationStats = JSON.parseObject(decrypt, QueryStationStats.class);
QueryStationStatsResult result = new QueryStationStatsResult();
ChargingPercentProvinceDto dto = new ChargingPercentProvinceDto();
@@ -608,8 +741,9 @@
List<TChargingOrder> tChargingOrders1 = collect2.get(integer1);
BigDecimal reduce2 = tChargingOrders1.stream().map(TChargingOrder::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
+ TChargingGun chargingGun = chargingGunClient.getChargingGunById(integer1).getData();
ConnectorStatsInfo connectorStatsInfo = new ConnectorStatsInfo();
- connectorStatsInfo.setConnectorID(integer1.toString());
+ connectorStatsInfo.setConnectorID(chargingGun.getFullNumber());
connectorStatsInfo.setConnectorElectricity(reduce2);
ConnectorStatsInfos.add(connectorStatsInfo);
}
@@ -619,10 +753,12 @@
stationStats.setEquipmentStatsInfos(EquipmentStatsInfos);
result.setStationStats(stationStats);
//参数加密
- String jsonString = JSON.toJSONString(result);
+ String jsonString = JacksonUtils.toJson(result);
+ log.info("三方平台获取统计信息响应Data：" + jsonString);
String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台获取统计信息响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
@@ -633,22 +769,27 @@
*/
@PostMapping("/query_equip_auth")
public BaseResult queryEquipAuth(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
+ log.info("三方平台设备认证请求参数：" + JacksonUtils.toJson(baseRequest));
//校验token和签名
BaseResult baseResult = requestCheck(true, baseRequest, request);
if(0 != baseResult.getRet()){
+ log.info("三方平台设备认证响应Data：");
baseResult.setData("");
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台设备认证响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
Operator operator = baseResult.getOperator();
//解密参数
- String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
+ log.info("三方平台设备认证请求Data：" + decrypt);
QueryEquipAuth queryEquipAuth = JSON.parseObject(decrypt, QueryEquipAuth.class);
String connectorID = queryEquipAuth.getConnectorID();
- TChargingGun tChargingGun = chargingGunClient.getChargingGunById(Integer.valueOf(connectorID)).getData();
+ TChargingGun tChargingGun = chargingGunClient.getChargingGunByFullNumber(connectorID).getData();
if(null == tChargingGun){
baseResult.setRet(4004);
baseResult.setMsg("connectorID 参数无效");
+ log.info("三方平台设备认证响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
QueryEquipAuthResult queryEquipAuthResult = new QueryEquipAuthResult();
@@ -686,10 +827,12 @@
break;
}
//参数加密
- String jsonString = JSON.toJSONString(queryEquipAuthResult);
+ String jsonString = JacksonUtils.toJson(queryEquipAuthResult);
+ log.info("三方平台设备认证响应Data：" + jsonString);
String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台设备认证响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
@@ -701,16 +844,20 @@
*/
@PostMapping("/query_equip_business_policy")
public BaseResult queryEquipBusinessPolicy(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
+ log.info("三方平台查询业务策略信息请求参数：" + JacksonUtils.toJson(baseRequest));
//校验token和签名
BaseResult baseResult = requestCheck(true, baseRequest, request);
if(0 != baseResult.getRet()){
+ log.info("三方平台查询业务策略信息响应Data：");
baseResult.setData("");
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台查询业务策略信息响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
Operator operator = baseResult.getOperator();
//解密参数
- String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
+ log.info("三方平台查询业务策略信息请求Data：" + decrypt);
QueryEquipBusinessPolicy queryEquipBusinessPolicy = JSON.parseObject(decrypt, QueryEquipBusinessPolicy.class);
//构建返回结果
@@ -720,15 +867,17 @@
queryEquipBusinessPolicyResult.setSuccStat(0);
queryEquipBusinessPolicyResult.setFailReason(0);
String connectorID = queryEquipBusinessPolicy.getConnectorID();
- TChargingGun tChargingGun = chargingGunClient.getChargingGunById(Integer.valueOf(connectorID)).getData();
+ TChargingGun tChargingGun = chargingGunClient.getChargingGunByFullNumber(connectorID).getData();
if(null == tChargingGun){
baseResult.setRet(4004);
baseResult.setMsg("connectorID 参数无效");
//参数加密
- String jsonString = JSON.toJSONString(queryEquipBusinessPolicyResult);
+ String jsonString = JacksonUtils.toJson(queryEquipBusinessPolicyResult);
+ log.info("三方平台查询业务策略信息响应Data：" + jsonString);
String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台查询业务策略信息响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
Integer accountingStrategyId = tChargingGun.getAccountingStrategyId();
@@ -742,10 +891,12 @@
queryEquipBusinessPolicyResult.setFailReason(1);
queryEquipBusinessPolicyResult.setSumPeriod(0);
//参数加密
- String jsonString = JSON.toJSONString(queryEquipBusinessPolicyResult);
+ String jsonString = JacksonUtils.toJson(queryEquipBusinessPolicyResult);
+ log.info("三方平台查询业务策略信息响应Data：" + jsonString);
String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台查询业务策略信息响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
List<PolicyInfo> PolicyInfos = new ArrayList<>();
@@ -759,10 +910,12 @@
queryEquipBusinessPolicyResult.setSumPeriod(PolicyInfos.size());
queryEquipBusinessPolicyResult.setPolicyInfos(PolicyInfos);
//参数加密
- String jsonString = JSON.toJSONString(queryEquipBusinessPolicyResult);
+ String jsonString = JacksonUtils.toJson(queryEquipBusinessPolicyResult);
+ log.info("三方平台查询业务策略信息响应Data：" + jsonString);
String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台查询业务策略信息响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
@@ -816,16 +969,20 @@
*/
@PostMapping("/query_start_charge")
public BaseResult queryStartCharge(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
+ log.info("三方平台请求开始充电请求参数：" + JacksonUtils.toJson(baseRequest));
//校验token和签名
BaseResult baseResult = requestCheck(true, baseRequest, request);
if(0 != baseResult.getRet()){
+ log.info("三方平台请求开始充电响应Data：");
baseResult.setData("");
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台请求开始充电响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
Operator operator = baseResult.getOperator();
//解密参数
- String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
+ log.info("三方平台请求开始充电请求Data：" + decrypt);
QueryStartCharge queryStartCharge = JSON.parseObject(decrypt, QueryStartCharge.class);
//构建返回结果
@@ -833,7 +990,7 @@
result.setStartChargeSeq(queryStartCharge.getStartChargeSeq());
result.setConnectorID(queryStartCharge.getConnectorID());
String connectorID = queryStartCharge.getConnectorID();
- TChargingGun tChargingGun = chargingGunClient.getChargingGunById(Integer.valueOf(connectorID)).getData();
+ TChargingGun tChargingGun = chargingGunClient.getChargingGunByFullNumber(connectorID).getData();
//设备不存在
if(null == tChargingGun){
baseResult.setRet(4004);
@@ -842,10 +999,12 @@
result.setFailReason(1);
result.setStartChargeSeqStat(5);
//参数加密
- String jsonString = JSON.toJSONString(result);
+ String jsonString = JacksonUtils.toJson(result);
+ log.info("三方平台请求开始充电响应Data：" + jsonString);
String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台请求开始充电响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
//设备离线
@@ -854,10 +1013,12 @@
result.setFailReason(2);
result.setStartChargeSeqStat(5);
//参数加密
- String jsonString = JSON.toJSONString(result);
+ String jsonString = JacksonUtils.toJson(result);
+ log.info("三方平台请求开始充电响应Data：" + jsonString);
String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台请求开始充电响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
//调用充电接口
@@ -865,7 +1026,7 @@
addTripartitePlatformOrder.setStartChargeSeq(queryStartCharge.getStartChargeSeq());
addTripartitePlatformOrder.setChargingGunId(tChargingGun.getId());
addTripartitePlatformOrder.setOperatorId(operator.getOperatorId());
- addTripartitePlatformOrder.setPaymentAmount(queryStartCharge.getChargingAmt());
+ addTripartitePlatformOrder.setPaymentAmount(null == queryStartCharge.getChargingAmt() ? new BigDecimal(9999) : queryStartCharge.getChargingAmt());
addTripartitePlatformOrder.setRechargePaymentType(0);
addTripartitePlatformOrder.setPlateNum(queryStartCharge.getPlateNum());
R order = chargingOrderClient.addTripartitePlatformOrder(addTripartitePlatformOrder);
@@ -875,20 +1036,45 @@
result.setFailReason(1);
result.setStartChargeSeqStat(2);
//参数加密
- String jsonString = JSON.toJSONString(result);
+ String jsonString = JacksonUtils.toJson(result);
+ log.info("三方平台请求开始充电响应Data：" + jsonString);
String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台请求开始充电响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
result.setStartChargeSeqStat(1);
result.setSuccStat(0);
result.setFailReason(0);
//参数加密
- String jsonString = JSON.toJSONString(result);
+ String jsonString = JacksonUtils.toJson(result);
+ log.info("三方平台请求开始充电响应Data：" + jsonString);
String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台请求开始充电响应参数：" + JacksonUtils.toJson(baseResult));
+
+ //定义定时任务推送订单状态
+ ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+ Runnable task = new Runnable() {
+ @Override
+ public void run() {
+ try {
+ TChargingOrder chargingOrder = chargingOrderClient.getChargingOrderByStartChargeSeq(result.getStartChargeSeq()).getData();
+ if(chargingOrder.getStatus() != 3){
+ scheduler.shutdown();
+ return;
+ }
+ log.info("开始执行三方平台定时推送");
+ notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ };
+ //一分钟执行一次
+ scheduler.scheduleAtFixedRate(task, 10, 10, TimeUnit.SECONDS);
return baseResult;
}
@@ -944,24 +1130,30 @@
*/
@PostMapping("/query_equip_charge_status")
public BaseResult queryEquipChargeStatus(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
+ log.info("三方平台查询充电状态请求参数：" + JacksonUtils.toJson(baseRequest));
//校验token和签名
BaseResult baseResult = requestCheck(true, baseRequest, request);
if(0 != baseResult.getRet()){
+ log.info("三方平台查询充电状态响应Data：");
baseResult.setData("");
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台查询充电状态响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
Operator operator = baseResult.getOperator();
//解密参数
- String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
+ log.info("三方平台查询充电状态请求Data：" + decrypt);
QueryEquipChargeStatus queryEquipChargeStatus = JSON.parseObject(decrypt, QueryEquipChargeStatus.class);
//校验token和签名
QueryEquipChargeStatusResult queryEquipChargeStatusResult = buildQueryEquipChargeStatusResult(queryEquipChargeStatus.getStartChargeSeq());
//参数加密
- String jsonString = JSON.toJSONString(queryEquipChargeStatusResult);
+ String jsonString = JacksonUtils.toJson(queryEquipChargeStatusResult);
+ log.info("三方平台查询充电状态响应Data：" + jsonString);
String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台查询充电状态响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
@@ -1000,8 +1192,8 @@
queryEquipChargeStatusResult.setStartChargeSeqStat(4);
break;
}
- queryEquipChargeStatusResult.setConnectorID(chargingOrder.getChargingGunId().toString());
TChargingGun chargingGun = chargingGunClient.getChargingGunById(chargingOrder.getChargingGunId()).getData();
+ queryEquipChargeStatusResult.setConnectorID(chargingGun.getFullNumber());
//1=离线，2=空闲，3=占用（未充电），4=占用（充电中），5=占用（已充满），6=占用（预约锁定），7=故障
switch (chargingGun.getStatus()){
case 1:
@@ -1028,20 +1220,36 @@
}
queryEquipChargeStatusResult.setCurrentA(chargingOrder.getCurrent());
queryEquipChargeStatusResult.setVoltageA(chargingOrder.getVoltage());
- queryEquipChargeStatusResult.setSoc(chargingOrder.getTotalElectricity());
+ UploadRealTimeMonitoringData timeMonitoringData = uploadRealTimeMonitoringDataService.getLastDataById(chargingOrder.getCode());
+ queryEquipChargeStatusResult.setSoc(null == timeMonitoringData ? BigDecimal.ZERO : new BigDecimal(timeMonitoringData.getSoc()));
queryEquipChargeStatusResult.setStartTime((null == chargingOrder.getStartTime() ? chargingOrder.getCreateTime() : chargingOrder.getStartTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- queryEquipChargeStatusResult.setEndTime((null == chargingOrder.getStartTime() ? LocalDateTime.now() : chargingOrder.getEndTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ queryEquipChargeStatusResult.setEndTime((null == chargingOrder.getEndTime() ? LocalDateTime.now() : chargingOrder.getEndTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
queryEquipChargeStatusResult.setTotalPower(chargingOrder.getElectricity());
- queryEquipChargeStatusResult.setElecMoney(chargingOrder.getTotalElectricity());
- queryEquipChargeStatusResult.setSeviceMoney(chargingOrder.getServiceCharge());
- queryEquipChargeStatusResult.setTotalMoney(chargingOrder.getTotalElectricity().add(chargingOrder.getServiceCharge()));
+
+
+ List<TChargingOrderAccountingStrategy> data = chargingOrderAccountingStrategyClient.getChargingOrderAccountingStrategyByOrderId(chargingOrder.getId()).getData();
+ if(data.size() > 0){
+ BigDecimal totalElectricity = data.stream().map(TChargingOrderAccountingStrategy::getPeriodElectricPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal serviceCharge = data.stream().map(TChargingOrderAccountingStrategy::getPeriodServicePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal totalMoney = totalElectricity.add(serviceCharge).setScale(4, RoundingMode.HALF_EVEN);
+ queryEquipChargeStatusResult.setElecMoney(totalElectricity);
+ queryEquipChargeStatusResult.setSeviceMoney(serviceCharge);
+ queryEquipChargeStatusResult.setTotalMoney(totalMoney);
+ }else if(null != chargingOrder.getRechargeAmount() && null != chargingOrder.getResidualAmount()){
+ queryEquipChargeStatusResult.setElecMoney(chargingOrder.getRechargeAmount().subtract(chargingOrder.getResidualAmount()));
+ queryEquipChargeStatusResult.setSeviceMoney(BigDecimal.ZERO);
+ queryEquipChargeStatusResult.setTotalMoney(chargingOrder.getRechargeAmount().subtract(chargingOrder.getResidualAmount()));
+ }else{
+ queryEquipChargeStatusResult.setElecMoney(BigDecimal.ZERO);
+ queryEquipChargeStatusResult.setSeviceMoney(BigDecimal.ZERO);
+ queryEquipChargeStatusResult.setTotalMoney(BigDecimal.ZERO);
+ }
//构建充电明细
List<ChargeDetail> chargeDetails = new ArrayList<>();
- List<TChargingOrderAccountingStrategy> data = chargingOrderAccountingStrategyClient.getChargingOrderAccountingStrategyByOrderId(chargingOrder.getId()).getData();
- LocalDateTime startTime = chargingOrder.getStartTime();
- LocalDateTime endTime = chargingOrder.getEndTime();
+ LocalDateTime startTime = null == chargingOrder.getStartTime() ? LocalDateTime.now() : chargingOrder.getStartTime();
+ LocalDateTime endTime = null == chargingOrder.getEndTime() ? LocalDateTime.now() : chargingOrder.getEndTime();
String s_format = startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
String e_format = endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
for (TChargingOrderAccountingStrategy datum : data) {
@@ -1061,7 +1269,7 @@
}
chargeDetail.setElecPrice(datum.getElectrovalence());
chargeDetail.setSevicePrice(datum.getServiceCharge());
- chargeDetail.setDetailPower(datum.getChargingCapacity());
+ chargeDetail.setDetailPower(datum.getChargingCapacity().setScale(2, BigDecimal.ROUND_HALF_UP));
chargeDetail.setDetailElecMoney(datum.getPeriodElectricPrice());
chargeDetail.setDetailSeviceMoney(datum.getPeriodServicePrice());
chargeDetails.add(chargeDetail);
@@ -1077,7 +1285,7 @@
* @return
*/
@PostMapping("/notificationEquipChargeStatus")
- public R notificationEquipChargeStatus(@RequestParam("startChargeSeq") String startChargeSeq, @RequestParam("operatorId") Integer operatorId){
+ public R notificationEquipChargeStatus(@RequestParam(value = "startChargeSeq") String startChargeSeq, @RequestParam(value = "operatorId") Integer operatorId){
QueryEquipChargeStatusResult queryEquipChargeStatusResult = buildQueryEquipChargeStatusResult(startChargeSeq);
Operator operator = operatorClient.getOperatorById(operatorId).getData();
NotificationEquipChargeStatusResult notificationEquipChargeStatusResult = TCECUtil.notificationEquipChargeStatus(operator, queryEquipChargeStatusResult);
@@ -1119,16 +1327,20 @@
*/
@PostMapping("/query_stop_charge")
public BaseResult queryStopCharge(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
+ log.info("三方平台请求停止充电请求参数：" + JacksonUtils.toJson(baseRequest));
//校验token和签名
BaseResult baseResult = requestCheck(true, baseRequest, request);
if(0 != baseResult.getRet()){
+ log.info("三方平台请求停止充电响应Data：");
baseResult.setData("");
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台请求停止充电响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
Operator operator = baseResult.getOperator();
//解密参数
- String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
+ log.info("三方平台请求停止充电请求Data：" + decrypt);
QueryStopCharge queryStopCharge = JSON.parseObject(decrypt, QueryStopCharge.class);
QueryStopChargeResult queryStopChargeResult = new QueryStopChargeResult();
queryStopChargeResult.setStartChargeSeq(queryStopCharge.getStartChargeSeq());
@@ -1138,21 +1350,26 @@
//执行停机操作
R r = chargingOrderClient.tripartitePlatformStopCharge(queryStopCharge.getStartChargeSeq());
if(200 != r.getCode()){
+ log.info("三方平台请求停止充电失败：" + r.getMsg());
queryStopChargeResult.setStartChargeSeqStat(5);
queryStopChargeResult.setSuccStat(1);
queryStopChargeResult.setFailReason(3);
//参数加密
- String jsonString = JSON.toJSONString(queryStopChargeResult);
+ String jsonString = JacksonUtils.toJson(queryStopChargeResult);
+ log.info("三方平台请求停止充电响应Data：" + jsonString);
String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台请求停止充电响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
//参数加密
- String jsonString = JSON.toJSONString(queryStopChargeResult);
+ String jsonString = JacksonUtils.toJson(queryStopChargeResult);
+ log.info("三方平台请求停止充电响应Data：" + jsonString);
String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台请求停止充电响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
@@ -1260,16 +1477,30 @@
notificationChargeOrderInfo.setStartChargeSeq(startChargeSeq);
TChargingOrder chargingOrder = chargingOrderClient.getChargingOrderByStartChargeSeq(startChargeSeq).getData();
if(null == chargingOrder){
+ log.info("三方平台流水号获取订单失败");
return null;
}
- notificationChargeOrderInfo.setConnectorID(chargingOrder.getChargingGunId().toString());
+ TChargingGun chargingGun = chargingGunClient.getChargingGunById(chargingOrder.getChargingGunId()).getData();
+ notificationChargeOrderInfo.setConnectorID(chargingGun.getFullNumber());
notificationChargeOrderInfo.setStartTime((null == chargingOrder.getStartTime() ? chargingOrder.getCreateTime() : chargingOrder.getStartTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- notificationChargeOrderInfo.setEndTime((null == chargingOrder.getStartTime() ? LocalDateTime.now() : chargingOrder.getEndTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ notificationChargeOrderInfo.setEndTime((null == chargingOrder.getEndTime() ? LocalDateTime.now() : chargingOrder.getEndTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
notificationChargeOrderInfo.setTotalPower(chargingOrder.getElectricity());
- notificationChargeOrderInfo.setTotalElecMoney(chargingOrder.getTotalElectricity());
- notificationChargeOrderInfo.setTotalSeviceMoney(chargingOrder.getServiceCharge());
- notificationChargeOrderInfo.setTotalMoney(chargingOrder.getTotalElectricity().add(chargingOrder.getServiceCharge()));
- notificationChargeOrderInfo.setTotalDelayMoney(BigDecimal.ZERO);
+
+ List<TChargingOrderAccountingStrategy> data = chargingOrderAccountingStrategyClient.getChargingOrderAccountingStrategyByOrderId(chargingOrder.getId()).getData();
+ if(data.size() > 0){
+ BigDecimal totalElectricity = data.stream().map(TChargingOrderAccountingStrategy::getPeriodElectricPrice).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(4, RoundingMode.HALF_EVEN);
+ BigDecimal serviceCharge = data.stream().map(TChargingOrderAccountingStrategy::getPeriodServicePrice).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(4, RoundingMode.HALF_EVEN);
+ BigDecimal totalMoney = totalElectricity.add(serviceCharge).setScale(4, RoundingMode.HALF_EVEN);
+ notificationChargeOrderInfo.setTotalElecMoney(totalElectricity);
+ notificationChargeOrderInfo.setTotalSeviceMoney(serviceCharge);
+ notificationChargeOrderInfo.setTotalMoney(totalMoney);
+ }else{
+ notificationChargeOrderInfo.setTotalElecMoney(chargingOrder.getRechargeAmount().subtract(chargingOrder.getResidualAmount()));
+ notificationChargeOrderInfo.setTotalSeviceMoney(BigDecimal.ZERO);
+ notificationChargeOrderInfo.setTotalMoney(chargingOrder.getRechargeAmount().subtract(chargingOrder.getResidualAmount()));
+ }
+
+
TParkingRecord parkingRecord = parkingRecordClient.getParkingRecordByChargingOrderId(chargingOrder.getId()).getData();
if(null != parkingRecord && parkingRecord.getStatus() == 3){
notificationChargeOrderInfo.setTotalDelayMoney(parkingRecord.getPayment());
@@ -1293,10 +1524,9 @@
//构建充电明细
List<ChargeDetail> chargeDetails = new ArrayList<>();
- List<TChargingOrderAccountingStrategy> data = chargingOrderAccountingStrategyClient.getChargingOrderAccountingStrategyByOrderId(chargingOrder.getId()).getData();
- LocalDateTime startTime = chargingOrder.getStartTime();
- LocalDateTime endTime = chargingOrder.getEndTime();
+ LocalDateTime startTime = null == chargingOrder.getStartTime() ? LocalDateTime.now() : chargingOrder.getStartTime();
+ LocalDateTime endTime = null == chargingOrder.getEndTime() ? LocalDateTime.now() : chargingOrder.getEndTime();
String s_format = startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
String e_format = endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
for (TChargingOrderAccountingStrategy datum : data) {
@@ -1316,7 +1546,7 @@
}
chargeDetail.setElecPrice(datum.getElectrovalence());
chargeDetail.setSevicePrice(datum.getServiceCharge());
- chargeDetail.setDetailPower(datum.getChargingCapacity());
+ chargeDetail.setDetailPower(datum.getChargingCapacity().setScale(2, BigDecimal.ROUND_HALF_UP));
chargeDetail.setDetailElecMoney(datum.getPeriodElectricPrice());
chargeDetail.setDetailSeviceMoney(datum.getPeriodServicePrice());
chargeDetails.add(chargeDetail);
@@ -1327,34 +1557,43 @@
/**
- * 二维码查询抢号（快电）
+ * 二维码查询枪号（快电）
* @param baseRequest
* @param request
* @return
*/
@PostMapping("/query_terminal_code")
public BaseResult queryTerminalCode(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
+ log.info("三方平台二维码查询枪号请求参数：" + JacksonUtils.toJson(baseRequest));
//校验token和签名
BaseResult baseResult = requestCheck(true, baseRequest, request);
if(0 != baseResult.getRet()){
+ log.info("三方平台二维码查询枪号响应Data：");
baseResult.setData("");
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台二维码查询枪号响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
Operator operator = baseResult.getOperator();
//解密参数
- String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
+ log.info("三方平台二维码查询枪号请求Data：" + decrypt);
QueryTerminalCode queryTerminalCode = JSON.parseObject(decrypt, QueryTerminalCode.class);
String qrCode = queryTerminalCode.getQRCode();
String substring = qrCode.substring(qrCode.indexOf("=") + 1);
+ TChargingGun chargingGun = chargingGunClient.getChargingGunByFullNumber(substring).getData();
QueryTerminalCodeResult queryTerminalCodeResult = new QueryTerminalCodeResult();
- queryTerminalCodeResult.setTerminalCode(substring);
+ if(null != chargingGun){
+ queryTerminalCodeResult.setTerminalCode(chargingGun.getId().toString());
+ }
//参数加密
- String jsonString = JSON.toJSONString(queryTerminalCodeResult);
+ String jsonString = JacksonUtils.toJson(queryTerminalCodeResult);
+ log.info("三方平台二维码查询枪号响应Data：" + jsonString);
String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台二维码查询枪号响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
@@ -1392,7 +1631,7 @@
//待处理相关业务逻辑
}
//参数加密
- String jsonString = JSON.toJSONString(notificationChargeCarnumResult);
+ String jsonString = JacksonUtils.toJson(notificationChargeCarnumResult);
String encrypt = AESUtil.encrypt(jsonString, operator.getDataSecret(), operator.getDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.buildSign(baseResult));
@@ -1408,24 +1647,30 @@
*/
@PostMapping("/query_charge_order_info")
public BaseResult queryChargeOrderInfo(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
+ log.info("三方平台账单拉取请求参数：" + JacksonUtils.toJson(baseRequest));
//校验token和签名
BaseResult baseResult = requestCheck(true, baseRequest, request);
if(0 != baseResult.getRet()){
+ log.info("三方平台账单拉取响应Data：");
baseResult.setData("");
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台账单拉取响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
Operator operator = baseResult.getOperator();
//解密参数
- String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
+ log.info("三方平台账单拉取请求Data：" + decrypt);
QueryChargeOrderInfo queryChargeOrderInfo = JSON.parseObject(decrypt, QueryChargeOrderInfo.class);
//构建返回结果
QueryChargeOrderInfoResult result = buildQueryChargeOrderInfoResult(queryChargeOrderInfo);
//参数加密
- String jsonString = JSON.toJSONString(result);
+ String jsonString = JacksonUtils.toJson(result);
+ log.info("三方平台账单拉取响应Data：" + jsonString);
String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
baseResult.setData(encrypt);
baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
+ log.info("三方平台账单拉取响应参数：" + JacksonUtils.toJson(baseResult));
return baseResult;
}
@@ -1446,11 +1691,12 @@
if(null == chargingOrder){
return null;
}
+ TChargingGun chargingGun = chargingGunClient.getChargingGunById(chargingOrder.getChargingGunId()).getData();
OrderInfo orderInfo = new OrderInfo();
orderInfo.setStartChargeSeq(chargingOrder.getStartChargeSeq());
- orderInfo.setConnectorID(chargingOrder.getChargingGunId().toString());
+ orderInfo.setConnectorID(chargingGun.getFullNumber());
orderInfo.setStartTime((null == chargingOrder.getStartTime() ? chargingOrder.getCreateTime() : chargingOrder.getStartTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- orderInfo.setEndTime((null == chargingOrder.getStartTime() ? LocalDateTime.now() : chargingOrder.getEndTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ orderInfo.setEndTime((null == chargingOrder.getEndTime() ? LocalDateTime.now() : chargingOrder.getEndTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
orderInfo.setTotalPower(chargingOrder.getTotalElectricity());
orderInfo.setTotalElecMoney(chargingOrder.getElectrovalence());
orderInfo.setTotalSeviceMoney(chargingOrder.getServiceCharge());
@@ -1475,7 +1721,7 @@
List<TChargingOrderAccountingStrategy> data = chargingOrderAccountingStrategyClient.getChargingOrderAccountingStrategyByOrderId(chargingOrder.getId()).getData();
LocalDateTime startTime = chargingOrder.getStartTime();
- LocalDateTime endTime = chargingOrder.getEndTime();
+ LocalDateTime endTime = null == chargingOrder.getEndTime() ? LocalDateTime.now() : chargingOrder.getEndTime();
String s_format = startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
String e_format = endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
for (TChargingOrderAccountingStrategy datum : data) {
@@ -1495,7 +1741,7 @@
}
chargeDetail.setElecPrice(datum.getElectrovalence());
chargeDetail.setSevicePrice(datum.getServiceCharge());
- chargeDetail.setDetailPower(datum.getChargingCapacity());
+ chargeDetail.setDetailPower(datum.getChargingCapacity().setScale(2, BigDecimal.ROUND_HALF_EVEN));
chargeDetail.setDetailElecMoney(datum.getPeriodElectricPrice());
chargeDetail.setDetailSeviceMoney(datum.getPeriodServicePrice());
chargeDetails.add(chargeDetail);
@@ -1506,4 +1752,562 @@
queryChargeOrderInfoResult.setOrderInfos(orderInfos);
return queryChargeOrderInfoResult;
}
+
+
+
+ /*********************数据监管平台接口*********************/
+ /**
+ * 查询运营商信息
+ * @param baseRequest
+ * @param request
+ * @return
+ */
+ @PostMapping("/supervise_query_operator_info")
+ public BaseResult superviseQueryOperatorInfo(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
+ //解密参数
+ String decrypt = AESUtil.decrypt(baseRequest.getData(), OurDataSecret, OurDataSecretIV);
+ log.info("监管平台查询充电站信息请求Data：" + decrypt);
+ SuperviseQueryOperatorInfo superviseQueryOperatorInfo = JSON.parseObject(decrypt, SuperviseQueryOperatorInfo.class);
+ Integer pageNo = superviseQueryOperatorInfo.getPageNo();
+ Integer pageSize = superviseQueryOperatorInfo.getPageSize();
+ if(null == pageNo){
+ pageNo = 1;
+ }
+ if(null == pageSize){
+ pageSize = 50;
+ }
+ String operatorTel = systemConfigurationClient.getServerPhone().getData();
+ SuperviseQueryOperatorInfoResultPage superviseQueryOperatorInfoResultPage = new SuperviseQueryOperatorInfoResultPage();
+ superviseQueryOperatorInfoResultPage.setPageNo(1);
+ superviseQueryOperatorInfoResultPage.setPageCount(1);
+ superviseQueryOperatorInfoResultPage.setItemSize(1);
+
+ SuperviseQueryOperatorInfoResult superviseQueryOperatorInfoResult = new SuperviseQueryOperatorInfoResult();
+ superviseQueryOperatorInfoResult.setOperatorID("906171535");
+ superviseQueryOperatorInfoResult.setOperatorUSCID("91510903906171535D");
+ superviseQueryOperatorInfoResult.setOperatorName("四川明星新能源科技有限公司");
+ superviseQueryOperatorInfoResult.setOperatorTel1(operatorTel);
+ List<SuperviseQueryOperatorInfoResult> superviseQueryOperatorInfoResults = new ArrayList<>();
+ superviseQueryOperatorInfoResults.add(superviseQueryOperatorInfoResult);
+ // 将superviseQueryOperatorInfoResults转化为json数组
+ superviseQueryOperatorInfoResultPage.setOperatorInfos(superviseQueryOperatorInfoResults);
+ String jsonString = JacksonUtils.toJson(superviseQueryOperatorInfoResultPage);
+ String timeStamp = System.currentTimeMillis() + "";
+ SequenceGenerator generator = new SequenceGenerator();
+ String nextSequence = generator.getNextSequence();
+ String data = AesEncryption.encrypt(OurDataSecret, OurDataSecretIV,JSONObject.toJSONString(superviseQueryOperatorInfoResultPage));
+ String hmacMD5 = HMacMD5Util.getHMacMD5(OperatorID,timeStamp, data,nextSequence,OurSigSecret);
+ BaseResult baseResult = new BaseResult();
+ baseResult.setData(data);
+ baseResult.setSig(hmacMD5);
+ baseResult.setRet(0);
+ baseResult.setMsg("OK");
+ baseResult.setOperatorID(OperatorID);
+ return baseResult;
+ }
+
+
+
+ /**
+ * 查询充电站信息
+ * @param baseRequest
+ * @param request
+ * @return
+ */
+ @PostMapping("/supervise_query_stations_info")
+ public BaseResult superviseQueryStationsInfo(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
+ String decrypt = AESUtil.decrypt(baseRequest.getData(), OurDataSecret, OurDataSecretIV);
+ log.info("监管平台supervise_query_stations_infoData：" + decrypt);
+ //解密参数
+ QueryStationsInfo queryStationsInfo = JSON.parseObject(decrypt, QueryStationsInfo.class);
+ Integer pageNo = queryStationsInfo.getPageNo();
+ Integer pageSize = queryStationsInfo.getPageSize();
+ List<String> stationIDs = queryStationsInfo.getStationIDs();
+ if(null == pageNo){
+ pageNo = 1;
+ }
+ if(null == pageSize){
+ pageSize = 50;
+ }
+ PageInfo<Site> siteListPaging = siteClient.getSiteListPaging(pageNo, pageSize, stationIDs, -1);
+ List<TParkingLot> parkingLots = parkingLotClient.getAllParkingLot().getData();
+ QueryStationsInfoResult queryStationsInfoResult = new QueryStationsInfoResult();
+ queryStationsInfoResult.setPageNo(pageNo);
+ queryStationsInfoResult.setPageCount((0 == (siteListPaging.getTotal() % pageSize) ? 0 : 1) + Double.valueOf(siteListPaging.getTotal() / pageSize).intValue());
+ queryStationsInfoResult.setItemSize(Long.valueOf(siteListPaging.getTotal()).intValue());
+ queryStationsInfoResult.setStationInfos(buildSite(parkingLots, siteListPaging.getRecords()));
+ String timeStamp = System.currentTimeMillis() + "";
+ SequenceGenerator generator = new SequenceGenerator();
+ String nextSequence = generator.getNextSequence();
+ String data = AesEncryption.encrypt(OurDataSecret, OurDataSecretIV,JSONObject.toJSONString(queryStationsInfoResult));
+ String hmacMD5 = HMacMD5Util.getHMacMD5(OurOperatorID,timeStamp, data,nextSequence,OurSigSecret);
+ BaseResult baseResult = new BaseResult();
+ baseResult.setData(data);
+ baseResult.setSig(hmacMD5);
+ baseResult.setRet(0);
+ baseResult.setMsg("OK");
+ baseResult.setOperatorID(OurOperatorID);
+ return baseResult;
+ }
+ /**
+ * 查询充换电站状态信息
+ * @param baseRequest
+ * @param request
+ * @return
+ */
+ @PostMapping("/supervise_query_station_status")
+ public BaseResult superviseQueryStationStatus(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
+ log.info("监管平台查询充换电站状态信息请求参数：" + JacksonUtils.toJson(baseRequest));
+ String decrypt = AESUtil.decrypt(baseRequest.getData(), OurDataSecret, OurDataSecretIV);
+ log.info("监管平台supervise_query_station_statusData：" + decrypt);
+ //解密参数
+ log.info("监管平台查询充换电站状态信息请求Data：" + decrypt);
+ QueryStationStatus queryStationStatus = JSON.parseObject(decrypt, QueryStationStatus.class);
+ List<String> stationIDs = queryStationStatus.getStationIDs();
+ String operatorID = queryStationStatus.getOperatorID();
+
+ List<Integer> stationIDList = new ArrayList<>();
+ for (String stationID : stationIDs) {
+ stationIDList.add(Integer.valueOf(stationID));
+ }
+
+ QueryStationStatusResult queryStationStatusResult = new QueryStationStatusResult();
+ List<StationStatusInfo> stationStatusInfos = new ArrayList<>();
+
+ // 查询站点下的桩信息状态
+ List<TChargingPile> chargingPiles = chargingPileClient.getChargingPileBySiteIds(stationIDList).getData();
+ if(!CollectionUtils.isEmpty(chargingPiles)){
+ List<Integer> pileIds = chargingPiles.stream().map(TChargingPile::getId).collect(Collectors.toList());
+ GetChargingGunByChargingPileIdsVo vo = new GetChargingGunByChargingPileIdsVo();
+ vo.setChargingPileIds(pileIds);
+ List<TChargingGun> chargingGuns = chargingGunClient.getChargingGunByChargingPileIds(vo).getData();
+ if(!CollectionUtils.isEmpty(chargingGuns)){
+ for (Integer stationID : stationIDList) {
+ StationStatusInfo stationStatusInfo = new StationStatusInfo();
+ stationStatusInfo.setOperatorID(operatorID);
+ stationStatusInfo.setEquipmentOwnerID(operatorId);
+ stationStatusInfo.setStationID(String.valueOf(stationID));
+ List<ConnectorStatusInfo> connectorStatusInfos = new ArrayList<>();
+ for (TChargingGun chargingGun : chargingGuns) {
+ ConnectorStatusInfo connectorStatusInfo = new ConnectorStatusInfo();
+ connectorStatusInfo.setOperatorID(operatorId);
+ connectorStatusInfo.setEquipmentOwnerID(operatorId);
+ connectorStatusInfo.setStationID(String.valueOf(chargingGun.getSiteId()));
+ connectorStatusInfo.setEquipmentID(String.valueOf(chargingGun.getChargingPileId()));
+ connectorStatusInfo.setConnectorID(chargingGun.getFullNumber());
+ connectorStatusInfo.setEquipmentClassification(1);
+ switch (chargingGun.getStatus()){
+ case 1:
+ connectorStatusInfo.setStatus(0);
+ break;
+ case 2:
+ connectorStatusInfo.setStatus(1);
+ break;
+ case 3:
+ connectorStatusInfo.setStatus(2);
+ break;
+ case 4:
+ connectorStatusInfo.setStatus(3);
+ break;
+ case 5:
+ connectorStatusInfo.setStatus(3);
+ break;
+ case 6:
+ connectorStatusInfo.setStatus(4);
+ break;
+ case 7:
+ connectorStatusInfo.setStatus(255);
+ break;
+ }
+ connectorStatusInfo.setUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+ connectorStatusInfos.add(connectorStatusInfo);
+ }
+ stationStatusInfo.setConnectorStatusInfos(connectorStatusInfos);
+ stationStatusInfos.add(stationStatusInfo);
+ }
+ }
+ queryStationStatusResult.setStationStatusInfos(stationStatusInfos);
+ }
+ String timeStamp = System.currentTimeMillis() + "";
+ SequenceGenerator generator = new SequenceGenerator();
+ String nextSequence = generator.getNextSequence();
+ String data = AesEncryption.encrypt(OurDataSecret, OurDataSecretIV,JSONObject.toJSONString(queryStationStatusResult));
+ String hmacMD5 = HMacMD5Util.getHMacMD5(OurOperatorID,timeStamp, data,nextSequence,OurSigSecret);
+ BaseResult baseResult = new BaseResult();
+ baseResult.setData(data);
+ baseResult.setSig(hmacMD5);
+ baseResult.setRet(0);
+ baseResult.setMsg("OK");
+ baseResult.setOperatorID(OurOperatorID);
+ return baseResult;
+ }
+
+ // 测试环境
+ private static final String OperatorID = "MA01H3BQ2";
+ private static final String OperatorSecret = "f1331ef0b37c2d1b";
+ private static final String SigSecret = "a6fedf0e1b27d6f7";
+ private static final String DataSecret = "50a61b93919c9604";
+ private static final String DataSecretIV = "7c8ac6861661d584";
+
+ private static final String OurDataSecret = "50a61b93919c9605";
+ private static final String OurDataSecretIV = "7c8ac6861661d585";
+ private static final String OurSigSecret = "a6fedf0e1b27d6f6";
+ private static final String OurOperatorID = "MA01H3BQ3";
+ private static final String OurOperatorSecret = "f1331ef0b37c2d1a";
+
+
+
+
+ /**
+ * 推送充电设备接口状态信息
+ * @param chargingGun
+ * @return
+ */
+ public R pushSuperviseNotificationStationStatus(TChargingGun chargingGun){
+ ConnectorStatusInfo connectorStatusInfo = new ConnectorStatusInfo();
+ connectorStatusInfo.setOperatorID(operatorId);
+ connectorStatusInfo.setEquipmentOwnerID(operatorId);
+ connectorStatusInfo.setStationID(String.valueOf(chargingGun.getSiteId()));
+ connectorStatusInfo.setEquipmentID(String.valueOf(chargingGun.getChargingPileId()));
+ connectorStatusInfo.setConnectorID(chargingGun.getFullNumber());
+ connectorStatusInfo.setEquipmentClassification(1);
+ switch (chargingGun.getStatus()){
+ case 1:
+ connectorStatusInfo.setStatus(0);
+ break;
+ case 2:
+ connectorStatusInfo.setStatus(1);
+ break;
+ case 3:
+ connectorStatusInfo.setStatus(2);
+ break;
+ case 4:
+ connectorStatusInfo.setStatus(3);
+ break;
+ case 5:
+ connectorStatusInfo.setStatus(3);
+ break;
+ case 6:
+ connectorStatusInfo.setStatus(4);
+ break;
+ case 7:
+ connectorStatusInfo.setStatus(255);
+ break;
+ }
+ connectorStatusInfo.setUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+ List<Operator> operators = operatorClient.getAllOperator().getData();
+ for (Operator operator : operators) {
+ tcecSuperviseUtil.notificationStationStatus(operator, connectorStatusInfo);
+ }
+ return R.ok();
+ }
+ /**
+ * 推送充电状态信息
+ * @param chargingOrder
+ * @return
+ */
+ public R pushSuperviseNotificationEquipChargeStatus(TChargingOrder chargingOrder){
+ SupEquipChargeStatus supEquipChargeStatus = new SupEquipChargeStatus();
+ supEquipChargeStatus.setOperatorID(operatorId);
+ supEquipChargeStatus.setEquipmentOwnerID(operatorId);
+ supEquipChargeStatus.setStationID(String.valueOf(chargingOrder.getSiteId()));
+ supEquipChargeStatus.setEquipmentID(String.valueOf(chargingOrder.getChargingPileId()));
+ supEquipChargeStatus.setOrderNo(operatorId+chargingOrder.getCode());
+ switch (chargingOrder.getStatus()){
+ case 2:
+ supEquipChargeStatus.setConnectorStatus(1);
+ break;
+ case 3:
+ supEquipChargeStatus.setConnectorStatus(2);
+ break;
+ case 4:
+ supEquipChargeStatus.setConnectorStatus(3);
+ break;
+ case 5:
+ supEquipChargeStatus.setConnectorStatus(4);
+ break;
+ }
+ TChargingGun chargingGun = chargingGunClient.getChargingGunById(chargingOrder.getChargingGunId()).getData();
+ supEquipChargeStatus.setConnectorID(chargingGun.getFullNumber());
+ supEquipChargeStatus.setEquipmentClassification(1);
+ supEquipChargeStatus.setPushTimeStamp(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+ switch (chargingGun.getStatus()){
+ case 1:
+ supEquipChargeStatus.setConnectorStatus(0);
+ break;
+ case 2:
+ supEquipChargeStatus.setConnectorStatus(1);
+ break;
+ case 3:
+ supEquipChargeStatus.setConnectorStatus(2);
+ break;
+ case 4:
+ supEquipChargeStatus.setConnectorStatus(3);
+ break;
+ case 5:
+ supEquipChargeStatus.setConnectorStatus(3);
+ break;
+ case 6:
+ supEquipChargeStatus.setConnectorStatus(4);
+ break;
+ case 7:
+ supEquipChargeStatus.setConnectorStatus(255);
+ break;
+ }
+ supEquipChargeStatus.setCurrentA(chargingOrder.getCurrent());
+ supEquipChargeStatus.setSOC(new BigDecimal(chargingOrder.getEndSoc()));
+ supEquipChargeStatus.setStartTime(chargingOrder.getStartTime() != null ? chargingOrder.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : "");
+ supEquipChargeStatus.setEndTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+ supEquipChargeStatus.setTotalPower(chargingOrder.getElectrovalence());
+ List<Operator> operators = operatorClient.getAllOperator().getData();
+ for (Operator operator : operators) {
+ tcecSuperviseUtil.notificationSupEquipChargeStatus(operator, supEquipChargeStatus);
+ }
+ return R.ok();
+ }
+ /**
+ * 推送充电订单信息
+ * @param chargingOrder
+ * @return
+ */
+ public R pushSuperviseNotificationChargeOrderInfo(TChargingOrder chargingOrder){
+ SupChargeOrderInfo supChargeOrderInfo = new SupChargeOrderInfo();
+ supChargeOrderInfo.setOperatorID(operatorId);
+ supChargeOrderInfo.setEquipmentOwnerID(operatorId);
+ supChargeOrderInfo.setStationID(String.valueOf(chargingOrder.getSiteId()));
+ supChargeOrderInfo.setEquipmentID(String.valueOf(chargingOrder.getChargingPileId()));
+ supChargeOrderInfo.setOrderNo(operatorId+chargingOrder.getCode());
+ TChargingGun chargingGun = chargingGunClient.getChargingGunById(chargingOrder.getChargingGunId()).getData();
+ supChargeOrderInfo.setConnectorID(chargingGun.getFullNumber());
+ supChargeOrderInfo.setEquipmentClassification(1);
+ supChargeOrderInfo.setPushTimeStamp(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+ supChargeOrderInfo.setStartTime(chargingOrder.getStartTime() != null ? chargingOrder.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : "");
+ supChargeOrderInfo.setEndTime(chargingOrder.getEndTime() != null ? chargingOrder.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : "");
+ supChargeOrderInfo.setTotalPower(chargingOrder.getElectrovalence());
+ supChargeOrderInfo.setTotalElecMoney(chargingOrder.getElectrovalence());
+ supChargeOrderInfo.setTotalServiceMoney(chargingOrder.getServiceCharge());
+ supChargeOrderInfo.setTotalMoney(chargingOrder.getOrderAmount());
+ switch (chargingOrder.getEndMode()){
+ case 0:
+ supChargeOrderInfo.setStopReason(5);
+ supChargeOrderInfo.setStopDesc("异常终止");
+ break;
+ case 1:
+ supChargeOrderInfo.setStopReason(0);
+ supChargeOrderInfo.setStopDesc("用户手动停止充电");
+ break;
+ case 2:
+ supChargeOrderInfo.setStopReason(1);
+ supChargeOrderInfo.setStopDesc("客户归属地运营商平台停止充电");
+ break;
+ case 3:
+ supChargeOrderInfo.setStopReason(1);
+ supChargeOrderInfo.setStopDesc("费用不足中止");
+ break;
+ }
+
+ List<Operator> operators = operatorClient.getAllOperator().getData();
+ for (Operator operator : operators) {
+ tcecSuperviseUtil.notificationChargeOrderInfo(operator, supChargeOrderInfo);
+ }
+ return R.ok();
+ }
+
+
+
+//
+//
+// /**
+// * 构建站点数据
+// * @param sites
+// * @return
+// */
+// public List<StationInfo> superviseBuildSite(List<TParkingLot> parkingLots, List<Site> sites){
+// List<Integer> siteIds = sites.stream().map(Site::getId).collect(Collectors.toList());
+// List<TChargingPile> tChargingPiles = chargingPileClient.getChargingPileBySiteIds(siteIds).getData();
+// List<Integer> collect1 = tChargingPiles.stream().map(TChargingPile::getId).collect(Collectors.toList());
+// List<TChargingGun> chargingGunList = chargingGunClient.getChargingGunByChargingPileIds(collect1).getData();
+// String serviceTel = systemConfigurationClient.getServerPhone().getData();
+// List<StationInfo> StationInfos = new ArrayList<>();
+// for (Site datum : sites) {
+// StationInfo stationInfo = new StationInfo();
+// stationInfo.setStationID(datum.getId().toString());
+// stationInfo.setStationUniqueNumber(datum.getDistrictsCode() + "906171535" + datum.getId());
+// stationInfo.setOperatorID("906171535");
+// stationInfo.setEquipmentOwnerID("906171535");
+// stationInfo.setStationName(datum.getName());
+// stationInfo.setCountryCode(StringUtils.isNotEmpty(datum.getCountryCode()) ? datum.getCountryCode() : "CN");
+// stationInfo.setAreaCode(datum.getDistrictsCode());
+// stationInfo.setAreaCodeCountryside();
+// stationInfo.setAddress(datum.getAddress());
+// stationInfo.setStationTel(datum.getPhone());
+// stationInfo.setServiceTel(serviceTel);
+// switch (datum.getSiteType()){
+// case 0:
+// stationInfo.setStationType(StationTypeEnum.OTHER.getType());
+// break;
+// case 1:
+// stationInfo.setStationType(StationTypeEnum.PUBLIC.getType());
+// break;
+// case 2:
+// stationInfo.setStationType(StationTypeEnum.PERSONAGE.getType());
+// break;
+// case 3:
+// stationInfo.setStationType(StationTypeEnum.BUS_SPECIFIC.getType());
+// break;
+// case 4:
+// stationInfo.setStationType(StationTypeEnum.SANITATION_SPECIFIC.getType());
+// break;
+// case 5:
+// stationInfo.setStationType(StationTypeEnum.LOGISTICS_SPECIFIC.getType());
+// break;
+// case 6:
+// stationInfo.setStationType(StationTypeEnum.TEXT_SPECIFIC.getType());
+// break;
+// }
+// if(datum.getStatus() == 1){
+// stationInfo.setStationStatus(StationStatusEnum.NORMAL_USE.getStatus());
+// }
+// if(datum.getStatus() == 2){
+// stationInfo.setStationStatus(StationStatusEnum.MAINTAIN.getStatus());
+// }
+// if(datum.getStatus() == 3){
+// stationInfo.setStationStatus(StationStatusEnum.OFF_LINE.getStatus());
+// }
+// stationInfo.setParkNums(datum.getParkingSpace());
+// stationInfo.setStationLat(new BigDecimal(datum.getLat()).setScale(6, RoundingMode.DOWN));
+// stationInfo.setStationLng(new BigDecimal(datum.getLon()).setScale(6, RoundingMode.DOWN));
+// stationInfo.setConstruction(datum.getConstructionSite() == 0 ? ConstructionEnum.OTHER.getType() : datum.getConstructionSite());
+// stationInfo.setPictures(StringUtils.isNotEmpty(datum.getImgUrl()) ? Arrays.asList(datum.getImgUrl().split(",")) : new ArrayList<>());
+// stationInfo.setSiteGuide(datum.getGuide());
+// stationInfo.setMatchCars(datum.getVehicleDescription());
+// stationInfo.setBusineHours(datum.getStartServiceTime() + "-" + datum.getEndServiceTime());
+// stationInfo.setElectricityFee(datum.getRateDescription());
+// //添加停车费信息
+// Optional<TParkingLot> first = parkingLots.stream().filter(s -> s.getSiteId().equals(datum.getId())).findFirst();
+// if(first.isPresent()){
+// TParkingLot tParkingLot = first.get();
+// superviseBuildPlaceHolder(tParkingLot, stationInfo);
+// }
+//
+// //构建充电设备信息数据
+// stationInfo.setEquipmentInfos(superviseBuildEquipmentInfo(datum.getId(), tChargingPiles, chargingGunList));
+// StationInfos.add(stationInfo);
+//
+// }
+// return StationInfos;
+// }
+//
+//
+// /**
+// * 构建停车费信息
+// * @param tParkingLot
+// * @param stationInfo
+// */
+// public void superviseBuildPlaceHolder(TParkingLot tParkingLot, StationInfo stationInfo){
+// stationInfo.setOvertimeFee(tParkingLot.getName() + "停车费");
+// PlaceHolder placeHolder = new PlaceHolder();
+// placeHolder.setFreeTime(tParkingLot.getChargeFreeDuration());
+// placeHolder.setMaxFee(tParkingLot.getChargeCapping());
+// List<PlaceHolderPrice> PlaceHolderPrices = new ArrayList<>();
+// PlaceHolderPrice placeHolderPrice = new PlaceHolderPrice();
+// placeHolderPrice.setStartTime("00:00");
+// placeHolderPrice.setEndTime("23:59");
+// placeHolderPrice.setPrice(tParkingLot.getChargeRate());
+// PlaceHolderPrices.add(placeHolderPrice);
+// placeHolder.setPlaceHolderPrices(PlaceHolderPrices);
+// stationInfo.setPlaceHolder(placeHolder);
+// }
+//
+//
+//
+//
+// /**
+// * 构建桩数据
+// * @param tChargingPiles
+// * @return
+// */
+// public List<EquipmentInfo> superviseBuildEquipmentInfo(Integer siteId, List<TChargingPile> tChargingPiles, List<TChargingGun> chargingGunList){
+// List<EquipmentInfo> equipmentInfos = new ArrayList<>();
+// List<TChargingPile> collect = tChargingPiles.stream().filter(s -> s.getSiteId().equals(siteId)).collect(Collectors.toList());
+// for (TChargingPile tChargingPile : collect) {
+// EquipmentInfo equipmentInfo = new EquipmentInfo();
+// equipmentInfo.setEquipmentID(tChargingPile.getId().toString());
+// equipmentInfo.setManufacturerID(tChargingPile.getManufacturerCode());
+// equipmentInfo.setManufacturerName(tChargingPile.getManufacturer());
+// equipmentInfo.setEquipmentModel(tChargingPile.getEquipmentType());
+// if(null != tChargingPile.getProductionDate()){
+// equipmentInfo.setProductionDate(tChargingPile.getProductionDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+// }
+// switch (tChargingPile.getType()){
+// case 0:
+// equipmentInfo.setEquipmentType(EquipmentTypeEnum.OTHER.getType());
+// break;
+// case 1:
+// equipmentInfo.setEquipmentType(EquipmentTypeEnum.DIRECT_CURRENT.getType());
+// break;
+// case 2:
+// equipmentInfo.setEquipmentType(EquipmentTypeEnum.ALTERNATING_CURRENT.getType());
+// break;
+// case 3:
+// equipmentInfo.setEquipmentType(EquipmentTypeEnum.ALTERNATING_DIRECT.getType());
+// break;
+// case 4:
+// equipmentInfo.setEquipmentType(EquipmentTypeEnum.WIRELESS_DEVICE.getType());
+// break;
+// }
+//
+// //构建设备接口信息
+// equipmentInfo.setConnectorInfos(superviseBuildConnectorInfos(tChargingPile.getId(), tChargingPile.getCode(), chargingGunList));
+// equipmentInfo.setPower(tChargingPile.getRatedPower());
+// equipmentInfos.add(equipmentInfo);
+// }
+// return equipmentInfos;
+// }
+//
+//
+// /**
+// * 构建接口数据
+// * @param chargingGunList
+// * @return
+// */
+// public List<ConnectorInfo> superviseBuildConnectorInfos(Integer chargingPileId, String code, List<TChargingGun> chargingGunList){
+// List<ConnectorInfo> connectorInfos = new ArrayList<>();
+// List<TChargingGun> collect = chargingGunList.stream().filter(s -> s.getChargingPileId().equals(chargingPileId)).collect(Collectors.toList());
+// for (TChargingGun chargingGun : collect) {
+// ConnectorInfo connectorInfo = new ConnectorInfo();
+// connectorInfo.setConnectorID(chargingGun.getFullNumber());
+// connectorInfo.setConnectorName(chargingGun.getName());
+// switch (chargingGun.getType()){
+// case 0:
+// connectorInfo.setConnectorType(ConnectorTypeEnum.OTHER.getType());
+// break;
+// case 1:
+// connectorInfo.setConnectorType(ConnectorTypeEnum.HOUSEHOLD_SOCKET.getType());
+// break;
+// case 2:
+// connectorInfo.setConnectorType(ConnectorTypeEnum.AC_SOCKET.getType());
+// break;
+// case 3:
+// connectorInfo.setConnectorType(ConnectorTypeEnum.AC_INTERFACE_PLUG.getType());
+// break;
+// case 4:
+// connectorInfo.setConnectorType(ConnectorTypeEnum.DC_INTERFACE_GUN_HEAD.getType());
+// break;
+// case 5:
+// connectorInfo.setConnectorType(ConnectorTypeEnum.WIRELESS_CHARGING_STAND.getType());
+// break;
+// }
+// connectorInfo.setVoltageUpperLimits(chargingGun.getUpperRatedVoltage().intValue());
+// connectorInfo.setVoltageLowerLimits(chargingGun.getLowerLimitOfRatedVoltage().intValue());
+// connectorInfo.setCurrent(chargingGun.getRatedCurrent().intValue());
+// connectorInfo.setPower(chargingGun.getRatedPower());
+// connectorInfo.setParkNo(chargingGun.getParkingNumber());
+// connectorInfo.setNationalStandard(Integer.valueOf(chargingGun.getNationalStandard()));
+// connectorInfo.setQRCode("https://mxcd.zhinenganguan.com?No=" + code + chargingGun.getCode());
+// connectorInfos.add(connectorInfo);
+// }
+// return connectorInfos;
+// }
+
}
--
Gitblit v1.7.1