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

update 南瑞平台相关接口

Browse Source
This commit is contained in:
Lemon
2023-10-12 16:35:53 +08:00
parent cf4a9bf72f
commit e37ad1e423
14 changed files with 586 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
jsowell-pile/src/main/java/com/jsowell/pile/dto/nanrui/PushAlarmInfoDTO.java Normal file
View File

@@ -0,0 +1,23 @@
package com.jsowell.pile.dto.nanrui;
import com.jsowell.pile.dto.PushStationInfoDTO;
import lombok.Data;
/**
* 推送告警信息DTO
*
* @author Lemon
* @Date 2023/10/12 15:33
*/
@Data
public class PushAlarmInfoDTO extends PushStationInfoDTO {
/**
* 枪口号
*/
private String pileConnectorCode;
/**
* 枪口状态
*/
private String connectorStatus;
}

3
jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
View File

@@ -7,6 +7,7 @@ import com.jsowell.pile.dto.*;
import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO;
import com.jsowell.pile.vo.base.MerchantOrderInfoVO;
import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
import com.jsowell.pile.vo.nanrui.NROrderInfoVO;
import com.jsowell.pile.vo.uniapp.OrderVO;
import com.jsowell.pile.vo.uniapp.PersonPileConnectorSumInfoVO;
import com.jsowell.pile.vo.uniapp.SendMessageVO;
@@ -254,5 +255,5 @@ public interface OrderBasicInfoMapper {
* @param dto
* @return
*/
List<NROrderInfo> getNROrderInfoByOrderCode(@Param("dto") NRQueryOrderDTO dto);
List<NROrderInfoVO> getNROrderInfoByOrderCode(@Param("dto") NRQueryOrderDTO dto);
}

5
jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java
View File

@@ -14,6 +14,7 @@ import com.jsowell.pile.vo.base.MerchantOrderInfoVO;
import com.jsowell.pile.vo.base.OrderAmountDetailVO;
import com.jsowell.pile.vo.base.OrderPeriodAmountVO;
import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
import com.jsowell.pile.vo.nanrui.NROrderInfoVO;
import com.jsowell.pile.vo.uniapp.OrderVO;
import com.jsowell.pile.vo.uniapp.PersonPileConnectorSumInfoVO;
import com.jsowell.pile.vo.uniapp.SendMessageVO;
@@ -361,12 +362,12 @@ public interface IOrderBasicInfoService {
* @param orderCode
* @return
*/
NROrderInfo getNROrderInfoByOrderCode(String orderCode);
NROrderInfoVO getNROrderInfoByOrderCode(String orderCode);
/**
* 通过充电结束时间批量查询
* @param dto
* @return
*/
List<NROrderInfo> getNROrderInfos(NRQueryOrderDTO dto);
List<NROrderInfoVO> getNROrderInfos(NRQueryOrderDTO dto);
}

32
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -49,6 +49,7 @@ import com.jsowell.pile.transaction.service.TransactionService;
import com.jsowell.pile.vo.base.PileInfoVO;
import com.jsowell.pile.vo.base.*;
import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
import com.jsowell.pile.vo.nanrui.NROrderInfoVO;
import com.jsowell.pile.vo.uniapp.*;
import com.jsowell.pile.vo.web.*;
import com.jsowell.wxpay.common.WeChatPayParameter;
@@ -1000,31 +1001,30 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
* @return
*/
@Override
public NROrderInfo getNROrderInfoByOrderCode(String orderCode) {
public NROrderInfoVO getNROrderInfoByOrderCode(String orderCode) {
NRQueryOrderDTO dto = new NRQueryOrderDTO();
dto.setOrderCode(orderCode);
List<NROrderInfo> nrOrderInfos = orderBasicInfoMapper.getNROrderInfoByOrderCode(dto);
List<NROrderInfoVO> nrOrderInfos = orderBasicInfoMapper.getNROrderInfoByOrderCode(dto);
if (CollectionUtils.isEmpty(nrOrderInfos)) {
return null;
}
// 此方法仅通过订单编号查，因此只有一条数据
NROrderInfo nrOrderInfo = nrOrderInfos.get(0);
// 将组织机构代码截取后九位
String organizationCode = nrOrderInfo.getOperatorId();
String operatorId = StringUtils.substring(organizationCode, organizationCode.length() - 9);
nrOrderInfo.setOperatorId(operatorId);
nrOrderInfo.setUserChargeType(1);
// TODO 获取电表总起、止值
// pileMsgRecordService.getPileFeedList()
nrOrderInfo.setMeterValueStart(BigDecimal.ZERO);
nrOrderInfo.setMeterValueEnd(BigDecimal.ZERO);
return nrOrderInfo;
NROrderInfoVO nrOrderInfoVO = nrOrderInfos.get(0);
return nrOrderInfoVO;
}
/**
* 通过充电结束时间批量查询
* @param dto
* @return
*/
@Override
public List<NROrderInfo> getNROrderInfos(NRQueryOrderDTO dto) {
return orderBasicInfoMapper.getNROrderInfoByOrderCode(dto);
public List<NROrderInfoVO> getNROrderInfos(NRQueryOrderDTO dto) {
List<NROrderInfoVO> nrOrderInfoVOList = orderBasicInfoMapper.getNROrderInfoByOrderCode(dto);
if (CollectionUtils.isEmpty(nrOrderInfoVOList)) {
return new ArrayList<>();
}
return nrOrderInfoVOList;
}
/**

15
jsowell-pile/src/main/java/com/jsowell/pile/vo/nanrui/NROrderInfoVO.java Normal file
View File

@@ -0,0 +1,15 @@
package com.jsowell.pile.vo.nanrui;
import com.jsowell.pile.domain.nanrui.NROrderInfo;
import lombok.Data;
/**
* TODO
*
* @author Lemon
* @Date 2023/10/12 15:57
*/
@Data
public class NROrderInfoVO extends NROrderInfo {
private String stationId;
}

2
jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
View File

@@ -1167,7 +1167,7 @@
station_id = #{stationId,jdbcType=BIGINT}
</update>
<select id="getNROrderInfoByOrderCode" resultType="com.jsowell.pile.domain.nanrui.NROrderInfo">
<select id="getNROrderInfoByOrderCode" resultType="com.jsowell.pile.vo.nanrui.NROrderInfoVO">
SELECT
t1.merchant_id,
t3.organization_code AS operatorId,