Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
7eddaafc
Commit
7eddaafc
authored
Oct 13, 2021
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
b71c8cc6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
19 deletions
+1
-19
AlertCalledServiceImpl.java
...t/module/jcs/biz/service/impl/AlertCalledServiceImpl.java
+1
-19
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java
View file @
7eddaafc
...
@@ -293,24 +293,6 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
...
@@ -293,24 +293,6 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
alertCalledObjsDto
.
setAlertCalled
(
alertCalled
);
alertCalledObjsDto
.
setAlertCalled
(
alertCalled
);
alertCalledObjsDto
.
setAlertFormValue
(
alertFormValuelist
);
alertCalledObjsDto
.
setAlertFormValue
(
alertFormValuelist
);
//警情报送
//警情报送
AlertSubmitted
alertSubmitted
=
new
AlertSubmitted
();
alertSubmitted
.
setAlertCalledId
(
alertCalled
.
getSequenceNbr
());
alertSubmitted
.
setBusinessType
(
alertCalled
.
getAlarmType
());
alertSubmitted
.
setBusinessTypeCode
(
alertCalled
.
getAlarmTypeCode
());
alertSubmitted
.
setSubmissionTime
(
new
Date
());
// 获取接警情况模板
List
<
Template
>
templateList
=
templateMapper
.
selectList
(
new
LambdaQueryWrapper
<
Template
>().
eq
(
Template:
:
getFormat
,
false
).
like
(
Template:
:
getTypeCode
,
DutyInfoEnum
.
接警情况
.
getKey
()
+
"-"
));
Map
<
String
,
Template
>
templateMap
=
templateList
.
stream
().
collect
(
Collectors
.
toMap
(
Template:
:
getTypeCode
,
Function
.
identity
()));
//增加非空判断 cz 2021-10-08
if
(
alertCalled
.
getAlertTypeCode
()
!=
null
)
{
String
tempContent
=
templateMap
.
get
(
DutyInfoEnum
.
接警情况
.
getKey
()
+
"-"
+
alertCalled
.
getAlertTypeCode
()).
getContent
();
alertSubmitted
.
setSubmissionContent
(
replaceTemplate
(
tempContent
,
Bean
.
BeantoMap
(
alertCalled
)));
};
alertSubmittedService
.
save
(
alertSubmitted
);
//调用规则
//调用规则
ruleAlertCalledService
.
fireAlertCalledRule
(
alertCalledObjsDto
);
ruleAlertCalledService
.
fireAlertCalledRule
(
alertCalledObjsDto
);
//通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
//通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
...
@@ -465,7 +447,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
...
@@ -465,7 +447,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
}
}
@Override
@Override
public
Map
<
String
,
Object
>
selectAlertCalledKeyValueLabelById
(
Long
id
)
{
public
Map
<
String
,
Object
>
selectAlertCalledKeyValueLabelById
(
Long
id
)
{
// 警情基本信息
// 警情基本信息
AlertCalled
alertCalled
=
this
.
getById
(
id
);
AlertCalled
alertCalled
=
this
.
getById
(
id
);
...
...
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