xuhy
2024-08-17 434b8e475580c86d9beaa2136dce9cfde35219d0
监控修改
2个文件已修改
14 ■■■■ 已修改文件
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TMonitoringEquipment.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TMonitoringEquipmentMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TMonitoringEquipment.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -52,5 +53,12 @@
    @ApiModelProperty(value = "监控链接")
    @TableField("url_link")
    private String urlLink;
    @ApiModelProperty(value = "状态 1=正常 0=离线")
    @TableField("status")
    private Integer status;
    @ApiModelProperty(value = "故障时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("faultTime")
    private LocalDateTime faultTime;
}
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TMonitoringEquipmentMapper.xml
@@ -10,17 +10,19 @@
        <result column="parking_lot_id" property="parkingLotId" />
        <result column="location" property="location" />
        <result column="url_link" property="urlLink" />
        <result column="status" property="status" />
        <result column="faultTime" property="faultTime" />
        <result column="create_time" property="createTime" />
        <result column="del_flag" property="delFlag" />
    </resultMap>
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, `name`, code, parking_lot_id, location, url_link, create_time, del_flag
        id, `name`, code, parking_lot_id, location, url_link,status,faultTime, create_time, del_flag
    </sql>
    <select id="pageList" resultType="com.ruoyi.chargingPile.api.vo.TMonitoringEquipmentVO">
        SELECT
        tme.id, tme.`name`, tme.code, tme.parking_lot_id, tme.location, tme.url_link, tme.create_time, tme.del_flag, tpl.name AS parkingLotName
        tme.id, tme.`name`, tme.code, tme.parking_lot_id, tme.location, tme.url_link,tme.status,tme.faultTime, tme.create_time, tme.del_flag, tpl.name AS parkingLotName
        FROM t_monitoring_equipment tme
        LEFT JOIN t_parking_lot tpl ON tme.parking_lot_id = tpl.id
        <where>