Merge branch 'feature-qcyun停车改造' into dev

This commit is contained in:
jsowell
2026-07-01 10:36:56 +08:00
9 changed files with 260 additions and 42 deletions

View File

@@ -26,6 +26,11 @@ public class ThirdpartyParkingConfig {
*/
private String parkingName;
/**
* 停车平台类型(1-路通云停;2-软杰;3-qcyun)
*/
private String platformType;
/**
* 停车场库appId
*/
@@ -46,6 +51,21 @@ public class ThirdpartyParkingConfig {
*/
private String couponId;
/**
* qcyun机构ID
*/
private String orgId;
/**
* qcyun车场ID
*/
private String parkId;
/**
* 平台接口地址
*/
private String apiUrl;
private Date createTime;
private String createBy;
@@ -58,4 +78,4 @@ public class ThirdpartyParkingConfig {
* 删除标识(0-正常;1-删除)
*/
private String delFlag;
}
}

View File

@@ -61,4 +61,12 @@ public interface ThirdpartyParkingConfigMapper {
* @return
*/
List<ThirdpartyParkingConfig> selectInfoList();
}
/**
* 根据站点查询绑定的停车平台配置
*
* @param stationId 站点id
* @return 停车平台配置
*/
ThirdpartyParkingConfig selectByStationId(String stationId);
}

View File

@@ -57,4 +57,12 @@ public interface ThirdPartyParkingConfigService {
* 查询基本信息列表(调用时需分页)
*/
List<ThirdpartyParkingConfig> selectInfoList();
/**
* 根据站点查询绑定的停车平台配置
*
* @param stationId 站点id
* @return 停车平台配置
*/
ThirdpartyParkingConfig selectByStationId(String stationId);
}

View File

@@ -59,4 +59,9 @@ public class ThirdPartyParkingConfigServiceImpl implements ThirdPartyParkingConf
return thirdpartyParkingConfigMapper.selectInfoList();
}
@Override
public ThirdpartyParkingConfig selectByStationId(String stationId) {
return thirdpartyParkingConfigMapper.selectByStationId(stationId);
}
}

View File

