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
cb98676c
Commit
cb98676c
authored
Dec 14, 2021
by
郭武斌
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*)修改方法名
parent
d94bc6c1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
EquipFeignClient.java
...n/amos/boot/module/common/api/feign/EquipFeignClient.java
+1
-1
CommandController.java
...boot/module/command/biz/controller/CommandController.java
+1
-1
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java
View file @
cb98676c
...
...
@@ -195,7 +195,7 @@ public interface EquipFeignClient {
@RequestMapping
(
value
=
"/monitorView/video/page"
,
method
=
RequestMethod
.
GET
)
ResponseModel
<
Page
<
Map
<
String
,
Object
>>>
query
UncheckedVideoList
(
ResponseModel
<
Page
<
Map
<
String
,
Object
>>>
query
VideoPage
(
@RequestParam
(
value
=
"nodeId"
)
Long
nodeId
,
@RequestParam
(
value
=
"nodeType"
,
required
=
false
)
String
nodeType
,
@RequestParam
(
value
=
"current"
)
int
current
,
...
...
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 @
cb98676c
...
...
@@ -357,7 +357,7 @@ public class CommandController extends BaseController {
@RequestParam
(
value
=
"size"
)
int
size
)
throws
Exception
{
ResponseModel
<
Page
<
Map
<
String
,
Object
>>>
data
=
equipFeignClient
.
query
UncheckedVideoList
(
nodeId
,
nodeType
,
current
,
size
);
ResponseModel
<
Page
<
Map
<
String
,
Object
>>>
data
=
equipFeignClient
.
query
VideoPage
(
nodeId
,
nodeType
,
current
,
size
);
Page
<
Map
<
String
,
Object
>>
pag
=
data
!=
null
?
data
.
getResult
()
:
null
;
List
<
Map
<
String
,
Object
>>
records
=
pag
!=
null
?
pag
.
getRecords
()
:
null
;
if
(
records
!=
null
&&
records
.
size
()
>
0
)
{
...
...
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