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
ad37167b
Commit
ad37167b
authored
Sep 18, 2019
by
喻训浩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:searchCode定义
parent
b1b9780a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
8 deletions
+7
-8
EquipmentController.java
...ongtong/avi/equipment/controller/EquipmentController.java
+7
-8
No files found.
src/main/java/net/vtstar/zhongtong/avi/equipment/controller/EquipmentController.java
View file @
ad37167b
...
...
@@ -9,12 +9,11 @@ import net.vtstar.utils.domain.Return;
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.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
@Slf4j
@Api
(
description
=
"设备模块"
)
...
...
@@ -25,14 +24,14 @@ public class EquipmentController {
@Autowired
private
EquipmentService
equipmentService
;
@ApiOperation
(
value
=
"获取设备实时监控数据(分页)"
,
notes
=
"各车间对应code:\r\n"
+
@ApiOperation
(
value
=
"获取设备实时监控数据(分页)"
,
notes
=
"各车间对应code:\r\n"
+
"制件车间: PARTS\r\n焊装车间: WELDING\r\n涂装车间: PAINTING\r\n"
+
"底盘车间: CHASSIS\r\n总装车间: ASSEMBLY\r\n试交车间: TRIAL\r\n"
+
""
)
@
Ge
tMapping
(
value
=
"/realTime/data"
)
private
Return
getRealTimeData
(
@RequestBody
SearchVo
pageFilter
){
@
Pos
tMapping
(
value
=
"/realTime/data"
)
private
Return
getRealTimeData
(
@RequestBody
SearchVo
pageFilter
)
{
Object
realTimeData
=
equipmentService
.
findRealTimeData
();
ArrayList
<
LaserCuttingMachine
>
data
=
(
ArrayList
<
LaserCuttingMachine
>)
realTimeData
;
List
<
Map
<
String
,
Object
>>
data
=
(
List
<
Map
<
String
,
Object
>
>)
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