@@ -6,10 +6,14 @@
<!--@Table thirdparty_parking_config-->
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="parking_name" jdbcType="VARCHAR" property="parkingName"/>
<result column="platform_type" jdbcType="VARCHAR" property="platformType"/>
<result column="app_id" jdbcType="VARCHAR" property="appId"/>
<result column="secret_key" jdbcType="VARCHAR" property="secretKey"/>
<result column="parking_merchant_id" jdbcType="VARCHAR" property="parkingMerchantId"/>
<result column="coupon_id" jdbcType="VARCHAR" property="couponId"/>
<result column="org_id" jdbcType="VARCHAR" property="orgId"/>
<result column="park_id" jdbcType="VARCHAR" property="parkId"/>
<result column="api_url" jdbcType="VARCHAR" property="apiUrl"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="create_by" jdbcType="VARCHAR" property="createBy"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
@@ -21,10 +25,14 @@
<!--@mbg.generated-->
id,
parking_name,
platform_type,
app_id,
secret_key,
parking_merchant_id,
coupon_id,
org_id,
park_id,
api_url,
create_time,
create_by,
update_time,
@@ -49,12 +57,13 @@
<insert id="insert" parameterType="com.jsowell.pile.domain.ThirdpartyParkingConfig">
<!--@mbg.generated-->
insert into thirdparty_parking_config (id, parking_name, app_id,
secret_key, parking_merchant_id, coupon_id,
insert into thirdparty_parking_config (id, parking_name, platform_type, app_id,
secret_key, parking_merchant_id, coupon_id, org_id, park_id, api_url,
create_time, create_by, update_time,
update_by, del_flag)
values (#{id,jdbcType=INTEGER}, #{parkingName,jdbcType=VARCHAR}, #{appId,jdbcType=VARCHAR},
values (#{id,jdbcType=INTEGER}, #{parkingName,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, #{appId,jdbcType=VARCHAR},
#{secretKey,jdbcType=VARCHAR}, #{parkingMerchantId,jdbcType=VARCHAR}, #{couponId,jdbcType=VARCHAR},
#{orgId,jdbcType=VARCHAR}, #{parkId,jdbcType=VARCHAR}, #{apiUrl,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{createBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
#{updateBy,jdbcType=VARCHAR}, #{delFlag,jdbcType=VARCHAR})
</insert>
@@ -69,6 +78,9 @@
<if test="parkingName != null">
parking_name,
</if>
<if test="platformType != null">
platform_type,
</if>
<if test="appId != null">
app_id,
</if>
@@ -81,6 +93,15 @@
<if test="couponId != null">
coupon_id,
</if>
<if test="orgId != null">
org_id,
</if>
<if test="parkId != null">
park_id,
</if>
<if test="apiUrl != null">
api_url,
</if>
<if test="createTime != null">
create_time,
</if>
@@ -104,6 +125,9 @@
<if test="parkingName != null">
#{parkingName,jdbcType=VARCHAR},
</if>
<if test="platformType != null">
#{platformType,jdbcType=VARCHAR},
</if>
<if test="appId != null">
#{appId,jdbcType=VARCHAR},
</if>
@@ -116,6 +140,15 @@
<if test="couponId != null">
#{couponId,jdbcType=VARCHAR},
</if>
<if test="orgId != null">
#{orgId,jdbcType=VARCHAR},
</if>
<if test="parkId != null">
#{parkId,jdbcType=VARCHAR},
</if>
<if test="apiUrl != null">
#{apiUrl,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
@@ -141,6 +174,9 @@
<if test="parkingName != null">
parking_name = #{parkingName,jdbcType=VARCHAR},
</if>
<if test="platformType != null">
platform_type = #{platformType,jdbcType=VARCHAR},
</if>
<if test="appId != null">
app_id = #{appId,jdbcType=VARCHAR},
</if>
@@ -153,6 +189,15 @@
<if test="couponId != null">
coupon_id = #{couponId,jdbcType=VARCHAR},
</if>
<if test="orgId != null">
org_id = #{orgId,jdbcType=VARCHAR},
</if>
<if test="parkId != null">
park_id = #{parkId,jdbcType=VARCHAR},
</if>
<if test="apiUrl != null">
api_url = #{apiUrl,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
@@ -176,10 +221,14 @@
<!--@mbg.generated-->
update thirdparty_parking_config
set parking_name = #{parkingName,jdbcType=VARCHAR},
platform_type = #{platformType,jdbcType=VARCHAR},
app_id = #{appId,jdbcType=VARCHAR},
secret_key = #{secretKey,jdbcType=VARCHAR},
parking_merchant_id = #{parkingMerchantId,jdbcType=VARCHAR},
coupon_id = #{couponId,jdbcType=VARCHAR},
org_id = #{orgId,jdbcType=VARCHAR},
park_id = #{parkId,jdbcType=VARCHAR},
api_url = #{apiUrl,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
create_by = #{createBy,jdbcType=VARCHAR},
update_time = #{updateTime,jdbcType=TIMESTAMP},
@@ -193,4 +242,28 @@
<include refid="Base_Column_List"/>
from thirdparty_parking_config
</select>
</mapper>
<select id="selectByStationId" parameterType="java.lang.String" resultMap="BaseResultMap">
select
tpc.id,
tpc.parking_name,
tpc.platform_type,
tpc.app_id,
tpc.secret_key,
tpc.parking_merchant_id,
tpc.coupon_id,
tpc.org_id,
tpc.park_id,
tpc.api_url,
tpc.create_time,
tpc.create_by,
tpc.update_time,
tpc.update_by,
tpc.del_flag
from pile_station_info psi
inner join thirdparty_parking_config tpc on psi.parking_id = tpc.id
where psi.del_flag = '0'
and tpc.del_flag = '0'
and psi.id = #{stationId,jdbcType=VARCHAR}
</select>
</mapper>