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
27b16cdf
Commit
27b16cdf
authored
Oct 11, 2019
by
喻训浩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 测试数据
parent
071c7257
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
2 deletions
+21
-2
AreaController.java
...r/zhongtong/avi/monitoring/controller/AreaController.java
+21
-2
No files found.
src/main/java/net/vtstar/zhongtong/avi/monitoring/controller/AreaController.java
View file @
27b16cdf
...
@@ -34,6 +34,7 @@ public class AreaController {
...
@@ -34,6 +34,7 @@ public class AreaController {
PaintshopArea
area
=
new
PaintshopArea
();
PaintshopArea
area
=
new
PaintshopArea
();
area
.
setCode
(
"1"
);
area
.
setCode
(
"1"
);
area
.
setName
(
"钣金"
);
area
.
setName
(
"钣金"
);
area
.
setOnlineNum
(
"44"
);
Map
<
String
,
PaintshopStation
>
stationMap
=
new
HashMap
<>();
Map
<
String
,
PaintshopStation
>
stationMap
=
new
HashMap
<>();
PaintshopStation
station
=
new
PaintshopStation
();
PaintshopStation
station
=
new
PaintshopStation
();
station
.
setBusNo
(
"aaa"
);
station
.
setBusNo
(
"aaa"
);
...
@@ -62,8 +63,26 @@ public class AreaController {
...
@@ -62,8 +63,26 @@ public class AreaController {
@ApiOperation
(
value
=
"根据工单号及订单号定位车体当前位置"
,
response
=
PaintshopArea
.
class
,
responseContainer
=
"List"
)
@ApiOperation
(
value
=
"根据工单号及订单号定位车体当前位置"
,
response
=
PaintshopArea
.
class
,
responseContainer
=
"List"
)
@GetMapping
(
"/currentPosition/orderNo/busNo"
)
@GetMapping
(
"/currentPosition/orderNo/busNo"
)
private
Return
getPositionByOrderAndNo
(
@RequestParam
(
"orderNo"
)
String
orderNo
,
@RequestParam
(
"workOrderNo"
)
String
workOrderNo
)
{
private
Return
getPositionByOrderAndNo
(
@RequestParam
(
value
=
"orderNo"
,
required
=
false
)
String
orderNo
,
@RequestParam
(
value
=
"workOrderNo"
,
required
=
false
)
String
workOrderNo
)
{
return
Return
.
success
();
List
<
Map
<
String
,
PaintshopStation
>>
s
=
new
ArrayList
<>();
Map
<
String
,
PaintshopStation
>
stationMap
=
new
HashMap
<>();
PaintshopStation
station
=
new
PaintshopStation
();
station
.
setBusNo
(
"aaa"
);
station
.
setKeyStation
(
true
);
station
.
setCode
(
"HDG1-4"
);
station
.
setState
(
StationState
.
USE
);
station
.
setBusType
(
ProductionType
.
OWN
);
stationMap
.
put
(
"HDG1-4"
,
station
);
PaintshopStation
station2
=
new
PaintshopStation
();
station2
.
setBusNo
(
"bbb"
);
station2
.
setKeyStation
(
false
);
station2
.
setBusType
(
ProductionType
.
OTHER
);
station2
.
setState
(
StationState
.
FREE
);
station2
.
setCode
(
"HDG1-3"
);
stationMap
.
put
(
"HDG1-3"
,
station2
);
s
.
add
(
stationMap
);
return
Return
.
success
(
stationMap
);
}
}
@ApiOperation
(
value
=
"根据车身号获得当前车体信息"
,
response
=
Bus
.
class
)
@ApiOperation
(
value
=
"根据车身号获得当前车体信息"
,
response
=
Bus
.
class
)
...
...
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