whyclxw
2025-02-08 1a9c47338af84320cabc451f707bed23b5717455
查询锁实时告警信息
4个文件已修改
15 ■■■■ 已修改文件
src/main/java/com/whyc/controller/LockAlarmController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/dto/LockAlmDto.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/LockAlarmService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/webSocket/LockAlmRtSocket.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/LockAlarmController.java
@@ -21,9 +21,9 @@
    private LockAlarmService service;
    @ApiOperation("查询锁实时告警信息")
    @GetMapping("getLockAlm")
    public Response getLockAlm(@RequestParam(required = false) Integer lockId, @RequestParam(required = false) Integer almId
    public Response getLockAlm(@RequestParam(required = false) Integer lockId, @RequestParam(required = false) String almIds
            , @RequestParam int pageNum, @RequestParam int pageSize) {
        Response res=service.getLockAlm(lockId,almId,pageNum,pageSize);
        Response res=service.getLockAlm(lockId,almIds,pageNum,pageSize);
        return res;
    }
src/main/java/com/whyc/dto/LockAlmDto.java
@@ -5,7 +5,7 @@
@Data
public class LockAlmDto {
    private Integer lockId;
    private Integer almId;
    private String almIds;
    private Integer pageNum;
    private Integer pageSize;
}
src/main/java/com/whyc/service/LockAlarmService.java
@@ -27,14 +27,15 @@
    @Autowired(required = false)
    private LockInfMapper linfMapper;
    //查询锁实时告警信息
    public Response getLockAlm(Integer lockId, Integer almId,int pageNum,  int pageSize) {
    public Response getLockAlm(Integer lockId, String almIds,int pageNum,  int pageSize) {
        PageHelper.startPage(pageNum,pageSize);
        QueryWrapper wrapper=new QueryWrapper();
        if(lockId!=null){
            wrapper.eq("lock_id",lockId);
        }
        if(almId!=null){
            wrapper.eq("alm_id",almId);
        if(almIds!=null){
            String[] almId=almIds.split(",");
            wrapper.in("alm_id",almId);
        }
        List<LockAlarm> list=mapper.selectList(wrapper);
        for (LockAlarm alm:list) {
src/main/java/com/whyc/webSocket/LockAlmRtSocket.java
@@ -49,7 +49,7 @@
                    Thread thread = currentThread();
                    threadFlagMap.put(thread.getId(), true);
                    try {
                        Response res=almService.getLockAlm(almDto.getLockId(),almDto.getAlmId(),almDto.getPageNum(),almDto.getPageSize());
                        Response res=almService.getLockAlm(almDto.getLockId(),almDto.getAlmIds(),almDto.getPageNum(),almDto.getPageSize());
                        if (session.isOpen()) {
                            //推送信息
                            synchronized (session) {