预警打电话功能剥离

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpStockServiceImpl.java

@@ -463,13 +463,30 @@ public class HxpStockServiceImpl implements IHxpStockService {
                             logger.info("获取实验室管理员和安全员信息失败！{}",JSON.toJSONString(listResultData));
                         }
                         List<UserPhoneInfo> userPhoneInfoList = listResultData.getData();
-                        AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, SendTypes.All.name(), text);
+                        AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, SendTypes.SMS.name(), text);
                         alarmEntrty.setLogId(logId);
                         alarmEntrty.setUserPhoneInfo(userPhoneInfoList);
                         remoteAlarmService.send(alarmEntrty);
                         logger.info("化学品违规带离发送短信打电话消息推送完成！");
                     }
                 }
+                //电话通知
+                if (illegalRemoval.contains("5")) {
+                    String[] strings = Stream.of(phones.toString().split(",")).filter(a -> StrUtil.isNotBlank(a)).collect(Collectors.joining(",")).split(",");
+                    if (strings != null) {
+                        //获取人员电话信息
+                        ResultData<List<UserPhoneInfo>> listResultData = remoteLaboratoryService.selectAdminAndSafeAdminById(warningNoticeLogDto.getSubId());
+                        if(HttpStatus.SUCCESS != listResultData.getCode()){
+                            logger.info("获取实验室管理员和安全员信息失败！{}",JSON.toJSONString(listResultData));
+                        }
+                        List<UserPhoneInfo> userPhoneInfoList = listResultData.getData();
+                        AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, SendTypes.Call.name(), text);
+                        alarmEntrty.setLogId(logId);
+                        alarmEntrty.setUserPhoneInfo(userPhoneInfoList);
+                        remoteAlarmService.send(alarmEntrty);
+                        logger.info("化学品违规带离打电话消息推送完成！");
+                    }
+                }
                 //声光报警
                 if (hardwareRfidDto != null && illegalRemoval.contains("3")) {
                     List<Map<String, Object>> terminalList = hxpSmartTerminalMapper.selectTerminalBySubId(8, hxpStock.getSubId());
@@ -1110,13 +1127,30 @@ public class HxpStockServiceImpl implements IHxpStockService {
                                 logger.info("获取实验室管理员和安全员信息失败！{}",JSON.toJSONString(listResultData));
                             }
                             List<UserPhoneInfo> userPhoneInfoList = listResultData.getData();
-                            AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, SendTypes.All.name(), text);
+                            AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, SendTypes.SMS.name(), text);
                             alarmEntrty.setLogId(logId);
                             alarmEntrty.setUserPhoneInfo(userPhoneInfoList);
                             remoteAlarmService.send(alarmEntrty);
                             logger.info("化学品超时未归还发送短信打电话消息推送完成！");
                         }
                     }
+                    if (timeout.contains("5")) {
+                        //电话通知
+                        String[] strings = Stream.of(phones.toString().split(",")).filter(a -> StrUtil.isNotBlank(a)).collect(Collectors.joining(",")).split(",");
+                        if (strings != null) {
+                            //获取人员电话信息
+                            ResultData<List<UserPhoneInfo>> listResultData = remoteLaboratoryService.selectAdminAndSafeAdminById(warningNoticeLogDto.getSubId());
+                            if(HttpStatus.SUCCESS != listResultData.getCode()){
+                                logger.info("获取实验室管理员和安全员信息失败！{}",JSON.toJSONString(listResultData));
+                            }
+                            List<UserPhoneInfo> userPhoneInfoList = listResultData.getData();
+                            AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, SendTypes.Call.name(), text);
+                            alarmEntrty.setLogId(logId);
+                            alarmEntrty.setUserPhoneInfo(userPhoneInfoList);
+                            remoteAlarmService.send(alarmEntrty);
+                            logger.info("化学品超时未归还打电话消息推送完成！");
+                        }
+                    }
 
                     Long alarmId = null;
                     //声光报警