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
24b24622
Commit
24b24622
authored
Jun 29, 2023
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
需求变动 执勤动态 视频列表改为可配置
parent
8b4e795a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
CommandController.java
...boot/module/command/biz/controller/CommandController.java
+7
-1
application.properties
...boot-system-jcs/src/main/resources/application.properties
+5
-0
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java
View file @
24b24622
...
...
@@ -182,6 +182,12 @@ public class CommandController extends BaseController {
@Autowired
private
EmqKeeper
emqKeeper
;
@Value
(
"${video.buildingId}"
)
private
String
videoBuildingId
;
@Value
(
"${video.bizOrgCode}"
)
private
String
videoBizCode
;
@Autowired
AirportStandMapper
airportStandMapper
;
private
static
final
String
JW
=
"mechinePosition,seat"
;
...
...
@@ -460,7 +466,7 @@ public class CommandController extends BaseController {
}
ResponseModel
<
Page
<
Map
<
String
,
Object
>>>
data
=
null
;
if
(
ValidationUtil
.
isEmpty
(
par
.
getLatitude
()
)
){
data
=
equipFeignClient
.
getVideopagList
(
String
.
valueOf
((
pageNum
-
1
)
*
pageSize
),
pageSize
.
toString
(),
par
.
getBuildingId
(),
par
.
getCode
(),
par
.
getEquipmentName
(),
par
.
getBizOrgCode
()
,
par
.
getType
());
data
=
equipFeignClient
.
getVideopagList
(
String
.
valueOf
((
pageNum
-
1
)
*
pageSize
),
pageSize
.
toString
(),
videoBuildingId
,
par
.
getCode
(),
par
.
getEquipmentName
(),
videoBizCode
,
par
.
getType
());
}
else
{
data
=
equipFeignClient
.
pageVideoByAlertType
(
pageNum
,
pageSize
,
par
);
}
...
...
amos-boot-system-jcs/src/main/resources/application.properties
View file @
24b24622
...
...
@@ -150,5 +150,9 @@ speech-config.app-key=FC84bGUpbNFrexoL
##代码中有部分逻辑冲突需要处理 为区分机场和电力逻辑 增加开关 若为true 则为机场逻辑 为false 则为电力逻辑
logic
=
true
##执勤动态 视频来源建筑id
video.buildingId
=
1522051112935387138
##执勤动态 视频来源单位code
video.bizOrgCode
=
FFjKkkvVaUo7
feign.okhttp.enabled
=
true
\ No newline at end of file
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