Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YeeAmosFireAutoSysRoot
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
station
YeeAmosFireAutoSysRoot
Commits
990046ca
Commit
990046ca
authored
Oct 22, 2022
by
高建强
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
item:应急处置执行业务完善
parent
12cdf817
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
PlanReplyMessageEnum.java
...m/yeejoin/amos/fas/common/enums/PlanReplyMessageEnum.java
+3
-3
ContingencyInstanceImpl.java
...os/fas/business/service/impl/ContingencyInstanceImpl.java
+3
-2
ContingencyPlanServiceImpl.java
...fas/business/service/impl/ContingencyPlanServiceImpl.java
+1
-1
No files found.
YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/common/enums/PlanReplyMessageEnum.java
View file @
990046ca
...
@@ -10,9 +10,9 @@ import java.util.Map;
...
@@ -10,9 +10,9 @@ import java.util.Map;
*/
*/
public
enum
PlanReplyMessageEnum
{
public
enum
PlanReplyMessageEnum
{
FIRE_PERSON
(
"文本"
,
"text"
),
TEXT
(
"文本"
,
"text"
),
OPS_PERSON
(
"图片"
,
"image"
),
IMAGE
(
"图片"
,
"image"
),
REAL_PERSON
(
"视频"
,
"video"
);
VIDEO
(
"视频"
,
"video"
);
/**
/**
* 名称,描述
* 名称,描述
...
...
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyInstanceImpl.java
View file @
990046ca
...
@@ -154,7 +154,7 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
...
@@ -154,7 +154,7 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
public
ContingencyPlanInstance
createInstanceRecord
(
String
instanceNo
,
String
category
,
String
subCategory
,
String
content
,
String
recordType
,
String
icon
)
{
public
ContingencyPlanInstance
createInstanceRecord
(
String
instanceNo
,
String
category
,
String
subCategory
,
String
content
,
String
recordType
,
String
icon
)
{
ContingencyPlanInstance
planInstance
=
new
ContingencyPlanInstance
();
ContingencyPlanInstance
planInstance
=
new
ContingencyPlanInstance
();
if
(
"MESSAGE"
.
equalsIgnoreCase
(
recordType
))
{
if
(
"MESSAGE"
.
equalsIgnoreCase
(
recordType
))
{
planInstance
.
setFileType
(
PlanReplyMessageEnum
.
FIRE_PERSON
.
getCode
());
planInstance
.
setFileType
(
PlanReplyMessageEnum
.
TEXT
.
getCode
());
}
}
planInstance
.
setContent
(
content
);
planInstance
.
setContent
(
content
);
planInstance
.
setIcon
(
icon
);
planInstance
.
setIcon
(
icon
);
...
@@ -165,7 +165,8 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
...
@@ -165,7 +165,8 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
//计算序号
//计算序号
int
count
=
repository
.
countByBatchNo
(
instanceNo
);
int
count
=
repository
.
countByBatchNo
(
instanceNo
);
planInstance
.
setSort
(++
count
);
planInstance
.
setSort
(++
count
);
ContingencyPlanInstance
instance
=
this
.
repository
.
save
(
planInstance
);
ContingencyPlanInstance
contingencyPlanInstance
=
contingencyInstance
.
updateExtendColumn
(
planInstance
);
ContingencyPlanInstance
instance
=
this
.
repository
.
save
(
contingencyPlanInstance
);
// 异步数据同步之消息发送
// 异步数据同步之消息发送
contingencyPlanInstanceDataSync
(
instance
);
contingencyPlanInstanceDataSync
(
instance
);
return
instance
;
return
instance
;
...
...
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java
View file @
990046ca
...
@@ -795,6 +795,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
...
@@ -795,6 +795,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
if
(!
planList
.
isEmpty
())
{
if
(!
planList
.
isEmpty
())
{
planList
.
forEach
(
PlanOperationRecord
->
{
planList
.
forEach
(
PlanOperationRecord
->
{
String
batchNo
=
PlanOperationRecord
.
getBatchNo
();
String
batchNo
=
PlanOperationRecord
.
getBatchNo
();
customerAction
.
intreeuptPlan
(
batchNo
);
redisTemplate
.
delete
(
RiskSourceServiceImpl
.
cacheKeyForCanBeRunning
());
redisTemplate
.
delete
(
RiskSourceServiceImpl
.
cacheKeyForCanBeRunning
());
Optional
<
Equipment
>
equipment
;
Optional
<
Equipment
>
equipment
;
try
{
try
{
...
@@ -807,7 +808,6 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
...
@@ -807,7 +808,6 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
equip
.
setStatus
(
NumberEnum
.
ONE
.
getValue
());
equip
.
setStatus
(
NumberEnum
.
ONE
.
getValue
());
equipmentService
.
save
(
equip
);
equipmentService
.
save
(
equip
);
});
});
customerAction
.
intreeuptPlan
(
batchNo
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
logger
.
info
(
"预案重置失败batchNo:{}"
,
batchNo
,
e
);
logger
.
info
(
"预案重置失败batchNo:{}"
,
batchNo
,
e
);
e
.
printStackTrace
();
e
.
printStackTrace
();
...
...
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