Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-18 53562814add61acfdc02d6b25dae6324f6fd5f92

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/jobs/AddNotice.java

@@ -46,13 +46,6 @@
                        notice.setInsertTime(new Date());
                        notice.setRead(1);
                        tSystemNoticeService.insert(notice);

                    /*Map<String,Object> map = new HashMap<String,Object>();
                    map.put("sound", userInfo.getIsVoice());   //是否有声音  1=否 2=是
                    map.put("vibrate", userInfo.getIsShake()); //是否有震动  1=否 2=是
                    map.put("type", 2);    //消息类型 1=互动  2=公告
                    map.put("id", record.getId()); //对象ID
                    JpushUtil.SendPushWithCustomForTransmission(String.valueOf(userInfo.getId()),"【超级过客】提醒您，您有一条新的公告消息。","通知消息",map);*/
                    }
                }
                if (tNotices.getIsDriver() == 2){
@@ -68,13 +61,6 @@
                        notice.setInsertTime(new Date());
                        notice.setRead(1);
                        tSystemNoticeService.insert(notice);

                        /*Map<String,Object> map = new HashMap<String,Object>();
                        map.put("sound", userInfo.getIsVoice());   //是否有声音  1=否 2=是
                        map.put("vibrate", userInfo.getIsShake()); //是否有震动  1=否 2=是
                        map.put("type", 2);    //消息类型 1=互动  2=公告
                        map.put("id", record.getId()); //对象ID
                        JpushUtil.SendPushWithCustomForTransmission(String.valueOf(userInfo.getId()),"【超级过客】提醒您，您有一条新的公告消息。","通知消息",map);*/

                        if (tNotices.getIsBroadcast() == 1){
                            //增加极光推送