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

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-05-26 09:23:22 +08:00
parent 86b052e139 7c53e44830
commit 0362095a10
12 changed files with 370 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jsowell-pile/src/main/java/com/jsowell/pile/domain/ThirdPartySettingInfo.java
View File

@@ -25,6 +25,12 @@ public class ThirdPartySettingInfo extends BaseEntity {
@Excel(name = "对接类型", readConverterExp = "1=-联联平台")
private String type;
/**
* 对接平台url地址
*/
@Excel(name = "url地址")
private String urlAddress;
/**
* 站点id
*/
@@ -82,6 +88,14 @@ public class ThirdPartySettingInfo extends BaseEntity {
return type;
}
public String getUrlAddress() {
return urlAddress;
}
public void setUrlAddress(String urlAddress) {
this.urlAddress = urlAddress;
}
public void setStationId(Long stationId) {
this.stationId = stationId;
}
@@ -143,6 +157,7 @@ public class ThirdPartySettingInfo extends BaseEntity {
return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)
.append("id", getId())
.append("type", getType())
.append("urlAddress", getType())
.append("stationId", getStationId())
.append("operatorId", getOperatorId())
.append("operatorSecret", getOperatorSecret())

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

@@ -153,10 +153,10 @@ public interface IOrderBasicInfoService {
/**
* 获取充电实时数据
* @param orderCode 订单编号
* @param transactionCode 交易流水号
* @return
*/
List<RealTimeMonitorData> getChargingRealTimeData(String orderCode);
List<RealTimeMonitorData> getChargingRealTimeData(String transactionCode);
/**
* 首页订单数据展示

1
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartySettingInfoServiceImpl.java
View File

@@ -113,6 +113,7 @@ public class ThirdPartySettingInfoServiceImpl implements IThirdPartySettingInfoS
return insertThirdPartySettingInfo(info);
}else {
// 修改
info.setId(infoByStationId.getId());
return updateThirdPartySettingInfo(info);
}
}

9
jsowell-pile/src/main/resources/mapper/pile/ThirdPartySettingInfoMapper.xml
View File

@@ -7,6 +7,7 @@
<resultMap type="com.jsowell.pile.domain.ThirdPartySettingInfo" id="ThirdPartySettingInfoResult">
<result property="id" column="id" />
<result property="type" column="type" />
<result property="urlAddress" column="url_address" />
<result property="stationId" column="station_id" />
<result property="operatorId" column="operator_id" />
<result property="operatorSecret" column="operator_secret" />
@@ -21,18 +22,19 @@
</resultMap>
<sql id="selectThirdPartySettingInfoVo">
select id, type, station_id, operator_id, operator_secret, sign_secret, data_secret, data_secret_IV, create_time, create_by, update_time, update_by, del_flag from thirdparty_setting_info
select id, type, url_address, station_id, operator_id, operator_secret, sign_secret, data_secret, data_secret_IV, create_time, create_by, update_time, update_by, del_flag from thirdparty_setting_info
</sql>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, type, station_id, operator_id, operator_secret, sign_secret, data_secret, data_secret_IV, create_time, create_by, update_time, update_by, del_flag
id, type, url_address, station_id, operator_id, operator_secret, sign_secret, data_secret, data_secret_IV, create_time, create_by, update_time, update_by, del_flag
</sql>
<select id="selectThirdPartySettingInfoList" parameterType="com.jsowell.pile.domain.ThirdPartySettingInfo" resultMap="ThirdPartySettingInfoResult">
<include refid="selectThirdPartySettingInfoVo"/>
<where>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="urlAddress != null and type != ''"> and url_address = #{urlAddress}</if>
<if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if>
<if test="operatorId != null and operatorId != ''"> and operator_id = #{operatorId}</if>
<if test="operatorSecret != null and operatorSecret != ''"> and operator_secret = #{operatorSecret}</if>
@@ -51,6 +53,7 @@
insert into thirdparty_setting_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="type != null">type,</if>
<if test="urlAddress != null">url_address,</if>
<if test="stationId != null">station_id,</if>
<if test="operatorId != null">operator_id,</if>
<if test="operatorSecret != null">operator_secret,</if>
@@ -65,6 +68,7 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="type != null">#{type},</if>
<if test="urlAddress != null">#{urlAddress},</if>
<if test="stationId != null">#{stationId},</if>
<if test="operatorId != null">#{operatorId},</if>
<if test="operatorSecret != null">#{operatorSecret},</if>
@@ -83,6 +87,7 @@
update thirdparty_setting_info
<trim prefix="SET" suffixOverrides=",">
<if test="type != null">type = #{type},</if>
<if test="urlAddress != null">url_address = #{urlAddress},</if>
<if test="stationId != null">station_id = #{stationId},</if>
<if test="operatorId != null">operator_id = #{operatorId},</if>
<if test="operatorSecret != null">operator_secret = #{operatorSecret},</if>