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

Adding a field insertion, which named user_id from xhpc_charge_order, and change the sql style of addBy3rd.

Browse Source
This commit is contained in:
little-cat-sweet 2021-11-12 15:13:28 +08:00
parent d5bbfca20f
commit 7da229de62
3 changed files with 103 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java
View File

@ -182,7 +182,9 @@ public interface XhpcChargeOrderMapper {
@Param(value = "terminalId") Long terminalId, @Param(value = "terminalId") Long terminalId,
@Param(value = "power") Double power, @Param(value = "power") Double power,
@Param(value = "chargingStationId") Long chargingStationId, @Param(value = "chargingStationId") Long chargingStationId,
@Param(value = "chargingMode") String chargingMode); @Param(value = "chargingMode") String chargingMode,
@Param(value = "source") Integer source,
@Param(value = "userId") Long userId);
/** /**
* 标记异常大于创建4小时，标记为异常 * 标记异常大于创建4小时，标记为异常
@ -190,7 +192,7 @@ public interface XhpcChargeOrderMapper {
// void updateStatus(); // void updateStatus();
List<Map<String, Object>> selectDate3rdNeedBy(@Param(value = "serialNumber") String serialNumber); List<Map<String, Object>> selectDate3rdNeedBy(@Param(value = "serialNumber") String serialNumber);
String select3rdNameBy(@Param(value = "operatorIdEvcs") String operatorIdEvcs); List<Map<String, Object>> select3rdNameBy(@Param(value = "operatorIdEvcs") String operatorIdEvcs);
} }

16
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java
View File

@ -472,13 +472,15 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService {
return r; return r;
} }
String startTime = DateUtil.format(date, "yyyy-MM-dd HH: mm: ss"); String startTime = DateUtil.format(date, "yyyy-MM-dd HH: mm: ss");
Map<String, Object> extraData = xhpcChargeOrderMapper.selectDate3rdNeedBy(connectorId).get(0); Map<String, Object> extraData1 = xhpcChargeOrderMapper.selectDate3rdNeedBy(connectorId).get(0);
Long rateModelId = (Long) extraData.get("rateModelId"); Long rateModelId = (Long) extraData1.get("rateModelId");
Long terminalId = (Long) extraData.get("terminalId"); Long terminalId = (Long) extraData1.get("terminalId");
Double power = (Double) extraData.get("power"); Double power = (Double) extraData1.get("power");
Long chargingStationId = (Long) extraData.get("chargingStationId"); Long chargingStationId = (Long) extraData1.get("chargingStationId");
String chargingMode = xhpcChargeOrderMapper.select3rdNameBy(internetSerialNumber.substring(0, 9)); Map<String, Object> extraData2 = xhpcChargeOrderMapper.select3rdNameBy(internetSerialNumber.substring(0, 9)).get(0);
int res = xhpcChargeOrderMapper.addBy3rd(internetSerialNumber, orderNo, driverId, chargingAmt, plateNum, status, date, rateModelId, terminalId, power, chargingStationId, chargingMode); String chargingMode = (String) extraData2.get("name");
Long userId = (Long) extraData2.get("userId");
int res = xhpcChargeOrderMapper.addBy3rd(internetSerialNumber, orderNo, driverId, chargingAmt, plateNum, status, date, rateModelId, terminalId, power, chargingStationId, chargingMode, 1, userId);
Map<String, Object> data = new HashMap<>(); Map<String, Object> data = new HashMap<>();
System.out.println(res); System.out.println(res);
if (res != 0) { if (res != 0) {

149
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml
View File

@ -491,64 +491,95 @@
<insert id="addBy3rd"> <insert id="addBy3rd">
insert into xhpc_charge_order insert into xhpc_charge_order
(internet_serial_number, <trim prefix="(" suffix=")" suffixOverrides=",">
serial_number, <if test="null != internetSerialNumber ">
<if test=" driverId != null and driverId != ''"> internet_serial_number,
driver_id, </if>
</if> <if test="null != serialNum ">
<if test="chargingAmt != null and chargingAmt != ''"> serial_number,
charging_amt, </if>
</if> <if test="null != driverId ">
<if test="plateNum != null and plateNum != ''"> driver_id,
Plate_num, </if>
</if> <if test="null != chargingAmt ">
status,source,create_time, charging_amt,
<if test="rateModelId != null and rateModelId != ''"> </if>
rate_model_id, <if test="null != plateNum ">
</if> plate_num,
<if test="terminalId != null and terminalId != ''"> </if>
terminal_id, <if test="null != status ">
</if> status,
<if test="power != null and power != ''"> </if>
power, <if test="null != createTime ">
</if> create_time,
<if test="chargingStationId != null and chargingStationId != ''"> </if>
charging_station_id, <if test="null != rateModelId ">
</if> rate_model_id,
<if test="chargingMode != null and chargingMode != ''"> </if>
charging_mode <if test="null != terminalId ">
</if>) terminal_id,
values </if>
(#{internetSerialNumber}, <if test="null != power ">
#{serialNum}, power,
<if test="driverId != null and driverId != ''"> </if>
#{driverId}, <if test="null != chargingStationId ">
</if> charging_station_id,
<if test="chargingAmt != null and chargingAmt != ''"> </if>
#{chargingAmt}, <if test="null != chargingMode ">
</if> charging_mode,
<if test="plateNum != null and plateNum != ''"> </if>
#{plateNum}, <if test="null != source ">
</if> source,
#{status},1,#{createTime} </if>
<if test="rateModelId != null and rateModelId != ''"> <if test="null != userId ">
,#{rateModelId} user_id
</if> </if>
<if test="terminalId != null and terminalId != ''"> </trim>
,#{terminalId} <trim prefix="values (" suffix=")" suffixOverrides=",">
</if> <if test="null != internetSerialNumber ">
<if test="power != null and power != ''"> #{internetSerialNumber},
,#{power} </if>
</if> <if test="null != serialNum ">
<if test="chargingStationId != null and chargingStationId != ''"> #{serialNum},
,#{chargingStationId} </if>
</if> <if test="null != driverId ">
<if test="chargingMode != null and chargingMode != ''"> #{driverId},
,#{chargingMode} </if>
</if> <if test="null != chargingAmt ">
) #{chargingAmt},
</if>
<if test="null != plateNum ">
#{plateNum},
</if>
<if test="null != status ">
#{status},
</if>
<if test="null != createTime ">
#{createTime},
</if>
<if test="null != rateModelId ">
#{rateModelId},
</if>
<if test="null != terminalId ">
#{terminalId},
</if>
<if test="null != power ">
#{power},
</if>
<if test="null != chargingStationId ">
#{chargingStationId},
</if>
<if test="null != chargingMode ">
#{chargingMode},
</if>
<if test="null != source ">
#{source},
</if>
<if test="null != userId ">
#{userId}
</if>
</trim>
</insert> </insert>
<select id="selectDate3rdNeedBy" resultType="map"> <select id="selectDate3rdNeedBy" resultType="map">
@ -563,9 +594,9 @@
where xt.serial_number = #{serialNumber} where xt.serial_number = #{serialNumber}
</select> </select>
<select id="select3rdNameBy" resultType="java.lang.String"> <select id="select3rdNameBy" resultType="map">
select name select name, internet_user_id as userId
from xhpc_internet_user from xhpc_internet_user
where operator_id_evcs = #{operatorIdEvcs} where operator_id_evcs = #{operatorIdEvcs}
</select> </select>