消息推送修改

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/event/ApplicationEvent.java

@@ -13,6 +13,8 @@ import com.yihu.jw.care.job.order.DailyWaterJob;
import com.yihu.jw.care.job.order.EmeWarnOrderDayJob;
import com.yihu.jw.care.job.order.EmeWarnOrderJob;
import com.yihu.jw.care.job.pushRecord.PushRecordJob;
import com.yihu.jw.care.job.pushRecord.PushTimeIntegerPointJob;
import com.yihu.jw.care.job.pushRecord.PushWeatherForecastJob;
import com.yihu.jw.care.job.sim.GetSimsVoiceFlowDayJob;
import com.yihu.jw.care.job.sim.GetSimsVoiceFlowMonthJob;
import com.yihu.jw.care.job.sim.UpdateSimsJob;
@@ -254,6 +256,23 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
            }else {
                logger.info("DEVICE_WATCH_REMAINING_POWER_JOB exist");
            }
            //时间整点报时：早上10点到下午18点进行准点播报
            if(!quartzHelper.isExistJob("PUSH_MASSAGE_TIME_INTEGER_POINT_JOB")){
               String trigger =  SystemConf.getInstance().getSystemProperties().getProperty("PUSH_MASSAGE_TIME_INTEGER_POINT_JOB");
               quartzHelper.addJob(PushTimeIntegerPointJob.class,trigger,"PUSH_MASSAGE_TIME_INTEGER_POINT_JOB",new HashMap<String,Object>());
                logger.info("PUSH_MASSAGE_TIME_INTEGER_POINT_JOB success");
            }else {
                logger.info("PUSH_MASSAGE_TIME_INTEGER_POINT_JOB success");
            }
            //天气预报：每天早上11点播报
            if (!quartzHelper.isExistJob("PUSH_MESSAGE_WEATHER_FORECAST_JOB")){
                String trigger =  SystemConf.getInstance().getSystemProperties().getProperty("PUSH_MESSAGE_WEATHER_FORECAST_JOB");
                quartzHelper.addJob(PushWeatherForecastJob.class,trigger,"PUSH_MESSAGE_WEATHER_FORECAST_JOB",new HashMap<String,Object>());
                logger.info("PUSH_MESSAGE_WEATHER_FORECAST_JOB success");
            }else {
                logger.info("PUSH_MESSAGE_WEATHER_FORECAST_JOB success");
            }
        } catch (Exception e) {
            logger.info(" job start failed");

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

@@ -21,9 +21,9 @@ public class DeviceWatchRemainingPowerJob implements Job {
    private PatientDeviceService patientDeviceService;
    @Override
    public void execute(JobExecutionContext context) throws JobExecutionException {
        System.out.println("====================系统推送设备电量低start==================");
        logger.info("DeviceWatchRemainingPowerJob start");
        try {
            System.out.println("====================系统推送设备电量低start==================");
            logger.info("DeviceWatchRemainingPowerJob start");
            patientDeviceService.deviceWatchRemainingPower();
            logger.info("DeviceWatchRemainingPowerJob end");
            System.out.println("====================系统推送设备电量低end==================");

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/job/pushRecord/PushRecordJob.java

@@ -83,7 +83,7 @@ public class PushRecordJob implements Job {
                for (SystemMessageDO messageDO : messageDOS) {
                    devicelostMessageUtil.patientMessageSocket(messageDO);
                    devicelostMessageUtil.patientMessageSocket(messageDO,null);
                }
                systemMessageDao.save(messageDOS);
                basePushrecordLogInfoDao.save(logInfoEntityList);

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/job/pushRecord/PushWeatherForecastJob.java

@@ -26,7 +26,6 @@ public class PushWeatherForecastJob implements Job {
    public void execute(JobExecutionContext context) throws JobExecutionException {
        try {
            if (deviceLostMessageUtil.messageOnOff(7)) {
                System.out.println("====================系统推送天气预报start==================");
                logger.info("PushWeatherForecastJob start");
                pushWeatherForecastService.weatherForecastS();

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

@@ -356,6 +356,7 @@ public class PatientDeviceService {
                    patients.put("sex",map.get("sex"));
                    patients.put("photo",map.get("photo"));
                    patients.put("category_code",map.get("category_code"));
                    patients.put("deviceSn",map.get("device_sn").toString());
                    rslist.add(patients);
                }
                Thread.sleep(1000);

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/service/message/PushTimeIntegerPointService.java

@@ -43,7 +43,7 @@ public class PushTimeIntegerPointService {
            }
            SystemMessageDO messageDO = systemPushMessageUtil.systemMessageDOSave("整点报时", content,"996","0","system","整点报时通知助手",patient,map.get("name").toString(),"1",map.get("photo").toString(),url);
            /*socket 推送*/
            deviceLostMessageUtil.patientMessageSocket(messageDO);
            deviceLostMessageUtil.patientMessageSocket(messageDO,null);
            systemMessageDOList.add(messageDO);
        }
        systemMessageDao.save(systemMessageDOList);

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/service/message/PushWeatherForecastService.java

@@ -59,7 +59,7 @@ public class PushWeatherForecastService {
            }
            SystemMessageDO messageDO = systemPushMessageUtil.systemMessageDOSave("天气预报",content,"995","0","system","天气预报通知助手",patient,map.get("name").toString(),"1",map.get("photo").toString(),url);
            /*socket 推送*/
            deviceLostMessageUtil.patientMessageSocket(messageDO);
            deviceLostMessageUtil.patientMessageSocket(messageDO,null);
            messageDOList.add(messageDO);
        }
        systemMessageDao.save(messageDOList);

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

@@ -204,7 +204,6 @@ public class DeviceLostMessageUtil {
                    }
                }
            }
            if (StringUtils.isNotBlank(deivceName)){
                String sContent = content;
                sContent = sContent.replace("{name}",patient.get("name").toString());
@@ -228,7 +227,7 @@ public class DeviceLostMessageUtil {
                messageDOS.add(messageDO);
                //socket推送
                patientMessageSocket(messageDO);
                patientMessageSocket(messageDO,deviceSnS);
            }
        }
        if (messageDOS.size()>0){
@@ -310,16 +309,23 @@ public class DeviceLostMessageUtil {
    public void patientMessageSocket(SystemMessageDO messageDOWatch){
    public void patientMessageSocket(SystemMessageDO messageDOWatch,String deviceSn){
        JSONObject message = new JSONObject();
        message.put("title",messageDOWatch.getTitle());
        message.put("type",messageDOWatch.getType());
        message.put("content",messageDOWatch.getContent());
        message.put("audioUrl",messageDOWatch.getAudioUrl());
        message.put("content_type",999);
        if (StringUtils.isNotBlank(deviceSn)){
            message.put("deviceSn",deviceSn);
            message.put("content_type",991);
        }else {
            message.put("content_type",999);
        }
        imUtil.sendPatientSystemMessage(messageDOWatch.getReceiver(), JSON.toJSONString(message, SerializerFeature.WriteMapNullValue));
    }
    /**
     * 手表 报警器 电量低通知
     * @param patientList
@@ -367,7 +373,7 @@ public class DeviceLostMessageUtil {
                            watchName+=jsonObject.getString("name");
                        }
                        /*socket 推送*/
                        patientMessageSocket(messageDOWatch);
                        patientMessageSocket(messageDOWatch, jsonObject.getString("deviceSn"));
                    }
                    break;
                case 7:
@@ -395,7 +401,7 @@ public class DeviceLostMessageUtil {
                            SOSName += jsonObject.getString("patient");
                        }
                        /*socket 推送*/
                        patientMessageSocket(messageDO);
                        patientMessageSocket(messageDO,jsonObject.getString("deviceSn"));
                    }
                    break;
            }

svr/svr-cloud-job/src/main/resources/system.properties

@@ -40,13 +40,13 @@ SYN_FACE_RECORD_JOB= 0 0/30 * * * ? *
SYN_ELECTRIC_RECORD_JOB= 0 0 8 * * ? *
#\u63A8\u9001\u8BB0\u5165\u624B\u52A8\u5B9A\u65F6 \u6BCF\u4E94\u5206\u949F\u8DD1\u4E00\u6B21
PUSHRECORD_LOG_INFO_JOB= 0 0/5 * * * ? *
#\u6BCF\u5929\u65E9\u4E0A\u4E5D\u70B9\u534A\u8DD1\u4E00\u6B21
#\u8BBE\u5907\u79BB\u7EBF\u6BCF\u5929\u65E9\u4E0A\u4E5D\u70B9\u534A\u8DD1\u4E00\u6B21
PUSH_DEVICE_OFF_LONE_JOB= 0 30 9 * * ?
#\u6BCF\u5929\u65E9\u4E0A\u5341\u4E00\u70B9 \u624B\u8868\u4F69\u6234\u63D0\u9192
DEVICE_WATCH_OFF_WEAR_JOB= 0 0 11 * * ?
#\u624B\u8868\u7535\u91CF\u4F4E  \u6BCF\u4E00\u4E2A\u5C0F\u65F6\u83B7\u53D6\u4E00\u6B21 \u7535\u91CF
DEVICE_WATCH_REMAINING_POWER_JOB= 0 0 0/1 * * ?
#\u624B\u8868\u7535\u91CF\u4F4E \u6BCF\u4E00\u4E2A\u5C0F\u65F6\u83B7\u53D6\u4E00\u6B21 \u7535\u91CF
DEVICE_WATCH_REMAINING_POWER_JOB= 0 0 8,9,10,14,15,16,17,18,19,20 * * ?
#\u65F6\u95F4\u6574\u70B9\u62A5\u65F6\uFF1A\u65E9\u4E0A10\u70B9\u5230\u4E0B\u534818\u70B9\u8FDB\u884C\u51C6\u70B9\u64AD\u62A5
PUSH_MASSAGE_TIME_INTEGER_POINT= 0 10,11,12,13,14,15,16,17,18 * * ?
PUSH_MASSAGE_TIME_INTEGER_POINT_JOB= 0 0 10,11,12,13,14,15,16,17,18 * * ?
#\u5929\u6C14\u9884\u62A5\uFF1A\u6BCF\u5929\u65E9\u4E0A11\u70B9\u64AD\u62A5
PUSH_MESSAGE_WEATHER_FORECAST= 0 0 11 * * ?
PUSH_MESSAGE_WEATHER_FORECAST_JOB= 0 0 11 * * ?