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
0e04e44b
Commit
0e04e44b
authored
Sep 23, 2019
by
夏东伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接口名称修改
parent
a1c4a559
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
BasicInfoController.java
...ongtong/avi/equipment/controller/BasicInfoController.java
+10
-10
RunRecordController.java
...ongtong/avi/equipment/controller/RunRecordController.java
+2
-2
No files found.
src/main/java/net/vtstar/zhongtong/avi/equipment/controller/BasicInfoController.java
View file @
0e04e44b
...
...
@@ -29,7 +29,7 @@ public class BasicInfoController {
BasicInfoService
basicInfoService
;
@ApiOperation
(
value
=
"分页查询设备列表"
,
notes
=
"使用通用搜索组件,searchCode:SCADA_EQUIP_INFO"
)
@PostMapping
(
"/equip
/p
age"
)
@PostMapping
(
"/equip
P
age"
)
public
Return
pageListEquip
(
@RequestBody
SearchVo
pageFilter
)
{
return
Return
.
success
(
new
PageInfo
<>(
basicInfoService
.
findPageEquip
(
pageFilter
.
toJSONObject
())));
}
...
...
@@ -41,29 +41,29 @@ public class BasicInfoController {
" \"alias\": \"设备名称,字符串类型,长度最大100, 非必填\"\n"
+
" \"equipFactory\": \"设备厂商,字符串类型,长度最大100, 非必填\"\n"
+
"}"
)
@PostMapping
(
"/equip
/c
reate"
)
@PostMapping
(
"/equip
C
reate"
)
public
Return
createEquip
(
@Valid
@RequestBody
EquipInfo
equipInfo
)
{
basicInfoService
.
createEquip
(
equipInfo
);
return
Return
.
success
();
}
@ApiOperation
(
"修改设备"
)
@PutMapping
(
"/equip
/u
pdate"
)
@PutMapping
(
"/equip
U
pdate"
)
public
Return
updateEquip
(
@Valid
@RequestBody
EquipInfo
equipInfo
)
{
basicInfoService
.
updateEquip
(
equipInfo
);
return
Return
.
success
();
}
@ApiOperation
(
"删除设备(根据id删除单个)"
)
@DeleteMapping
(
"/equip
/{id}
"
)
public
Return
deleteEquip
(
@
PathVariable
(
"id"
)
Long
id
)
{
@DeleteMapping
(
"/equip
Delete
"
)
public
Return
deleteEquip
(
@
RequestParam
Long
id
)
{
Assert
.
notNull
(
id
,
"Id is null"
);
basicInfoService
.
deleteEquipById
(
id
);
return
Return
.
success
();
}
@ApiOperation
(
value
=
"分页查询工位列表"
,
notes
=
"使用通用搜索组件,searchCode:PAINTSHOP_STATION"
)
@PostMapping
(
"/station/p
age"
)
@PostMapping
(
"/stationP
age"
)
public
Return
pageListStation
(
@RequestBody
SearchVo
pageFilter
)
{
return
Return
.
success
(
new
PageInfo
<>(
basicInfoService
.
findPageStation
(
pageFilter
.
toJSONObject
())));
}
...
...
@@ -76,22 +76,22 @@ public class BasicInfoController {
" \"sequence\": \"工位序号,Int\"\n"
+
" \"keyStation\": \"是否为关键工位,boolean\"\n"
+
"}"
)
@PostMapping
(
"/station
/c
reate"
)
@PostMapping
(
"/station
C
reate"
)
public
Return
createStation
(
@Valid
@RequestBody
PaintshopStation
station
)
{
basicInfoService
.
createStation
(
station
);
return
Return
.
success
();
}
@ApiOperation
(
"修改工位"
)
@PutMapping
(
"/station
/u
pdate"
)
@PutMapping
(
"/station
U
pdate"
)
public
Return
updateStation
(
@Valid
@RequestBody
PaintshopStation
station
)
{
basicInfoService
.
updateStation
(
station
);
return
Return
.
success
();
}
@ApiOperation
(
"删除工位(根据id删除单个)"
)
@DeleteMapping
(
"/station
/{id}
"
)
public
Return
deleteStation
(
@
PathVariable
(
"id"
)
Long
id
)
{
@DeleteMapping
(
"/station
Delete
"
)
public
Return
deleteStation
(
@
RequestParam
Long
id
)
{
Assert
.
notNull
(
id
,
"Id is null"
);
basicInfoService
.
deleteStationById
(
id
);
return
Return
.
success
();
...
...
src/main/java/net/vtstar/zhongtong/avi/equipment/controller/RunRecordController.java
View file @
0e04e44b
...
...
@@ -27,13 +27,13 @@ public class RunRecordController {
private
RunRecordService
runRecordService
;
@ApiOperation
(
value
=
"运行时间列表(分页查询)"
,
notes
=
"使用通用搜索组件,searchCode:MACHINE_RUNTIME_RECORD"
)
@PostMapping
(
"/runtime
/p
age"
)
@PostMapping
(
"/runtime
P
age"
)
public
Return
pageListRuntime
(
@RequestBody
SearchVo
pageFilter
)
{
return
Return
.
success
(
new
PageInfo
<>(
runRecordService
.
findPageRunTime
(
pageFilter
.
toJSONObject
())));
}
@ApiOperation
(
value
=
"故障信息列表(分页查询)"
,
notes
=
"使用通用搜索组件,searchCode:MACHINE_WARNING_RECORD"
)
@PostMapping
(
"/fault
/p
age"
)
@PostMapping
(
"/fault
P
age"
)
public
Return
pageListFault
(
@RequestBody
SearchVo
pageFilter
)
{
return
Return
.
success
(
new
PageInfo
<>(
runRecordService
.
findPageFault
(
pageFilter
.
toJSONObject
())));
}
...
...
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