update

whycrzg

2021-02-20 fdc3e99c0c4077b64482d14f64320902e917286d

update

 src/main/java/com/fgkj/mapper/impl/Battalarm_dataMapper.java

@@ -698,7 +698,7 @@
    public List<Battalarm_data>  serchBatt_alarm(Battalarm_data obj);

    // 3.1电池告警实时查询<***********跨域专用**************>
    public List serchByCondition_ky(BattInf obj);
    public List<Battalarm_data> serchByCondition_ky(BattInf obj);

    //查询电池组最近一次告警等级
    @Select("select alm_level from db_alarm.tb_battalarm_data where battgroupid=#{battGroupId} order by alm_start_time desc limit 1")

 src/main/java/com/fgkj/services/Battalarm_dataService.java

@@ -573,7 +573,7 @@
    public ServiceModel serchByCondition_ky(BattInf obj){
        ServiceModel model=new ServiceModel();
        List<Battalarm_data> list=mapper.serchByCondition_ky(obj);
        if(list!=null && list.size()>1) {    //TODO
        if(list!=null && list.size()>1) {
            for (int i = 0; i < list.size(); i++) {
                String name = "未知";            //存放告警名称
                String type = "未知";            //存放告警等级

 src/main/resources/mapper/BattAlarmDataMapper.xml

@@ -2114,11 +2114,11 @@
<!--    <select id="serchTopBattTen" resultType="java.util.List"></select>-->
<!--    <select id="serchBatt_alarm" resultType="java.util.List"></select>-->

    <select id="serchByCondition_ky" resultType="java.util.List">
        select distinct db_alarm.tb_battalarm_data.BattGroupId,
        db_alarm.tb_battalarm_data.num,
    <select id="serchByCondition_ky" resultType="Battalarm_data">
        select distinct db_alarm.tb_battalarm_data.BattGroupId as battGroupId,
        db_alarm.tb_battalarm_data.num as num,
        alm_signal_id,
        db_alarm.tb_battalarm_data.monnum,
        db_alarm.tb_battalarm_data.monnum as monNum,
        alm_value,
        alm_level,
        alm_is_confirmed,