src/main/java/com/whyc/controller/LockAlarmController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/dto/LockAlmDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/LockAlarmService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/webSocket/LockAlmRtSocket.java | ●●●●● 补丁 | 查看 | 原始文档 | 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) String almIds public Response getLockAlm(@RequestParam(required = false) Integer areaId, @RequestParam(required = false) String almIds, @RequestParam(required = false) Integer confirmFlag , @RequestParam int pageNum, @RequestParam int pageSize) { Response res=service.getLockAlm(lockId,almIds,pageNum,pageSize); Response res=service.getLockAlm(areaId,almIds,confirmFlag,pageNum,pageSize); return res; } src/main/java/com/whyc/dto/LockAlmDto.java
@@ -4,6 +4,8 @@ @Data public class LockAlmDto { private Integer areaId; private Integer confirmFlag; private Integer lockId; private String almIds; private Integer pageNum; src/main/java/com/whyc/service/LockAlarmService.java
@@ -14,8 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @Service public class LockAlarmService { @@ -24,17 +26,34 @@ @Autowired(required = false) private LockInfMapper linfMapper; @Autowired private AreaInfService areaInfService; //查询锁实时告警信息 public Response getLockAlm(Integer lockId, String almIds,int pageNum, int pageSize) { public Response getLockAlm(Integer areaId, String almIds,Integer confirmFlag,int pageNum, int pageSize) { PageHelper.startPage(pageNum,pageSize); QueryWrapper wrapper=new QueryWrapper(); if(lockId!=null){ wrapper.eq("lock_id",lockId); if(areaId!=null){ List<Integer> areaList=new ArrayList(); areaList.add(areaId); areaInfService.getAllAreaId(areaId,areaList); if(areaList!=null){ QueryWrapper wrapper1=new QueryWrapper(); wrapper1.in("area_id",areaList); List<LockInf> lockInfList=linfMapper.selectList(wrapper1); List<Integer> lockIdList = lockInfList.stream() .map(LockInf::getLockId) // 提取id值 .collect(Collectors.toList()); // 转换为列表*/ wrapper.in("lock_id",lockIdList); } } if(almIds!=null){ String[] almId=almIds.split(","); wrapper.in("alm_id",almId); } if(confirmFlag!=null){ wrapper.eq("alm_is_confirmed",confirmFlag); } List<LockAlarm> list=mapper.selectList(wrapper); for (LockAlarm alm:list) { LockInf linf=linfMapper.getlinfBylockId(alm.getLockId()); 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.getAlmIds(),almDto.getPageNum(),almDto.getPageSize()); Response res=almService.getLockAlm(almDto.getAreaId(),almDto.getAlmIds(),almDto.getConfirmFlag(),almDto.getPageNum(),almDto.getPageSize()); if (session.isOpen()) { //推送信息 synchronized (session) {