lxw
2023-05-23 9bf547aa6dfb7a968bf35cd291747b676e5bead0
ws请求powerAlarmRt带stationId
2个文件已修改
7 ■■■■ 已修改文件
src/main/java/com/whyc/pojo/PwrdevAlarm.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/PwrdevAlarmMapper.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/PwrdevAlarm.java
@@ -108,6 +108,10 @@
    private Date recordTime;
    @TableField(exist = false)
    @ApiModelProperty(value = "机房id")
    private String stationId;
    @TableField(exist = false)
    private Page page;
}
src/main/resources/mapper/PwrdevAlarmMapper.xml
@@ -58,7 +58,8 @@
    </select>
    <select id="getAllPage" resultType="com.whyc.pojo.PwrdevAlarm">
        select  alarm.*,inf.StationName from db_pwrdev_alarm.tb_pwrdev_alarm alarm,db_pwrdev_inf.tb_pwrdev_inf inf
        select alarm.*,inf.StationName,inf.StationId from db_pwrdev_alarm.tb_pwrdev_alarm
        alarm,db_pwrdev_inf.tb_pwrdev_inf inf
        <where>
            alarm.PowerDeviceId = inf.PowerDeviceId
            <if test="stationName1!=null ">