From 55a438bbad3f8b51c315dd2415471873050bf4b3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 07 四月 2025 15:01:19 +0800
Subject: [PATCH] 修改反馈bug
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TNoticesController.java | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 69 insertions(+), 0 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TNoticesController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TNoticesController.java
index 20a80f3..5917201 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TNoticesController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TNoticesController.java
@@ -1,11 +1,19 @@
package com.stylefeng.guns.modular.system.controller.general;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TDriver;
+import com.stylefeng.guns.modular.system.model.TSystemNotice;
+import com.stylefeng.guns.modular.system.model.TUser;
+import com.stylefeng.guns.modular.system.service.ITDriverService;
+import com.stylefeng.guns.modular.system.service.ITSystemNoticeService;
+import com.stylefeng.guns.modular.system.service.ITUserService;
+import com.stylefeng.guns.modular.system.util.JpushUtil;
import com.stylefeng.guns.modular.system.util.task.base.QuartzManager;
import com.stylefeng.guns.modular.system.util.task.base.TimeJobType;
import com.stylefeng.guns.modular.system.util.task.jobs.AddNotice;
@@ -22,6 +30,7 @@
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -151,6 +160,14 @@
return SUCCESS_TIP;
}
+ @Autowired
+ private ITDriverService driverService;
+
+ @Autowired
+ private ITUserService tUserService;
+
+ @Autowired
+ private ITSystemNoticeService noticeService;
/**
* 新增系统公告
*/
@@ -167,6 +184,58 @@
tNotices.setIsUser(isUser);
tNotices.setIsDriver(isDriver);
tNoticesService.insert(tNotices);
+ if (tNotices.getIsUser() == 2){
+ List<TUser> tUsers = tUserService.selectList(new EntityWrapper<TUser>().eq("state",1)
+ .ne("flag",3));
+ //发送公告给用户
+ for (TUser user : tUsers){
+ TSystemNotice notice = new TSystemNotice();
+ notice.setType(1);
+ notice.setUserType(1);
+ notice.setNoticesId(tNotices.getId());
+ notice.setContent(tNotices.getContent());
+ notice.setUserId(user.getId());
+ notice.setInsertTime(new Date());
+ notice.setRead(1);
+ noticeService.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){
+ List<TDriver> tDrivers = driverService.selectList(new EntityWrapper<TDriver>().eq("authState",2)
+ .ne("flag",3));
+ //发送公告给用户
+ for (TDriver driver : tDrivers){
+ TSystemNotice notice = new TSystemNotice();
+ notice.setType(1);
+ notice.setUserType(2);
+ notice.setNoticesId(tNotices.getId());
+ notice.setContent(tNotices.getContent());
+ notice.setUserId(driver.getId());
+ notice.setInsertTime(new Date());
+ notice.setRead(1);
+ noticeService.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){
+// //增加极光推送
+// JpushUtil.SendPushWithCustomForSh("DRIVER"+driver.getId().toString(),tNotices.getTitle(),"通知消息",null);
+// }
+
+ }
+ }
if (tNotices.getIsShow() == 1){ //发布
//定时1秒后执行
Map<String,Object> maps=new HashMap<>();
--
Gitblit v1.7.1