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
b1b9780a
Commit
b1b9780a
authored
Sep 18, 2019
by
喻训浩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:searchCode定义
parent
3714a719
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
EquipmentController.java
...ongtong/avi/equipment/controller/EquipmentController.java
+4
-1
ShowFieldController.java
...ngtong/avi/global/web/controller/ShowFieldController.java
+1
-1
No files found.
src/main/java/net/vtstar/zhongtong/avi/equipment/controller/EquipmentController.java
View file @
b1b9780a
...
@@ -25,7 +25,10 @@ public class EquipmentController {
...
@@ -25,7 +25,10 @@ public class EquipmentController {
@Autowired
@Autowired
private
EquipmentService
equipmentService
;
private
EquipmentService
equipmentService
;
@ApiOperation
(
value
=
"获取设备实时监控数据(分页)"
)
@ApiOperation
(
value
=
"获取设备实时监控数据(分页)"
,
notes
=
"各车间对应code:\r\n"
+
"制件车间: PARTS\r\n焊装车间: WELDING\r\n涂装车间: PAINTING\r\n"
+
"底盘车间: CHASSIS\r\n总装车间: ASSEMBLY\r\n试交车间: TRIAL\r\n"
+
""
)
@GetMapping
(
value
=
"/realTime/data"
)
@GetMapping
(
value
=
"/realTime/data"
)
private
Return
getRealTimeData
(
@RequestBody
SearchVo
pageFilter
){
private
Return
getRealTimeData
(
@RequestBody
SearchVo
pageFilter
){
Object
realTimeData
=
equipmentService
.
findRealTimeData
();
Object
realTimeData
=
equipmentService
.
findRealTimeData
();
...
...
src/main/java/net/vtstar/zhongtong/avi/global/web/controller/ShowFieldController.java
View file @
b1b9780a
...
@@ -30,7 +30,7 @@ public class ShowFieldController {
...
@@ -30,7 +30,7 @@ public class ShowFieldController {
"打磨室: POLISHING_ROOM\r\n喷涂机器人: PAINTING_ROBOT\r\n 过程扫码设备: PROCESS_SCAN_CODE\r\n"
+
"打磨室: POLISHING_ROOM\r\n喷涂机器人: PAINTING_ROBOT\r\n 过程扫码设备: PROCESS_SCAN_CODE\r\n"
+
"智能扭力扳手: INTELLIGENT_TORQUE_WRENCH\r\n润滑油集中加注:LUBRICATING_OIL_CONCENTRATE\r\n"
+
"智能扭力扳手: INTELLIGENT_TORQUE_WRENCH\r\n润滑油集中加注:LUBRICATING_OIL_CONCENTRATE\r\n"
+
"四轮定位:WHEEL_ALIGNMENT\r\n铆接设备: RIVETING_EQUIPMENT\r\n集中加注冷媒:FOCUS_ADDING_REFRIGERANT\r\n"
+
"四轮定位:WHEEL_ALIGNMENT\r\n铆接设备: RIVETING_EQUIPMENT\r\n集中加注冷媒:FOCUS_ADDING_REFRIGERANT\r\n"
+
"
润滑油集中加注
:CENTRALIZED_FILLING_CLUTCH\r\n集中加注助力油: FOCUS_BOOSTER_OIL\r\n"
+
"
集中加注离合器
:CENTRALIZED_FILLING_CLUTCH\r\n集中加注助力油: FOCUS_BOOSTER_OIL\r\n"
+
"地板革热熔胶涂布设备: FLOOR_LEATHER_HOT\r\n新能源在线检测点: NEW_ENERGY\r\n检测线: CHECK_LINE\r\n"
+
"地板革热熔胶涂布设备: FLOOR_LEATHER_HOT\r\n新能源在线检测点: NEW_ENERGY\r\n检测线: CHECK_LINE\r\n"
+
"充电桩: CHARGING_PILE\r\n动静态测试: DYNAMIC_STATIC_TEST\r\n加氢站: HYDROGEN_STATION\r\n"
+
"充电桩: CHARGING_PILE\r\n动静态测试: DYNAMIC_STATIC_TEST\r\n加氢站: HYDROGEN_STATION\r\n"
+
"Voc处理平台:VOC_PROCESSING_PLATFORM"
)
"Voc处理平台:VOC_PROCESSING_PLATFORM"
)
...
...
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