Merge remote-tracking branch 'origin/master'

liuhaonan

2021-12-15 2e92c9221d90d450f007c74466b8b051e1cf594d

Merge remote-tracking branch 'origin/master'

 dao/src/main/java/com/sandu/ximon/dao/domain/ChargingPile.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,77 @@
package com.sandu.ximon.dao.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;

/**
 * å……电桩列表
 * @TableName charging_pile
 */
@TableName(value ="charging_pile")
@Data
public class ChargingPile implements Serializable {
    /**
     * 
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * ç¯æ†ID
     */
    private Long lightPoleId;

    /**
     * å……电桩名称
     */
    private String chargingPileName;

    /**
     * æ‰€å±žç¯æ†
     */
    private String belongTo;

    /**
     * åž‹å·
     */
    private String model;

    /**
     * USB口费率
     */
    private Double usbRate;

    /**
     * æ‘©æ‰˜å£è´¹çŽ‡
     */
    private Double motorcycleRate;

    /**
     * æ±½è½¦å£è´¹çŽ‡
     */
    private Double carRate;

    /**
     * åˆ›å»ºæ—¶é—´
     */
    private LocalDateTime createTime;

    /**
     * æ›´æ–°æ—¶é—´
     */
    private LocalDateTime updateTime;

    /**
     * ç»‘定状态
1：已绑定；0：未绑定
     */
    private Integer bindingState;

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;
}

 dao/src/main/java/com/sandu/ximon/dao/domain/ChargingPileOrderList.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
package com.sandu.ximon.dao.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;

/**
 * å……电桩订单列表
 * @TableName charging_pile_order_list
 */
@TableName(value ="charging_pile_order_list")
@Data
public class ChargingPileOrderList implements Serializable {
    /**
     * 
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * è®¢å•å·
     */
    private Long orderNumber;

    /**
     * å……电桩ID
     */
    private Long chargingPileId;

    /**
     * å……电桩名称
     */
    private String chargingPileName;

    /**
     * æ‰€å±žç¯æ†
     */
    private String belongTo;

    /**
     * æ”¯ä»˜é‡‘额
     */
    private Double payTheAmount;

    /**
     * é€€æ¬¾é‡‘额
     */
    private Double theRefundAmount;

    /**
     * è®¢å•çŠ¶æ€
1:已支付；0：未支付
     */
    private Integer orderState;

    /**
     * åˆ›å»ºæ—¶é—´
     */
    private LocalDateTime createTime;

    /**
     * æ›´æ–°æ—¶é—´
     */
    private LocalDateTime updateTime;

    /**
     * æ”¯ä»˜æ—¶é—´
     */
    private LocalDateTime payTime;

    /**
     * å……电度数
     */
    private Double chargingDegree;

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;
}

 dao/src/main/java/com/sandu/ximon/dao/domain/MidConnectionRelation.java

ÎļþÒÑɾ³ý

 dao/src/main/java/com/sandu/ximon/dao/mapper/ChargingPileMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.sandu.ximon.dao.mapper;

import com.sandu.ximon.dao.domain.ChargingPile;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

/**
 * @Entity com.sandu.ximon.dao.domain.ChargingPile
 */
@Mapper
public interface ChargingPileMapper extends BaseMapper<ChargingPile> {

}





 dao/src/main/java/com/sandu/ximon/dao/mapper/ChargingPileOrderListMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.sandu.ximon.dao.mapper;

import com.sandu.ximon.dao.domain.ChargingPileOrderList;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

/**
 * @Entity com.sandu.ximon.dao.domain.ChargingPileOrderList
 */
@Mapper
public interface ChargingPileOrderListMapper extends BaseMapper<ChargingPileOrderList> {

}





 dao/src/main/java/com/sandu/ximon/dao/mapper/MidConnectionRelationMapper.java

ÎļþÒÑɾ³ý

 dao/src/main/resources/mapper/ChargingPileMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sandu.ximon.dao.mapper.ChargingPileMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.ChargingPile">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="lightPoleId" column="light_pole_id" jdbcType="BIGINT"/>
            <result property="chargingPileName" column="charging_pile_name" jdbcType="VARCHAR"/>
            <result property="belongTo" column="belong_to" jdbcType="VARCHAR"/>
            <result property="model" column="model" jdbcType="VARCHAR"/>
            <result property="usbRate" column="usb_rate" jdbcType="DOUBLE"/>
            <result property="motorcycleRate" column="motorcycle_rate" jdbcType="DOUBLE"/>
            <result property="carRate" column="car_rate" jdbcType="DOUBLE"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
            <result property="bindingState" column="binding_state" jdbcType="INTEGER"/>
    </resultMap>

</mapper>

 dao/src/main/resources/mapper/ChargingPileOrderListMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sandu.ximon.dao.mapper.ChargingPileOrderListMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.ChargingPileOrderList">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="orderNumber" column="order_number" jdbcType="BIGINT"/>
            <result property="chargingPileId" column="charging_pile_id" jdbcType="BIGINT"/>
            <result property="chargingPileName" column="charging_pile_name" jdbcType="VARCHAR"/>
            <result property="belongTo" column="belong_to" jdbcType="VARCHAR"/>
            <result property="payTheAmount" column="pay_the_amount" jdbcType="DOUBLE"/>
            <result property="theRefundAmount" column="the_refund_amount" jdbcType="DOUBLE"/>
            <result property="orderState" column="order_state" jdbcType="INTEGER"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
            <result property="payTime" column="pay_time" jdbcType="TIMESTAMP"/>
            <result property="chargingDegree" column="charging_degree" jdbcType="DOUBLE"/>
    </resultMap>

</mapper>

 dao/src/main/resources/mapper/MidConnectionRelationMapper.xml

ÎļþÒÑɾ³ý