Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
cms
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
iuav
cms
Commits
dcde35a3
提交
dcde35a3
authored
2月 05, 2024
作者:
han
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
增加聊天新消息短信提醒
上级
f00a49e0
流水线
#8172
已通过 于阶段
in 2 分 22 秒
变更
9
流水线
1
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
151 行增加
和
6 行删除
+151
-6
pom.xml
csm-service/cms-service-user/pom.xml
+5
-3
RedisConfig.java
...r/src/main/java/com/mmc/iuav/user/config/RedisConfig.java
+34
-0
UserAccountDO.java
...src/main/java/com/mmc/iuav/user/entity/UserAccountDO.java
+1
-1
UserDO.java
...e-user/src/main/java/com/mmc/iuav/user/entity/UserDO.java
+2
-0
MessageServiceImpl.java
...va/com/mmc/iuav/user/service/impl/MessageServiceImpl.java
+8
-0
MyTask.java
...ice-user/src/main/java/com/mmc/iuav/user/util/MyTask.java
+33
-0
ScheduledTaskUtil.java
...c/main/java/com/mmc/iuav/user/util/ScheduledTaskUtil.java
+62
-0
SmsUtil.java
...ce-user/src/main/java/com/mmc/iuav/user/util/SmsUtil.java
+5
-0
pom.xml
pom.xml
+1
-2
没有找到文件。
csm-service/cms-service-user/pom.xml
浏览文件 @
dcde35a3
...
@@ -112,7 +112,10 @@
...
@@ -112,7 +112,10 @@
<artifactId>
hutool-all
</artifactId>
<artifactId>
hutool-all
</artifactId>
<version>
5.3.5
</version>
<version>
5.3.5
</version>
</dependency>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-data-redis
</artifactId>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
@@ -127,4 +130,4 @@
...
@@ -127,4 +130,4 @@
</plugins>
</plugins>
</build>
</build>
</project>
</project>
\ No newline at end of file
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/config/RedisConfig.java
0 → 100644
浏览文件 @
dcde35a3
package
com
.
mmc
.
iuav
.
user
.
config
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.data.redis.connection.RedisConnectionFactory
;
import
org.springframework.data.redis.core.RedisTemplate
;
import
org.springframework.data.redis.serializer.RedisSerializer
;
import
org.springframework.data.redis.serializer.StringRedisSerializer
;
/**
* Redis的配置类
* 修改redis序列化对象时 key-value的序列化方式
*
* @author han
* @date 2023/08/09
*/
@Configuration
public
class
RedisConfig
{
@Bean
public
RedisTemplate
<
String
,
Object
>
redisTemplate
(
RedisConnectionFactory
factory
){
RedisTemplate
<
String
,
Object
>
redisTemplate
=
new
RedisTemplate
<>();
StringRedisSerializer
stringRedisSerializer
=
new
StringRedisSerializer
();
// 关联redis工厂
redisTemplate
.
setConnectionFactory
(
factory
);
// 设置key的序列化方式
redisTemplate
.
setKeySerializer
(
RedisSerializer
.
string
());
redisTemplate
.
setValueSerializer
(
RedisSerializer
.
json
());
redisTemplate
.
setHashKeySerializer
(
stringRedisSerializer
);
redisTemplate
.
setHashValueSerializer
(
stringRedisSerializer
);
return
redisTemplate
;
}
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/UserAccountDO.java
浏览文件 @
dcde35a3
...
@@ -157,7 +157,7 @@ public class UserAccountDO implements Serializable {
...
@@ -157,7 +157,7 @@ public class UserAccountDO implements Serializable {
.
inviteCount
(
this
.
inviteCount
).
userImg
(
this
.
userImg
).
build
();
.
inviteCount
(
this
.
inviteCount
).
userImg
(
this
.
userImg
).
build
();
}
}
public
UserDO
buildUserDO
()
{
public
UserDO
buildUserDO
()
{
return
UserDO
.
builder
().
userAccountId
(
this
.
id
).
nickName
(
this
.
nickName
).
userName
(
this
.
userName
).
userImg
(
this
.
userImg
).
build
();
return
UserDO
.
builder
().
userAccountId
(
this
.
id
).
nickName
(
this
.
nickName
).
userName
(
this
.
userName
).
userImg
(
this
.
userImg
).
phoneNum
(
this
.
phoneNum
).
build
();
}
}
}
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/UserDO.java
浏览文件 @
dcde35a3
...
@@ -36,4 +36,6 @@ public class UserDO implements Serializable {
...
@@ -36,4 +36,6 @@ public class UserDO implements Serializable {
private
String
userImg
;
private
String
userImg
;
@ApiModelProperty
(
value
=
"未读的消息个数"
)
@ApiModelProperty
(
value
=
"未读的消息个数"
)
private
Integer
unreadCount
;
private
Integer
unreadCount
;
@ApiModelProperty
(
value
=
"手机号"
)
private
String
phoneNum
;
}
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/MessageServiceImpl.java
浏览文件 @
dcde35a3
...
@@ -10,6 +10,7 @@ import com.mmc.iuav.user.model.qo.MessageUserQO;
...
@@ -10,6 +10,7 @@ import com.mmc.iuav.user.model.qo.MessageUserQO;
import
com.mmc.iuav.user.model.vo.SystemMessageVO
;
import
com.mmc.iuav.user.model.vo.SystemMessageVO
;
import
com.mmc.iuav.user.model.vo.UserMessageVO
;
import
com.mmc.iuav.user.model.vo.UserMessageVO
;
import
com.mmc.iuav.user.service.MessageService
;
import
com.mmc.iuav.user.service.MessageService
;
import
com.mmc.iuav.user.util.ScheduledTaskUtil
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -27,6 +28,9 @@ public class MessageServiceImpl implements MessageService {
...
@@ -27,6 +28,9 @@ public class MessageServiceImpl implements MessageService {
@Autowired
@Autowired
private
UserServiceDao
userServiceDao
;
private
UserServiceDao
userServiceDao
;
@Autowired
private
ScheduledTaskUtil
scheduledTaskUtil
;
@Override
@Override
public
ResultBody
insertSystemMessage
(
SystemMessageVO
messageVO
)
{
public
ResultBody
insertSystemMessage
(
SystemMessageVO
messageVO
)
{
SystemMessageDO
systemMessageDO
=
new
SystemMessageDO
(
messageVO
);
SystemMessageDO
systemMessageDO
=
new
SystemMessageDO
(
messageVO
);
...
@@ -124,6 +128,9 @@ public class MessageServiceImpl implements MessageService {
...
@@ -124,6 +128,9 @@ public class MessageServiceImpl implements MessageService {
}
}
userMessageDO
.
setSenderUserId
(
senderUserId
);
userMessageDO
.
setSenderUserId
(
senderUserId
);
if
(
messageDao
.
insertUserMessage
(
userMessageDO
)
!=
0
){
if
(
messageDao
.
insertUserMessage
(
userMessageDO
)
!=
0
){
UserAccountDO
userAccount
=
userServiceDao
.
getUserAccountById
(
userMessageDO
.
getReceiverUserId
());
UserDO
userDO
=
userAccount
.
buildUserDO
();
scheduledTaskUtil
.
create
(
userDO
);
if
(
messageDao
.
isUserMessageLog
(
userMessageDO
.
getReceiverUserId
(),
userMessageDO
.
getSenderUserId
())
==
null
){
if
(
messageDao
.
isUserMessageLog
(
userMessageDO
.
getReceiverUserId
(),
userMessageDO
.
getSenderUserId
())
==
null
){
UserMessageLogDO
userMessageLogDO
=
new
UserMessageLogDO
();
UserMessageLogDO
userMessageLogDO
=
new
UserMessageLogDO
();
userMessageLogDO
.
setSenderUserId
(
userMessageDO
.
getSenderUserId
());
userMessageLogDO
.
setSenderUserId
(
userMessageDO
.
getSenderUserId
());
...
@@ -147,6 +154,7 @@ public class MessageServiceImpl implements MessageService {
...
@@ -147,6 +154,7 @@ public class MessageServiceImpl implements MessageService {
@Override
@Override
public
PageResult
selectUserMessage
(
MessageUserQO
messageQO
,
Integer
senderUserId
)
{
public
PageResult
selectUserMessage
(
MessageUserQO
messageQO
,
Integer
senderUserId
)
{
scheduledTaskUtil
.
destroy
(
messageQO
.
getReceiverUserId
());
int
count
=
messageDao
.
countUserMessage
(
messageQO
.
getReceiverUserId
(),
senderUserId
);
int
count
=
messageDao
.
countUserMessage
(
messageQO
.
getReceiverUserId
(),
senderUserId
);
if
(
count
==
0
)
{
if
(
count
==
0
)
{
return
PageResult
.
buildPage
(
messageQO
.
getPageNo
(),
messageQO
.
getPageSize
(),
count
);
return
PageResult
.
buildPage
(
messageQO
.
getPageNo
(),
messageQO
.
getPageSize
(),
count
);
...
...
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/util/MyTask.java
0 → 100644
浏览文件 @
dcde35a3
package
com
.
mmc
.
iuav
.
user
.
util
;
import
com.mmc.iuav.user.entity.UserDO
;
import
com.mmc.iuav.user.service.WxService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
java.io.Serializable
;
import
java.util.TimerTask
;
@Component
public
class
MyTask
extends
TimerTask
implements
Serializable
{
private
UserDO
userDO
;
// private WxService wxService;
public
void
setUserDO
(
UserDO
userDO
)
{
this
.
userDO
=
userDO
;
}
// public void setWxService(WxService wxService) {
// this.wxService = wxService;
// }
private
static
final
long
serialVersionUID
=
1L
;
@Override
public
void
run
()
{
SmsUtil
.
sendNewMessage
(
userDO
.
getPhoneNum
());
System
.
out
.
println
(
"定时任务执行完毕!"
);
}
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/util/ScheduledTaskUtil.java
0 → 100644
浏览文件 @
dcde35a3
package
com
.
mmc
.
iuav
.
user
.
util
;
import
com.google.gson.Gson
;
import
com.mmc.iuav.user.entity.UserDO
;
import
com.mmc.iuav.user.service.WxService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.redis.core.RedisTemplate
;
import
org.springframework.data.redis.core.StringRedisTemplate
;
import
org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer
;
import
org.springframework.data.redis.serializer.RedisSerializer
;
import
org.springframework.data.redis.serializer.StringRedisSerializer
;
import
org.springframework.scheduling.TaskScheduler
;
import
org.springframework.stereotype.Component
;
import
javax.annotation.Resource
;
import
java.time.Instant
;
import
java.util.Map
;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.concurrent.ScheduledFuture
;
import
java.util.concurrent.TimeUnit
;
@Component
public
class
ScheduledTaskUtil
{
@Autowired
private
StringRedisTemplate
redisTemplate
;
@Autowired
private
TaskScheduler
taskScheduler
;
@Autowired
private
WxService
wxService
;
private
final
Map
<
Integer
,
ScheduledFuture
<?>>
scheduledTasks
=
new
ConcurrentHashMap
<>();
public
void
create
(
UserDO
userDO
){
long
delay
=
600000
;
// 延迟10分钟开始执行
MyTask
task
=
new
MyTask
();
task
.
setUserDO
(
userDO
);
// task.setWxService(wxService);
redisTemplate
.
setValueSerializer
(
RedisSerializer
.
json
());
redisTemplate
.
opsForValue
().
set
(
"task"
+
userDO
.
getUserAccountId
(),
new
Gson
().
toJson
(
task
),
delay
,
TimeUnit
.
MILLISECONDS
);
// 使用TaskScheduler执行定时任务
System
.
out
.
println
(
"定时任务已开启"
);
ScheduledFuture
<?>
scheduledFuture
=
taskScheduler
.
schedule
(
task
,
Instant
.
now
().
plusMillis
(
delay
));
scheduledTasks
.
put
(
userDO
.
getUserAccountId
(),
scheduledFuture
);
}
public
void
destroy
(
Integer
userAccountId
){
redisTemplate
.
setValueSerializer
(
RedisSerializer
.
json
());
MyTask
task
=
new
Gson
().
fromJson
(
redisTemplate
.
opsForValue
().
get
(
"task"
+
userAccountId
),
MyTask
.
class
);
ScheduledFuture
<?>
scheduledFuture
=
scheduledTasks
.
get
(
userAccountId
);
if
(
task
!=
null
&&
scheduledFuture
!=
null
)
{
scheduledFuture
.
cancel
(
false
);
redisTemplate
.
delete
(
"task"
+
userAccountId
);
scheduledTasks
.
remove
(
userAccountId
);
System
.
out
.
println
(
"定时任务已取消"
);
}
}
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/util/SmsUtil.java
浏览文件 @
dcde35a3
...
@@ -29,6 +29,7 @@ public class SmsUtil {
...
@@ -29,6 +29,7 @@ public class SmsUtil {
private
static
String
COOPERATION_TEMPLATE_PASS_CODE_6
=
"SMS_464380042"
;
private
static
String
COOPERATION_TEMPLATE_PASS_CODE_6
=
"SMS_464380042"
;
private
static
String
COOPERATION_TEMPLATE_PASS_CODE_7
=
"SMS_464335035"
;
private
static
String
COOPERATION_TEMPLATE_PASS_CODE_7
=
"SMS_464335035"
;
private
static
String
COOPERATION_TEMPLATE_PASS_CODE_8
=
"SMS_465080418"
;
//短信验证码模板
//短信验证码模板
private
static
String
VERIFYCODE
=
"SMS_291570267"
;
private
static
String
VERIFYCODE
=
"SMS_291570267"
;
...
@@ -55,6 +56,10 @@ public class SmsUtil {
...
@@ -55,6 +56,10 @@ public class SmsUtil {
return
send
(
CLOUD_JOIN_WEBSITE
,
COOPERATION_TEMPLATE_PASS_CODE_7
,
null
,
phone
);
return
send
(
CLOUD_JOIN_WEBSITE
,
COOPERATION_TEMPLATE_PASS_CODE_7
,
null
,
phone
);
}
}
//聊天新消息通知
public
static
String
sendNewMessage
(
String
phone
)
{
return
send
(
CLOUD_JOIN_WEBSITE
,
COOPERATION_TEMPLATE_PASS_CODE_8
,
null
,
phone
);
}
public
static
String
send
(
String
TemplateCode
,
String
param
,
String
phone
)
{
public
static
String
send
(
String
TemplateCode
,
String
param
,
String
phone
)
{
return
send
(
CLOUD_JOIN_WEBSITE
,
TemplateCode
,
param
,
phone
);
return
send
(
CLOUD_JOIN_WEBSITE
,
TemplateCode
,
param
,
phone
);
}
}
...
...
pom.xml
浏览文件 @
dcde35a3
...
@@ -208,4 +208,4 @@
...
@@ -208,4 +208,4 @@
</repository>
</repository>
</repositories>
</repositories>
</project>
</project>
\ No newline at end of file
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论