yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改实时数据接口

Browse Source
This commit is contained in:
yuyang 2021-08-23 11:58:30 +08:00
parent ec40bfde74
commit 692aa17418
6 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java
View File

@ -85,8 +85,6 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService {
HashSet<String> noSet = new HashSet<>();
noSet.add(serialNumber);
R r = powerPileService.addPileWhitelist(chargingStationId, noSet);
System.out.println(">>>>>>"+r.getCode());
System.out.println(">>>>>>"+r.getMsg());
return AjaxResult.success();
}
@ -111,7 +109,7 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService {
Long rateModelId = xhpcChargingPile.getRateModelId();
Long chargingStationId = xhpcChargingPile.getChargingStationId();
if (xhpcChargingPile.getGunNumber() > 0) {
for (int i = 0; i < xhpcChargingPile.getGunNumber(); i++) {
for (int i = 1; i <= xhpcChargingPile.getGunNumber(); i++) {
XhpcTerminal xhpcTerminal = new XhpcTerminal();
xhpcTerminal.setChargingStationId(chargingStationId);
xhpcTerminal.setChargingPileId(chargingPileId);

4
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/HxpcChargeOrderServiceImpl.java
View File

@ -6,13 +6,11 @@ import com.xhpc.common.core.domain.R;
import com.xhpc.common.core.web.domain.AjaxResult;
import com.xhpc.common.data.down.StartChargingData;
import com.xhpc.common.data.redis.SeqUtil;
import com.xhpc.common.domain.XhpcChargingPile;
import com.xhpc.common.domain.XhpcTerminal;
import com.xhpc.common.redis.service.RedisService;
import com.xhpc.order.domain.HxpcChargeOrder;
import com.xhpc.order.mapper.HxpcChargeOrderMapper;
import com.xhpc.order.service.IHxpcChargeOrderService;
import com.xhpc.order.service.IXhpcHistoryOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -37,8 +35,6 @@ public class HxpcChargeOrderServiceImpl implements IHxpcChargeOrderService {
@Autowired
private HxpcChargeOrderMapper hxpcChargeOrderMapper;
@Autowired
private IXhpcHistoryOrderService xhpcHistoryOrderService;
@Autowired
private PowerPileService powerPileService;
@Autowired
private RedisService redisService;

4
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
View File

@ -1,7 +1,6 @@
package com.xhpc.order.service.impl;
import com.xhpc.common.core.web.domain.AjaxResult;
import com.xhpc.common.redis.service.RedisService;
import com.xhpc.order.domain.XhpcChargeOrderCurrent;
import com.xhpc.order.domain.XhpcChargeOrderSoc;
import com.xhpc.order.domain.XhpcChargeOrderVoltage;
@ -11,7 +10,6 @@ import com.xhpc.order.service.IXhpcRealTimeOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -23,8 +21,6 @@ import java.util.Map;
@Service
public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService {
@Autowired
private RedisService redisService;
@Autowired
private XhpcRealTimeOrderMapper xhpcRealTimeOrderMapper;

8
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml
View File

@ -82,7 +82,7 @@
LEFT JOIN (select sum(xho.act_price-xho.internet_commission-xho.internet_svc_commission)
waitConfirmed,xho.user_id
from xhpc_history_order xho
LEFT JOIN xhpc_charge_order xco on xco.charge_order_id = xho.charging_order_id
LEFT JOIN xhpc_charge_order xco on xco.charge_order_id = xho.charge_order_id
LEFT JOIN xhpc_charging_station xcs on xcs.charging_station_id = xho.charging_station_id
LEFT JOIN xhpc_operator xo on xo.operator_id = xcs.operator_id
<if test="chargingStation != null and chargingStation != ''">
@ -99,7 +99,7 @@
LEFT JOIN
(select sum(xho.total_price-xho.promotion_discount-xho.internet_commission-xho.internet_svc_commission) confirmed ,xho.user_id
from xhpc_history_order xho
LEFT JOIN xhpc_charge_order xco on xco.charge_order_id = xho.charging_order_id
LEFT JOIN xhpc_charge_order xco on xco.charge_order_id = xho.charge_order_id
LEFT JOIN xhpc_charging_station xcs on xcs.charging_station_id = xho.charging_station_id
LEFT JOIN xhpc_operator xo on xo.operator_id = xcs.operator_id
<if test="chargingStation != null and chargingStation !=''">
@ -124,7 +124,7 @@
xo.`name` operatorName,xcs.`name` chargingStationName,xho.`reconciliation_status`
reconciliationStatus,sdd.dict_label reconciliationStatusName
from xhpc_history_order xho
LEFT JOIN xhpc_charge_order xco on xco.charge_order_id = xho.charging_order_id
LEFT JOIN xhpc_charge_order xco on xco.charge_order_id = xho.charge_order_id
LEFT JOIN xhpc_charging_station xcs on xcs.charging_station_id = xho.charging_station_id
LEFT JOIN xhpc_operator xo on xo.operator_id = xcs.operator_id
LEFT JOIN sys_dict_data sdd on sdd.`dict_type` = 'reconciliation_status' and sdd.dict_value =
@ -168,7 +168,7 @@
reconciliationStatus,sdd.dict_label reconciliationStatusName,
xho.end_soc endSoc
from xhpc_history_order xho
LEFT JOIN xhpc_charge_order xco on xco.charge_order_id = xho.charging_order_id
LEFT JOIN xhpc_charge_order xco on xco.charge_order_id = xho.charge_order_id
LEFT JOIN xhpc_charging_station xcs on xcs.charging_station_id = xho.charging_station_id
LEFT JOIN xhpc_operator xo on xo.operator_id = xcs.operator_id
LEFT JOIN sys_dict_data sdd on sdd.`dict_type` = 'reconciliation_status' and sdd.dict_value =

4
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml
View File

@ -151,7 +151,7 @@
xco.source,
CASE WHEN xco.source = 0 THEN '平台' else xiu.`name` end sourceName
from xhpc_history_order xho
LEFT JOIN xhpc_charge_order xco on xco.charge_order_id = xho.charging_order_id
LEFT JOIN xhpc_charge_order xco on xco.charge_order_id = xho.charge_order_id
LEFT JOIN xhpc_charging_station xcs on xcs.charging_station_id = xho.charging_station_id
LEFT JOIN xhpc_operator xo on xo.operator_id = xcs.operator_id
LEFT JOIN sys_user su on xo.operator_id = su.operator_id
@ -197,7 +197,7 @@
CASE WHEN xco.source = 0 THEN '平台' else xiu.`name` end sourceName,
xho.end_soc endSoc
from xhpc_history_order xho
LEFT JOIN xhpc_charge_order xco on xco.charge_order_id = xho.charging_order_id
LEFT JOIN xhpc_charge_order xco on xco.charge_order_id = xho.charge_order_id
LEFT JOIN xhpc_charging_station xcs on xcs.charging_station_id = xho.charging_station_id
LEFT JOIN xhpc_operator xo on xo.operator_id = xcs.operator_id
LEFT JOIN sys_user su on xo.operator_id = su.operator_id

7
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml
View File

@ -435,7 +435,6 @@
#{phone}, '%'))
</if>
</if>
group by charging_order_id
order by co.create_time desc
</select>
@ -515,14 +514,14 @@
</delete>
<delete id="deleteChargeVoltage">
delete from xhpc_charge_order_current where charging_order_id=#{chargingOrderId}
delete from xhpc_charge_order_current where charge_order_id=#{chargingOrderId}
</delete>
<delete id="deleteChargeOrderSoc">
delete from xhpc_charge_order_soc where charging_order_id=#{chargingOrderId}
delete from xhpc_charge_order_soc where charge_order_id=#{chargingOrderId}
</delete>
<delete id="deleteChargeOrderCurrent">
delete from xhpc_charge_order_voltage where charging_order_id=#{chargingOrderId}
delete from xhpc_charge_order_voltage where charge_order_id=#{chargingOrderId}
</delete>
</mapper>