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
ecb3e195
Commit
ecb3e195
authored
Aug 22, 2024
by
litengwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
预案弹窗逻辑
parent
3131809c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
1 deletion
+19
-1
ContingencyPlanServiceImpl.java
...fas/business/service/impl/ContingencyPlanServiceImpl.java
+5
-1
PlanVisual3dServiceImpl.java
...os/fas/business/service/impl/PlanVisual3dServiceImpl.java
+14
-0
No files found.
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java
View file @
ecb3e195
...
...
@@ -253,6 +253,10 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
result
.
setMessage
(
ReserveEnum
.
RUN
.
getText
());
result
.
setBatchNo
(
batchNo
);
if
(
vo
.
getTriggerMode
().
equals
(
"automatic"
))
{
iContingencyInstance
.
fire
(
batchNo
,
"0"
,
""
,
instanceInfo
.
getId
(),
"FIRE_CONFIRM"
,
"CONFIRM"
,
"0"
,
"true"
,
"false"
,
toke
.
getToke
(),
toke
.
getProduct
(),
toke
.
getAppKey
(),
null
);
}
TransactionSynchronizationManager
.
registerSynchronization
(
new
TransactionSynchronization
()
{
@Override
public
void
afterCommit
()
{
...
...
@@ -441,7 +445,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
if
(
planEquipment
!=
null
)
{
vo
=
new
ContingencyPlanParamVo
();
vo
.
setPlanId
(
planEquipment
.
getPlanId
().
toString
());
vo
.
setStatus
(
ContingencyPlanStatusEnum
.
SIMULATION_START
.
getCode
());
vo
.
setStatus
(
ContingencyPlanStatusEnum
.
ONGOING
.
getCode
());
vo
.
setRiskType
(
riskType
);
return
vo
;
}
...
...
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/PlanVisual3dServiceImpl.java
View file @
ecb3e195
...
...
@@ -435,6 +435,20 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
}
}).
collect
(
Collectors
.
toList
());
redisTemplate
.
opsForValue
().
set
(
"planStep"
,
JSON
.
toJSONString
(
collect1
));
if
(
stepCode
.
equals
(
"0"
))
{
PlanStepJsonVO
planStepJsonVO
=
collect1
.
get
(
0
);
if
(!
StringUtils
.
isEmpty
(
planStepJsonVO
.
getButtonJson
()))
{
String
topic
=
String
.
format
(
"/%s/%s/%s"
,
serviceName
,
stationName
,
"plan"
);
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
JSONObject
msgContext
=
new
JSONObject
();
msgContext
.
put
(
"tips"
,
"alertAlarm"
);
map
.
put
(
"msgContext"
,
msgContext
);
map
.
put
(
"msgType"
,
"alertAlarm"
);
map
.
put
(
"step"
,
"0"
);
map
.
put
(
"batchNo"
,
planStepJsonVO
.
getBatchNo
());
webMqttComponent
.
publish
(
topic
,
JSON
.
toJSONString
(
map
));
}
}
}
}
}
...
...
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