src/main/java/com/whyc/service/BattAlarmDataVerifyService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/DevAlarmDataVerifyService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/PwrDevAlarmVerifyService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/webSocket/BattAlarmDataSocket.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/webSocket/DevAlarmDataSocket.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/webSocket/PwrAlarmSocket.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/service/BattAlarmDataVerifyService.java
@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.whyc.dto.AlarmDaoFactory; import com.whyc.dto.Response; import com.whyc.dto.paramter.AlarmPar; import com.whyc.mapper.BattAlarmDataVerifyMapper; import com.whyc.pojo.BattAlarmDataVerify; import com.whyc.util.MessageUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -35,4 +38,20 @@ public void delete(Integer num) { mapper.deleteById(num); } public Response getPageOfWebSocket(AlarmPar alarmPar, String lang) { try { PageHelper.startPage(alarmPar.getPage().getPageCurr(), alarmPar.getPage().getPageSize()); QueryWrapper<BattAlarmDataVerify> query = Wrappers.query(); query.orderByDesc("num"); List<BattAlarmDataVerify> list = mapper.selectList(query); list.stream().forEach(data -> { data.setAlarmName(MessageUtils.getMessageSocket(AlarmDaoFactory.getAlarmName(data.getAlmSignalId()), lang)); }); PageInfo<BattAlarmDataVerify> pageInfo = new PageInfo<>(list); return new Response<>().set(1, pageInfo); }catch (Exception e){ return new Response().setII(0,"接口发生异常:"+e.getCause()); } } } src/main/java/com/whyc/service/DevAlarmDataVerifyService.java
@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.whyc.dto.AlarmDaoFactory; import com.whyc.dto.Response; import com.whyc.dto.paramter.DevAlarmPar; import com.whyc.mapper.DevAlarmDataVerifyMapper; import com.whyc.pojo.BattAlarmDataVerify; import com.whyc.pojo.DevAlarmDataVerify; @@ -35,4 +37,20 @@ public void delete(Integer num) { mapper.deleteById(num); } public Response getPageOfWebSocket(DevAlarmPar alarmPar) { try { PageHelper.startPage(alarmPar.getPage().getPageCurr(), alarmPar.getPage().getPageSize()); QueryWrapper<DevAlarmDataVerify> query = Wrappers.query(); query.orderByDesc("num"); List<DevAlarmDataVerify> list = mapper.selectList(query); list.stream().forEach(data -> { data.setAlarmName(AlarmDaoFactory.getAllAlarmName(data.getAlmType())); }); PageInfo<DevAlarmDataVerify> pageInfo = new PageInfo<>(list); return new Response<>().set(1, pageInfo); }catch (Exception e){ return new Response().setII(0,"接口发生异常:"+e.getCause()); } } } src/main/java/com/whyc/service/PwrDevAlarmVerifyService.java
@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.whyc.dto.AlarmDaoFactory; import com.whyc.dto.Response; import com.whyc.mapper.PwrDevAlarmVerifyMapper; import com.whyc.pojo.BattAlarmDataVerify; import com.whyc.pojo.PwrDevAlarmVerify; import com.whyc.pojo.PwrdevAlarm; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -35,4 +37,20 @@ public void delete(Integer num) { mapper.deleteById(num); } public Response getPageOfWebSocket(PwrdevAlarm pwrdevAlarm) { try { PageHelper.startPage(pwrdevAlarm.getPage().getPageCurr(), pwrdevAlarm.getPage().getPageSize()); QueryWrapper<PwrDevAlarmVerify> query = Wrappers.query(); query.orderByDesc("num"); List<PwrDevAlarmVerify> list = mapper.selectList(query); list.stream().forEach(data -> { data.setAlarmName(AlarmDaoFactory.getAllAlarmName(data.getAlmType())); }); PageInfo<PwrDevAlarmVerify> pageInfo = new PageInfo<>(list); return new Response<>().set(1, pageInfo); }catch (Exception e){ return new Response().setII(0,"接口发生异常:"+e.getCause()); } } } src/main/java/com/whyc/webSocket/BattAlarmDataSocket.java
@@ -3,6 +3,7 @@ import com.whyc.config.WebSocketConfig; import com.whyc.dto.Response; import com.whyc.dto.paramter.AlarmPar; import com.whyc.service.BattAlarmDataVerifyService; import com.whyc.service.BattalarmDataService; import com.whyc.util.ActionUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +30,8 @@ private static BattalarmDataService service; private static BattAlarmDataVerifyService verifyService; private Session session; private HttpSession httpSession; @@ -36,6 +39,11 @@ @Autowired public void setService(BattalarmDataService service) { BattAlarmDataSocket.service = service; } @Autowired public void setVerifyService(BattAlarmDataVerifyService verifyService) { BattAlarmDataSocket.verifyService = verifyService; } @OnOpen @@ -66,6 +74,9 @@ //查询分级告警的个数 Response levelRes = service.serchByLevel(alarmPar.getUId()); res.put("levelRes", levelRes); //告警手动确认 Response verifyListRes = verifyService.getPageOfWebSocket(alarmPar,lang); res.put("verifyListRes",verifyListRes); if (session.isOpen()) { //推送信息 synchronized (session) { src/main/java/com/whyc/webSocket/DevAlarmDataSocket.java
@@ -2,6 +2,8 @@ import com.whyc.dto.Response; import com.whyc.dto.paramter.DevAlarmPar; import com.whyc.pojo.DevAlarmDataVerify; import com.whyc.service.DevAlarmDataVerifyService; import com.whyc.service.DevalarmDataService; import com.whyc.util.ActionUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -26,12 +28,18 @@ private volatile Map<Long,Boolean> threadFlagMap = new HashMap<>(); private static DevalarmDataService service; private static DevAlarmDataVerifyService verifyService; private Session session; @Autowired public void setService(DevalarmDataService service){ DevAlarmDataSocket.service = service; } @Autowired public void setVerifyService(DevAlarmDataVerifyService verifyService) { DevAlarmDataSocket.verifyService = verifyService; } @OnOpen @@ -60,6 +68,9 @@ //查询分级告警的个数 Response levelRes = service.serchByLevel(alarmPar.getUId()); res.put("levelRes", levelRes); //告警手动确认 Response verifyListRes = verifyService.getPageOfWebSocket(alarmPar); res.put("verifyListRes",verifyListRes); if (session.isOpen()) { //推送信息 synchronized (session) { src/main/java/com/whyc/webSocket/PwrAlarmSocket.java
@@ -2,6 +2,7 @@ import com.whyc.dto.Response; import com.whyc.pojo.PwrdevAlarm; import com.whyc.service.PwrDevAlarmVerifyService; import com.whyc.service.PwrdevAlarmService; import com.whyc.util.ActionUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -28,11 +29,17 @@ private static PwrdevAlarmService service; private static PwrDevAlarmVerifyService verifyService; private Session session; @Autowired public void setService(PwrdevAlarmService service){ PwrAlarmSocket.service = service; } @Autowired public void setVerifyService(PwrDevAlarmVerifyService verifyService) { PwrAlarmSocket.verifyService = verifyService; } @OnOpen @@ -52,7 +59,13 @@ if (session.isOpen()) { //推送信息 synchronized (session) { session.getBasicRemote().sendObject(service.getAllPage2OfWebSocket(pwrdevAlarm)); Map<String, Response> res = new HashMap<>(); Response powerAlarmRes = service.getAllPage2OfWebSocket(pwrdevAlarm); res.put("powerAlarmRes",powerAlarmRes); //告警手动确认 Response verifyListRes = verifyService.getPageOfWebSocket(pwrdevAlarm); res.put("verifyListRes",verifyListRes); session.getBasicRemote().sendObject(res); } threadFlagMap.put(thread.getId(),false); }