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

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-02-28 14:47:47 +08:00
parent 3e6ef0cb3a
commit 32a5daeeac
6 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/** /**
* 获取桩上传的实时监测数据 * 获取桩上传的实时监测数据 0x13
* *
* @author JS-ZZA * @author JS-ZZA
* @date 2022/9/19 9:08 * @date 2022/9/19 9:08

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

@@ -341,4 +341,14 @@ public interface OrderBasicInfoMapper {
* @return 订单列表 * @return 订单列表
*/ */
List<OrderBasicInfo> queryOrderListByGroupCode(String groupCode); List<OrderBasicInfo> queryOrderListByGroupCode(String groupCode);
/**
* 查询新电途订单列表
* @param merchantId
* @param stationId
* @param startDate
* @param endDate
* @return
*/
List<OrderBasicInfo> queryXDTOrderList(String merchantId, String stationId, String startDate, String endDate);
} }

4
jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java
View File

@@ -96,8 +96,8 @@ public class PileRemoteService {
// 获取充电桩0x13数据，校验交易流水号是否一致 // 获取充电桩0x13数据，校验交易流水号是否一致
String pileIsChargingKey = CacheConstants.PILE_IS_CHARGING + pileSn + connectorCode; String pileIsChargingKey = CacheConstants.PILE_IS_CHARGING + pileSn + connectorCode;
String redisResult = redisCache.getCacheObject(pileIsChargingKey); String redisResult = redisCache.getCacheObject(pileIsChargingKey);
if (!StringUtils.equals(redisResult, transactionCode)) { if (StringUtils.isNotBlank(redisResult) && !StringUtils.equals(redisResult, transactionCode)) {
log.info("发送远程停止充电指令-充电桩枪口编号:{}, 获取到正在充电中的交易流水号:{}与入参交易流水号:{}不一致", pileSn + connectorCode, redisResult, transactionCode); log.info("发送远程停止充电指令-充电桩枪口编号:{}, 获取到正在充电中的交易流水号:{}, 与入参交易流水号:{}不一致", pileSn + connectorCode, redisResult, transactionCode);
return; return;
} }
StopChargingCommand command = StopChargingCommand.builder() StopChargingCommand command = StopChargingCommand.builder()

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

@@ -3636,6 +3636,12 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
return orderBasicInfoMapper.queryOrderListByGroupCode(groupCode); return orderBasicInfoMapper.queryOrderListByGroupCode(groupCode);
} }
/**
* 查询新电途订单
*/
public List<OrderBasicInfo> queryXDTOrderList(String merchantId, String stationId, String startDate, String endDate) {
return orderBasicInfoMapper.queryXDTOrderList(merchantId, stationId, startDate, endDate);
}
} }

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
View File

@@ -570,7 +570,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
// 把充电桩正在充电中的状态存到redis // 把充电桩正在充电中的状态存到redis
String pileIsChargingKey = CacheConstants.PILE_IS_CHARGING + realTimeMonitorData.getPileConnectorCode(); String pileIsChargingKey = CacheConstants.PILE_IS_CHARGING + realTimeMonitorData.getPileConnectorCode();
redisCache.setCacheObject(pileIsChargingKey, realTimeMonitorData.getTransactionCode(), 12); redisCache.setCacheObject(pileIsChargingKey, realTimeMonitorData.getTransactionCode(), 20);
} }
@Override @Override

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

@@ -2797,4 +2797,12 @@
and pay_mode = '1' and pay_mode = '1'
and group_code =#{groupCode,jdbcType=VARCHAR} and group_code =#{groupCode,jdbcType=VARCHAR}
</select> </select>
<select id="queryXDTOrderList" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from order_basic_info
where order_status = '3'
and member_id =#{memberId,jdbcType=VARCHAR}
</select>
</mapper> </mapper>