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
071c7257
Commit
071c7257
authored
Oct 10, 2019
by
喻训浩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 测试数据
parent
67bab849
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
2 deletions
+51
-2
PaintshopArea.java
.../vtstar/zhongtong/avi/equipment/domain/PaintshopArea.java
+4
-0
PaintshopStation.java
...star/zhongtong/avi/equipment/domain/PaintshopStation.java
+3
-1
AreaController.java
...r/zhongtong/avi/monitoring/controller/AreaController.java
+30
-1
ProductionType.java
...zhongtong/avi/monitoring/domain/enums/ProductionType.java
+14
-0
No files found.
src/main/java/net/vtstar/zhongtong/avi/equipment/domain/PaintshopArea.java
View file @
071c7257
...
...
@@ -23,6 +23,10 @@ public class PaintshopArea {
@Id
private
Long
id
;
@ApiModelProperty
(
notes
=
"区域编号"
)
@Column
(
name
=
"code"
)
private
String
code
;
@ApiModelProperty
(
notes
=
"区域名称"
)
@Column
(
name
=
"name"
)
private
String
name
;
...
...
src/main/java/net/vtstar/zhongtong/avi/equipment/domain/PaintshopStation.java
View file @
071c7257
...
...
@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
net.vtstar.user.search.JoinColumn
;
import
net.vtstar.user.search.Search
;
import
net.vtstar.zhongtong.avi.monitoring.domain.enums.BusType
;
import
net.vtstar.zhongtong.avi.monitoring.domain.enums.ProductionType
;
import
net.vtstar.zhongtong.avi.monitoring.domain.enums.StationState
;
import
org.hibernate.validator.constraints.Length
;
...
...
@@ -79,5 +81,5 @@ public class PaintshopStation {
private
String
busNo
;
@ApiModelProperty
(
value
=
"车体类型"
)
private
String
busType
;
private
ProductionType
busType
;
}
src/main/java/net/vtstar/zhongtong/avi/monitoring/controller/AreaController.java
View file @
071c7257
...
...
@@ -5,13 +5,21 @@ import io.swagger.annotations.ApiOperation;
import
lombok.extern.slf4j.Slf4j
;
import
net.vtstar.utils.domain.Return
;
import
net.vtstar.zhongtong.avi.equipment.domain.PaintshopArea
;
import
net.vtstar.zhongtong.avi.equipment.domain.PaintshopStation
;
import
net.vtstar.zhongtong.avi.monitoring.domain.Bus
;
import
net.vtstar.zhongtong.avi.monitoring.domain.enums.ProductionType
;
import
net.vtstar.zhongtong.avi.monitoring.domain.enums.StationState
;
import
net.vtstar.zhongtong.avi.monitoring.domain.vo.CarStatisticsVO
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
@Slf4j
@Api
(
description
=
"avi区域实时监控模块相关"
)
@RestController
...
...
@@ -22,7 +30,28 @@ public class AreaController {
"钣金:1\r\n电泳:2\r\n密封防腐:3\r\n腻子:4\r\n中涂:5\r\n面/色漆:6\r\n成品:7"
)
@GetMapping
(
"/areaInfo/realTime"
)
private
Return
getAreaInfo
(
@RequestParam
(
value
=
"areaNo"
,
required
=
false
)
String
areaNo
)
{
return
Return
.
success
();
List
<
PaintshopArea
>
areas
=
new
ArrayList
<>();
PaintshopArea
area
=
new
PaintshopArea
();
area
.
setCode
(
"1"
);
area
.
setName
(
"钣金"
);
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
);
area
.
setStationMap
(
stationMap
);
areas
.
add
(
area
);
return
Return
.
success
(
areas
);
}
@ApiOperation
(
value
=
"查询车间各区域进车及交车数量"
,
response
=
CarStatisticsVO
.
class
,
responseContainer
=
"List"
)
...
...
src/main/java/net/vtstar/zhongtong/avi/monitoring/domain/enums/ProductionType.java
0 → 100644
View file @
071c7257
package
net
.
vtstar
.
zhongtong
.
avi
.
monitoring
.
domain
.
enums
;
public
enum
ProductionType
{
/**
* 自产
*/
OWN
,
/**
*
*/
OTHER
;
}
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