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
4db623ad
Commit
4db623ad
authored
Aug 09, 2021
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加排序
parent
3478af19
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
EquipFeignClient.java
...n/amos/boot/module/common/api/feign/EquipFeignClient.java
+1
-1
CommandController.java
...boot/module/command/biz/controller/CommandController.java
+8
-2
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 @
4db623ad
...
@@ -140,6 +140,6 @@ public interface EquipFeignClient {
...
@@ -140,6 +140,6 @@ public interface EquipFeignClient {
* @return
* @return
*/
*/
@RequestMapping
(
value
=
"//building/video/page"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"//building/video/page"
,
method
=
RequestMethod
.
GET
)
ResponseModel
<
Page
<
Map
<
String
,
Object
>>>
getVideo
(
@RequestParam
int
current
,
@RequestParam
int
siz
e
,
@RequestParam
Long
buildingId
);
ResponseModel
<
Page
<
Map
<
String
,
Object
>>>
getVideo
(
@RequestParam
Page
pag
e
,
@RequestParam
Long
buildingId
);
}
}
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 @
4db623ad
...
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
...
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.OrderItem
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService
;
import
com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService
;
...
@@ -809,8 +810,13 @@ public class CommandController extends BaseController {
...
@@ -809,8 +810,13 @@ public class CommandController extends BaseController {
@TycloudOperation
(
needAuth
=
true
,
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
needAuth
=
true
,
ApiLevel
=
UserType
.
AGENCY
)
@RequestMapping
(
value
=
"/getVideo"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/getVideo"
,
method
=
RequestMethod
.
GET
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"分页获取视频"
,
notes
=
"分页获取视频"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"分页获取视频"
,
notes
=
"分页获取视频"
)
public
ResponseModel
<
Object
>
getVideo
(
Integer
current
,
Integer
size
)
throws
Exception
{
public
ResponseModel
<
Object
>
getVideo
(
long
current
,
long
size
)
throws
Exception
{
ResponseModel
<
Page
<
Map
<
String
,
Object
>>>
date
=
equipFeignClient
.
getVideo
(
current
,
size
,
0
l
);
Page
page
=
new
Page
(
current
,
size
);
List
<
OrderItem
>
list
=
OrderItem
.
ascs
(
"id"
);
page
.
setOrders
(
list
);
ResponseModel
<
Page
<
Map
<
String
,
Object
>>>
date
=
equipFeignClient
.
getVideo
(
page
,
0
l
);
return
ResponseHelper
.
buildResponse
(
date
!=
null
?
date
.
getResult
():
null
);
return
ResponseHelper
.
buildResponse
(
date
!=
null
?
date
.
getResult
():
null
);
}
}
...
...
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