追加返回字段站点名称字段

whycxzp

2023-09-09 444cc302d5959d931c48d94ad763acda8d6342b5

追加返回字段站点名称字段

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

@@ -83,6 +83,8 @@
    @TableField(exist = false)
    private String stationName3;
    @TableField(exist = false)
    private String stationName4;
    @TableField(exist = false)
    private String stationName5;
    @ApiModelProperty("站点id")
    @TableField(exist = false)

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

@@ -104,6 +104,8 @@
    @ApiModelProperty(value = "机房名称")
    private String stationName3;
    @TableField(exist = false)
    private String stationName4;
    @TableField(exist = false)
    @ApiModelProperty(value = "用户关闭记录时间")
    private Date recordTime;


 src/main/resources/mapper/CommonMapper.xml

@@ -65,11 +65,11 @@
    </insert>
    <insert id="insertBatch4PowerAlarmHistoryByYear">
        insert into db_pwrdev_alarm.`tb_pwrdev_alarm_history_${year}`
        (record_id,PowerDeviceId,alm_type,alm_level,alm_source,alm_index,alm_start_time,alm_end_time,alm_value,alm_is_confirmed,alm_confirmed_time,alm_cleared_type,usr_Id,alm_severity)
        (record_id,PowerDeviceId,alm_type,alm_level,alm_source,alm_index,alm_start_time,alm_end_time,alm_value,alm_is_confirmed,alm_confirmed_time,alm_cleared_type,usr_Id,alm_severity,alm_trigger)
        values
        <foreach collection="temp" item="item" separator=",">
            (#{item.recordId},#{item.PowerDeviceId},#{item.almType},#{item.almLevel},#{item.almSource},#{item.almIndex},#{item.almStartTime},#{item.almEndTime},#{item.almValue},#{item.almIsConfirmed},
            #{item.almConfirmedTime},#{item.almClearedType},#{item.usrId},#{item.almSeverity})
            #{item.almConfirmedTime},#{item.almClearedType},#{item.usrId},#{item.almSeverity},#{item.almTrigger})
        </foreach>
    </insert>
    <insert id="createTable4BattAlarmDataHistoryByYear">

 src/main/resources/mapper/DevalarmDataMapper.xml

@@ -73,7 +73,11 @@
        select distinct db_alarm.tb_devalarm_data.num,
                        db_alarm.tb_devalarm_data.dev_id,
                        db_battinf.tb_battinf.stationname,
                        db_battinf.tb_battinf.stationname1,
                        db_battinf.tb_battinf.stationname2,
                        db_battinf.tb_battinf.stationname3,
                        db_battinf.tb_battinf.stationname4,
                        db_battinf.tb_battinf.stationname5,
                        db_battinf.tb_battinf.stationid,
                        db_battinf.tb_battinf.fbsdevicename,
                        dev_ip,

 src/main/resources/mapper/PwrdevAlarmMapper.xml

@@ -195,7 +195,7 @@
    </select>

    <select id="getRealAlarmFoot" resultType="com.whyc.pojo.PwrdevAlarm">
        select  alarm.*,inf.StationName,inf.StationName3 from db_pwrdev_alarm.tb_pwrdev_alarm alarm,db_pwrdev_inf.tb_pwrdev_inf inf
        select  alarm.*,inf.StationName,inf.StationName1,inf.StationName2,inf.StationName3,inf.StationName4,inf.StationName5 from db_pwrdev_alarm.tb_pwrdev_alarm alarm,db_pwrdev_inf.tb_pwrdev_inf inf
        <where>
            alarm.PowerDeviceId = inf.PowerDeviceId
            and alarm.alm_cleared_type=0