ws请求battAlarmData和devAlarmData需要stationId带stationId

lxw

2023-05-23 7bad719bfe76aa4f6024aeec142f8b74cf3d2155

ws请求battAlarmData和devAlarmData需要stationId带stationId

 src/main/java/com/whyc/dto/result/AlarmRes.java

@@ -2,8 +2,6 @@

import com.whyc.pojo.BattalarmData;
import com.whyc.pojo.BattalarmDataHistory;
import com.whyc.pojo.DevalarmData;
import com.whyc.pojo.DevalarmDataHistory;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -19,6 +17,7 @@
public class AlarmRes implements Serializable {
    private int battGroupId;//电池组id
    private String stationName;//机房名称
    private String stationId;//机房id
    private String battGroupName;//电池组名称
    private List<BattalarmData> adatas;//告警信息
    private List<BattalarmDataHistory> adataHs;//历史告警信息

 src/main/java/com/whyc/pojo/DevalarmData.java

@@ -77,6 +77,9 @@
    private String stationName;
    @TableField(exist = false)
    private String stationName3;
    @ApiModelProperty("站点id")
    @TableField(exist = false)
    private String stationId;
    @TableField(exist = false)
    @ApiModelProperty("用户推送记录时间")
    private Date recordTime;

 src/main/resources/mapper/BattalarmDataMapper.xml

@@ -4,6 +4,7 @@
    <resultMap id="alarmRes" type="com.whyc.dto.result.AlarmRes">
        <result property="battGroupId" column="BattGroupId"></result>
        <result property="stationName" column="stationname"></result>
        <result property="stationId" column="stationId"></result>
        <result property="battGroupName" column="battgroupname"></result>
        <collection property="adatas" ofType="com.whyc.pojo.BattalarmData">
            <id property="num" column="num"></id>
@@ -43,7 +44,9 @@


    <select id="serchByCondition" resultMap="alarmRes">
        select  distinct(db_alarm.tb_battalarm_data.BattGroupId),db_alarm.tb_battalarm_data.num,alm_signal_id,db_alarm.tb_battalarm_data.monnum,alm_value,alm_level,alm_is_confirmed,alm_confirmed_time,alm_start_time,alm_end_time,   stationname,battgroupname
        select
        distinct(db_alarm.tb_battalarm_data.BattGroupId),db_alarm.tb_battalarm_data.num,alm_signal_id,db_alarm.tb_battalarm_data.monnum,alm_value,alm_level,alm_is_confirmed,alm_confirmed_time,alm_start_time,alm_end_time
        ,stationname,battgroupname,db_battinf.tb_battinf.stationId
        from db_alarm.tb_battalarm_data,db_battinf.tb_battinf
        <where>
            db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid

 src/main/resources/mapper/DevalarmDataMapper.xml

@@ -14,14 +14,15 @@
        <result property="almClearedType" column="alm_cleared_type"></result>
        <result property="devName" column="dev_name"></result>
        <result property="stationName" column="stationName"></result>

        <result property="stationId" column="stationId"></result>

    </resultMap>

    <select id="serchByInfo" resultMap="devAlarmRes">
        SELECT distinct
        tb_devalarm_data.num,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time,alm_is_confirmed,alm_confirmed_time,alm_cleared_type,
        db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.FbsDeviceName as dev_name
        db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.stationId,db_battinf.tb_battinf.FbsDeviceName as
        dev_name
        FROM db_alarm.tb_devalarm_data,db_battinf.tb_battinf
        <where>
            tb_devalarm_data.dev_id=db_battinf.tb_battinf.FbsDeviceId