Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zhongtong-avi-service
Project
Project
Details
Activity
Releases
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
中通客车项目
zhongtong-avi-service
Commits
78fbc7e5
Commit
78fbc7e5
authored
Sep 17, 2019
by
喻训浩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:分页添加
parent
90c96d5d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
EquipmentController.java
...ongtong/avi/equipment/controller/EquipmentController.java
+6
-1
No files found.
src/main/java/net/vtstar/zhongtong/avi/equipment/controller/EquipmentController.java
View file @
78fbc7e5
package
net
.
vtstar
.
zhongtong
.
avi
.
equipment
.
controller
;
package
net
.
vtstar
.
zhongtong
.
avi
.
equipment
.
controller
;
import
com.github.pagehelper.PageInfo
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
net.vtstar.utils.domain.Return
;
import
net.vtstar.utils.domain.Return
;
import
net.vtstar.zhongtong.avi.equipment.service.EquipmentService
;
import
net.vtstar.zhongtong.avi.equipment.service.EquipmentService
;
import
net.vtstar.zhongtong.avi.stamping.domain.LaserCuttingMachine
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.ArrayList
;
@Slf4j
@Slf4j
@Api
(
description
=
"设备模块"
)
@Api
(
description
=
"设备模块"
)
@RequestMapping
(
"/api/equipment"
)
@RequestMapping
(
"/api/equipment"
)
...
@@ -24,6 +28,7 @@ public class EquipmentController {
...
@@ -24,6 +28,7 @@ public class EquipmentController {
@GetMapping
(
value
=
"/realTime/data"
)
@GetMapping
(
value
=
"/realTime/data"
)
private
Return
getRealTimeData
(
@RequestParam
(
"ShopCode"
)
String
ShopCode
,
@RequestParam
(
"equipType"
)
String
equipType
){
private
Return
getRealTimeData
(
@RequestParam
(
"ShopCode"
)
String
ShopCode
,
@RequestParam
(
"equipType"
)
String
equipType
){
Object
realTimeData
=
equipmentService
.
findRealTimeData
();
Object
realTimeData
=
equipmentService
.
findRealTimeData
();
return
Return
.
success
(
realTimeData
);
ArrayList
<
LaserCuttingMachine
>
data
=
(
ArrayList
<
LaserCuttingMachine
>)
realTimeData
;
return
Return
.
success
(
new
PageInfo
<>(
data
));
}
}
}
}
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