Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
R
research-project
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hqzhdj
research-project
Commits
ba7070bf
Commit
ba7070bf
authored
Mar 19, 2025
by
阳浪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
消息优化
parent
929d1200
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
79 additions
and
66 deletions
+79
-66
cloud-research-service/src/main/java/com/yizhi/research/application/service/impl/ResearchServiceImpl.java
+77
-64
cloud-research-service/src/main/java/com/yizhi/research/application/util/ResearchEvenSendMessage.java
+2
-2
No files found.
cloud-research-service/src/main/java/com/yizhi/research/application/service/impl/ResearchServiceImpl.java
View file @
ba7070bf
...
@@ -117,6 +117,12 @@ public class ResearchServiceImpl extends ServiceImpl<ResearchMapper, Research> i
...
@@ -117,6 +117,12 @@ public class ResearchServiceImpl extends ServiceImpl<ResearchMapper, Research> i
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
}
}
if
(!
CollectionUtils
.
isEmpty
(
research
.
getReminds
())){
research
.
getReminds
().
stream
().
forEach
(
r
->{
r
.
setResearchId
(
research
.
getId
());
});
researchRemindMapper
.
batchInsert
(
research
.
getReminds
());
}
return
research
;
return
research
;
}
}
...
@@ -135,7 +141,7 @@ public class ResearchServiceImpl extends ServiceImpl<ResearchMapper, Research> i
...
@@ -135,7 +141,7 @@ public class ResearchServiceImpl extends ServiceImpl<ResearchMapper, Research> i
name
=
(
String
)
map
.
get
(
"name"
);
name
=
(
String
)
map
.
get
(
"name"
);
}
}
if
(!
StringUtils
.
isEmpty
(
map
.
get
(
"bizType"
)))
{
if
(!
StringUtils
.
isEmpty
(
map
.
get
(
"bizType"
)))
{
bizType
=
(
Integer
)
map
.
get
(
"bizType"
);
bizType
=
(
Integer
)
map
.
get
(
"bizType"
);
}
}
//为过滤过期调研准备
//为过滤过期调研准备
String
date
=
null
;
String
date
=
null
;
...
@@ -203,7 +209,7 @@ public class ResearchServiceImpl extends ServiceImpl<ResearchMapper, Research> i
...
@@ -203,7 +209,7 @@ public class ResearchServiceImpl extends ServiceImpl<ResearchMapper, Research> i
LOG
.
info
(
"是否开启提醒:"
+
research
.
getRemind
());
LOG
.
info
(
"是否开启提醒:"
+
research
.
getRemind
());
RequestContext
context
=
ContextHolder
.
get
();
RequestContext
context
=
ContextHolder
.
get
();
if
(
num
>
0
)
{
if
(
num
>
0
)
{
Research
research1
=
this
.
selectById
(
research
.
getId
());
Research
research1
=
this
.
selectById
(
research
.
getId
());
// 设置提醒
// 设置提醒
try
{
try
{
//发消息告知提醒有变化
//发消息告知提醒有变化
...
@@ -217,6 +223,13 @@ public class ResearchServiceImpl extends ServiceImpl<ResearchMapper, Research> i
...
@@ -217,6 +223,13 @@ public class ResearchServiceImpl extends ServiceImpl<ResearchMapper, Research> i
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
}
}
researchRemindMapper
.
deleteByResearchId
(
research
.
getId
());
if
(!
CollectionUtils
.
isEmpty
(
research
.
getReminds
())){
research
.
getReminds
().
stream
().
forEach
(
r
->{
r
.
setResearchId
(
research
.
getId
());
});
researchRemindMapper
.
batchInsert
(
research
.
getReminds
());
}
return
num
;
return
num
;
}
}
...
@@ -310,7 +323,7 @@ public class ResearchServiceImpl extends ServiceImpl<ResearchMapper, Research> i
...
@@ -310,7 +323,7 @@ public class ResearchServiceImpl extends ServiceImpl<ResearchMapper, Research> i
origResearch
.
setCompanyId
(
context
.
getCompanyId
());
origResearch
.
setCompanyId
(
context
.
getCompanyId
());
origResearch
.
setOrgId
(
context
.
getOrgId
());
origResearch
.
setOrgId
(
context
.
getOrgId
());
origResearch
.
setResearchNo
(
getResearchNo
(
context
.
getSiteId
()));
origResearch
.
setResearchNo
(
getResearchNo
(
context
.
getSiteId
()));
// origResearch.setVisibleRange(null);
// origResearch.setVisibleRange(null);
// origResearch.setStartTime(null);
// origResearch.setStartTime(null);
// origResearch.setEndTime(null);
// origResearch.setEndTime(null);
origResearch
.
setCreateByName
(
context
.
getAccountName
());
origResearch
.
setCreateByName
(
context
.
getAccountName
());
...
@@ -322,10 +335,10 @@ public class ResearchServiceImpl extends ServiceImpl<ResearchMapper, Research> i
...
@@ -322,10 +335,10 @@ public class ResearchServiceImpl extends ServiceImpl<ResearchMapper, Research> i
//复制人员
//复制人员
Long
oldId
;
Long
oldId
;
TrResearchAuthorize
authorize
=
new
TrResearchAuthorize
();
TrResearchAuthorize
authorize
=
new
TrResearchAuthorize
();
authorize
.
setResearchId
(
id
);
authorize
.
setResearchId
(
id
);
List
<
TrResearchAuthorize
>
authorizes
=
null
;
List
<
TrResearchAuthorize
>
authorizes
=
null
;
try
{
try
{
authorizes
=
trResearchAuthorizeMapper
.
selectList
(
new
EntityWrapper
<>(
authorize
));
authorizes
=
trResearchAuthorizeMapper
.
selectList
(
new
EntityWrapper
<>(
authorize
));
if
(!
CollectionUtils
.
isEmpty
(
authorizes
))
{
if
(!
CollectionUtils
.
isEmpty
(
authorizes
))
{
...
@@ -752,33 +765,33 @@ public class ResearchServiceImpl extends ServiceImpl<ResearchMapper, Research> i
...
@@ -752,33 +765,33 @@ public class ResearchServiceImpl extends ServiceImpl<ResearchMapper, Research> i
}
}
@Override
@Override
public
List
<
Map
<
String
,
Object
>>
getServerByCompanyIdAndIds
(
Long
companyId
,
List
<
Long
>
ids
)
{
public
List
<
Map
<
String
,
Object
>>
getServerByCompanyIdAndIds
(
Long
companyId
,
List
<
Long
>
ids
)
{
// TODO Auto-generated method stub
// TODO Auto-generated method stub
List
<
Map
<
String
,
Object
>>
listMap
=
null
;
List
<
Map
<
String
,
Object
>>
listMap
=
null
;
//查询
//查询
Research
research
=
new
Research
();
Research
research
=
new
Research
();
research
.
setCompanyId
(
companyId
);
research
.
setCompanyId
(
companyId
);
EntityWrapper
<
Research
>
wrapper
=
new
EntityWrapper
<
Research
>(
research
);
EntityWrapper
<
Research
>
wrapper
=
new
EntityWrapper
<
Research
>(
research
);
if
(!
CollectionUtils
.
isEmpty
(
ids
))
{
if
(!
CollectionUtils
.
isEmpty
(
ids
))
{
wrapper
.
in
(
"id"
,
ids
);
wrapper
.
in
(
"id"
,
ids
);
}
}
List
<
Research
>
listResearch
=
this
.
selectList
(
wrapper
);
List
<
Research
>
listResearch
=
this
.
selectList
(
wrapper
);
//循环组装到输出对象
//循环组装到输出对象
Map
<
String
,
Object
>
map
=
null
;
Map
<
String
,
Object
>
map
=
null
;
if
(!
CollectionUtils
.
isEmpty
(
listResearch
))
{
if
(!
CollectionUtils
.
isEmpty
(
listResearch
))
{
listMap
=
new
ArrayList
<
Map
<
String
,
Object
>>();
listMap
=
new
ArrayList
<
Map
<
String
,
Object
>>();
for
(
Research
c:
listResearch
)
{
for
(
Research
c:
listResearch
)
{
map
=
new
HashMap
<
String
,
Object
>();
map
=
new
HashMap
<
String
,
Object
>();
map
.
put
(
"catalog"
,
2
);
map
.
put
(
"catalog"
,
2
);
map
.
put
(
"id"
,
c
.
getId
());
map
.
put
(
"id"
,
c
.
getId
());
map
.
put
(
"name"
,
c
.
getName
());
map
.
put
(
"name"
,
c
.
getName
());
map
.
put
(
"logo_url"
,
""
);
map
.
put
(
"logo_url"
,
""
);
listMap
.
add
(
map
);
listMap
.
add
(
map
);
}
}
}
}
return
listMap
;
return
listMap
;
}
}
@Override
@Override
public
Page
<
Research
>
getPageToCalendar
(
Date
date
,
Page
<
Research
>
page
)
{
public
Page
<
Research
>
getPageToCalendar
(
Date
date
,
Page
<
Research
>
page
)
{
...
@@ -850,34 +863,34 @@ public class ResearchServiceImpl extends ServiceImpl<ResearchMapper, Research> i
...
@@ -850,34 +863,34 @@ public class ResearchServiceImpl extends ServiceImpl<ResearchMapper, Research> i
}
}
@Override
@Override
public
Research
viewInfo
(
Long
id
)
{
public
Research
viewInfo
(
Long
id
)
{
Research
research
=
researchMapper
.
selectById
(
id
);
Research
research
=
researchMapper
.
selectById
(
id
);
return
research
;
return
research
;
}
}
@Override
@Override
public
List
<
ResearchVo
>
getResearchTop
(
Integer
bizType
)
{
public
List
<
ResearchVo
>
getResearchTop
(
Integer
bizType
)
{
RequestContext
requestContext
=
ContextHolder
.
get
();
RequestContext
requestContext
=
ContextHolder
.
get
();
Long
siteId
=
requestContext
.
getSiteId
();
Long
siteId
=
requestContext
.
getSiteId
();
return
researchMapper
.
getResearchTop
(
bizType
,
siteId
);
return
researchMapper
.
getResearchTop
(
bizType
,
siteId
);
}
}
@Override
@Override
public
ResearchVo
getResearchDetails
(
Long
id
)
{
public
ResearchVo
getResearchDetails
(
Long
id
)
{
RequestContext
requestContext
=
ContextHolder
.
get
();
RequestContext
requestContext
=
ContextHolder
.
get
();
if
(
requestContext
==
null
){
if
(
requestContext
==
null
){
return
null
;
return
null
;
}
}
ResearchVo
research
=
researchMapper
.
selectResearchDetails
(
id
,
requestContext
.
getAccountId
(),
requestContext
.
getSiteId
());
ResearchVo
research
=
researchMapper
.
selectResearchDetails
(
id
,
requestContext
.
getAccountId
(),
requestContext
.
getSiteId
());
//投票完成或过期选择次数0
//投票完成或过期选择次数0
if
(
research
.
getFinishState
()
==
1
||
research
.
getFinishState
()
==
3
){
if
(
research
.
getFinishState
()
==
1
||
research
.
getFinishState
()
==
3
){
research
.
setVoteNum
(
0
);
research
.
setVoteNum
(
0
);
}
}
return
research
;
return
research
;
}
}
}
}
cloud-research-service/src/main/java/com/yizhi/research/application/util/ResearchEvenSendMessage.java
View file @
ba7070bf
...
@@ -120,14 +120,14 @@ public class ResearchEvenSendMessage {
...
@@ -120,14 +120,14 @@ public class ResearchEvenSendMessage {
logger
.
error
(
"发送删除消息成功====================="
);
logger
.
error
(
"发送删除消息成功====================="
);
}
else
{
}
else
{
//修改调研的状态
//修改调研的状态
if
(
remindVo
.
getTaskStatusUpdate
())
{
/*
if (remindVo.getTaskStatusUpdate()) {
//1 为消息业务可发送状态 0 则不行
//1 为消息业务可发送状态 0 则不行
vo.setTaskStatusUpdate(true);
vo.setTaskStatusUpdate(true);
vo.setTaskStatus(research.getState() == ResearchState.RELEASED.getValue() ? 1 : 0);
vo.setTaskStatus(research.getState() == ResearchState.RELEASED.getValue() ? 1 : 0);
publicSendMessageClient.processBizEvent(vo);
publicSendMessageClient.processBizEvent(vo);
logger.info("发送修改业务状态消息成功=====================");
logger.info("发送修改业务状态消息成功=====================");
return;
return;
}
}
*/
if
(
research
!=
null
)
{
if
(
research
!=
null
)
{
if
(!
CollectionUtils
.
isEmpty
(
remindVo
.
getMessageTaskRemindVos
()))
{
if
(!
CollectionUtils
.
isEmpty
(
remindVo
.
getMessageTaskRemindVos
()))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment