Merge branch 'dev' of liubing/wlyy2.0 into dev

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/job/device/DeviceLostAssociationJob.java

@@ -30,7 +30,7 @@ public class DeviceLostAssociationJob implements Job {
            patientDeviceService.selectAndUpdate();
            logger.info("DeviceLostAssociationJob end");
        } catch (Exception e) {
            logger.info(e.getMessage());
            logger.info("DeviceLostAssociationJob --ERROR MSG:"+e.getMessage());
            e.printStackTrace();
        }
    }

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/util/DeviceLostMessageUtil.java

@@ -104,21 +104,22 @@ public class DeviceLostMessageUtil {
                            break;
                    }
                    BasePatientDO patientDO = patientDao.findById(deviceDO.getUser());
                    SystemMessageDO messageDO = new SystemMessageDO();
                    messageDO.setTitle("设备离线通知");
                    messageDO.setType("43");
                    messageDO.setIsRead("0");
                    messageDO.setSender(deviceDO.getUser());
                    messageDO.setSenderName(patientDO.getName());
                    messageDO.setRelationCode(id);
                    messageDO.setReceiver(docTmp.get("id").toString());
                    messageDO.setReceiverName(docTmp.get("name").toString());
                    messageDO.setOver("1");
                    messageDO.setData(deviceName+"离线");
                    messageDO.setDel("1");
                    messageDO.setCreateTime(new Date());
                    messageDO.setSenderPhoto(patientDO.getPhoto());
                    messageDOS.add(messageDO);
                    if (patientDO!=null){
                        SystemMessageDO messageDO = new SystemMessageDO();
                        messageDO.setTitle("设备离线通知");
                        messageDO.setType("43");
                        messageDO.setIsRead("0");
                        messageDO.setSender(deviceDO.getUser());
                        messageDO.setSenderName(patientDO.getName());
                        messageDO.setRelationCode(id);
                        messageDO.setReceiver(docTmp.get("id").toString());
                        messageDO.setReceiverName(docTmp.get("name").toString());
                        messageDO.setOver("1");
                        messageDO.setData(deviceName+"离线");
                        messageDO.setDel("1");
                        messageDO.setCreateTime(new Date());
                        messageDO.setSenderPhoto(patientDO.getPhoto());
                        messageDOS.add(messageDO);
//                    if ("family3".equals(docTmp.get("user").toString())){//设备离线推送给家属
//                        if(null!=docTmp.get("openid")&& StringUtils.isNotBlank(docTmp.get("openid").toString())){
//                            String first = patientDO.getName()+" "+deviceName+"设备疑似离线";
@@ -130,6 +131,7 @@ public class DeviceLostMessageUtil {
//                        }
//                    }
                    }
                }
            }
        }