whyclxw
2025-02-08 ef4fc36eb6ba1274c89469ec678ba4c2f58ad04a
实时界面点击查看历史信息
4个文件已修改
25 ■■■■■ 已修改文件
src/main/java/com/whyc/mapper/LockInfMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_lock_alarm/LockAlarm.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/LockAlarmService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/LockInfMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/LockInfMapper.java
@@ -20,4 +20,6 @@
    //实时获取获取区域下所有锁的状态
    List<LockInf> getRealLock(@Param("areaList")  List<Integer> areaList);
    LockInf getlinfBylockId(Integer lockId);
}
src/main/java/com/whyc/pojo/db_lock_alarm/LockAlarm.java
@@ -1,8 +1,11 @@
package com.whyc.pojo.db_lock_alarm;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.whyc.pojo.db_area.AreaInf;
import com.whyc.pojo.db_area.LockInf;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -54,5 +57,6 @@
    @ApiModelProperty(value = "告警结束时间")
    private Date almEndTime;
    @TableField(exist = false)
    private LockInf linf;
}
src/main/java/com/whyc/service/LockAlarmService.java
@@ -5,6 +5,8 @@
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.mapper.LockAlarmMapper;
import com.whyc.mapper.LockInfMapper;
import com.whyc.pojo.db_area.LockInf;
import com.whyc.pojo.db_lock_alarm.LockAlarm;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -16,6 +18,9 @@
public class LockAlarmService {
    @Autowired(required = false)
    private LockAlarmMapper mapper;
    @Autowired(required = false)
    private LockInfMapper linfMapper;
    //查询锁实时告警信息
    public Response getLockAlm(Integer lockId, Integer almId,int pageNum,  int pageSize) {
        PageHelper.startPage(pageNum,pageSize);
@@ -27,6 +32,10 @@
            wrapper.eq("alm_id",almId);
        }
        List<LockAlarm> list=mapper.selectList(wrapper);
        for (LockAlarm alm:list) {
            LockInf linf=linfMapper.getlinfBylockId(alm.getLockId());
            alm.setLinf(linf);
        }
        PageInfo pageInfo=new PageInfo(list);
        return new Response().setII(1,list!=null,pageInfo,"查询锁实时告警信息");
    }
src/main/resources/mapper/LockInfMapper.xml
@@ -65,5 +65,13 @@
        </where>
        order by last_update_time desc
    </select>
    <select id="getlinfBylockId" resultType="com.whyc.pojo.db_area.LockInf">
        select tb_lock_inf.*,tb_area_inf.area_name,tb_area_inf.area_path from db_area.tb_lock_inf,db_area.tb_area_inf
        <where>
            tb_lock_inf.area_id=tb_area_inf.id
            and lock_id=#{lockId}
        </where>
        order by id asc
    </select>
</mapper>