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
8b86a16d
Commit
8b86a16d
authored
Jun 17, 2022
by
高建强
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
item:地图动作添加配置文件
parent
0555c50e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
43 deletions
+5
-43
ContingencyActionEnum.java
.../yeejoin/amos/fas/common/enums/ContingencyActionEnum.java
+0
-39
ContingencyAction.java
...m/yeejoin/amos/fas/business/action/ContingencyAction.java
+5
-4
No files found.
YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/common/enums/ContingencyActionEnum.java
deleted
100644 → 0
View file @
0555c50e
package
com
.
yeejoin
.
amos
.
fas
.
common
.
enums
;
/**
* @ProjectName: YeeAmosFireAutoSysRoot
* @Package: com.yeejoin.amos.fas.common.enums
* @ClassName: ContingencyActionEnum
* @Author: Jianqiang Gao
* @Description: 预案动作枚举
* @Date: 2022/6/17 9:34
* @Version: 1.0
*/
public
enum
ContingencyActionEnum
{
ACTION1_2
(
"action1-2"
,
"镜头切换(旋转+推进)"
),
;
private
String
key
;
private
String
value
;
ContingencyActionEnum
(
String
key
,
String
value
)
{
this
.
key
=
key
;
this
.
value
=
value
;
}
public
String
getKey
()
{
return
key
;
}
public
void
setKey
(
String
key
)
{
this
.
key
=
key
;
}
public
String
getValue
()
{
return
value
;
}
public
void
setValue
(
String
value
)
{
this
.
value
=
value
;
}
}
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java
View file @
8b86a16d
...
...
@@ -30,7 +30,6 @@ import com.yeejoin.amos.fas.business.service.model.ToipResponse;
import
com.yeejoin.amos.fas.business.util.CacheFactory
;
import
com.yeejoin.amos.fas.business.util.CacheMap
;
import
com.yeejoin.amos.fas.business.vo.Toke
;
import
com.yeejoin.amos.fas.common.enums.ContingencyActionEnum
;
import
com.yeejoin.amos.fas.common.enums.ContingencyPlanStatusEnum
;
import
com.yeejoin.amos.fas.common.enums.PlanRecordStatusEnum
;
import
com.yeejoin.amos.fas.core.enums.NumberEnum
;
...
...
@@ -122,6 +121,8 @@ public class ContingencyAction implements CustomerAction {
@Value
(
"${rocket-plan-topic}"
)
private
String
rocketTopic
;
@Value
(
"${maparea.action.is-area}"
)
private
String
isArea
;
private
static
Map
<
String
,
String
>
OPERATE_RECORD_ID
=
new
HashMap
<>();
...
...
@@ -642,7 +643,7 @@ public class ContingencyAction implements CustomerAction {
tempmap1
.
put
(
"key"
,
actionName
);
tempmap1
.
put
(
"content"
,
paramJSON
);
if
(
ContingencyActionEnum
.
ACTION1_2
.
getKey
().
equalsIgnoreCase
(
paramJSON
))
{
if
(
isArea
.
contains
(
paramJSON
))
{
tempmap1
.
put
(
"isArea"
,
true
);
}
else
{
tempmap1
.
put
(
"isArea"
,
false
);
...
...
@@ -876,10 +877,10 @@ public class ContingencyAction implements CustomerAction {
if
(
ObjectUtils
.
isEmpty
(
batchNo
))
{
return
;
}
content
.
put
(
"batchNo"
,
batchNo
);
content
.
put
(
"batchNo"
,
batchNo
);
tempmap1
.
put
(
"type"
,
"buttonCache"
);
tempmap1
.
put
(
"content"
,
content
);
tempmap1
.
put
(
"content"
,
content
);
result
.
add
(
tempmap1
);
this
.
sendcmd
(
"message"
,
result
);
...
...
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