Commit b5755d43 authored by 夏东伟's avatar 夏东伟

接口名称修改

parent 0e04e44b
...@@ -28,7 +28,14 @@ public class BasicInfoController { ...@@ -28,7 +28,14 @@ public class BasicInfoController {
@Autowired @Autowired
BasicInfoService basicInfoService; BasicInfoService basicInfoService;
@ApiOperation(value = "分页查询设备列表", notes = "使用通用搜索组件,searchCode:SCADA_EQUIP_INFO") @ApiOperation(value = "分页查询设备列表", notes = "使用通用搜索组件,searchCode:SCADA_EQUIP_INFO\n" +
"字段含义:\n{\n" +
" \"workshopCode\": \"车间,字符串类型\",\n" +
" \"equipType\": \"设备类型,字符串类型\",\n" +
" \"equipCode\": \"设备编号,字符串类型\",\n" +
" \"alias\": \"设备名称,字符串类型\"\n" +
" \"equipFactory\": \"设备厂商,字符串类型\"\n" +
"}")
@PostMapping("/equipPage") @PostMapping("/equipPage")
public Return pageListEquip(@RequestBody SearchVo pageFilter) { public Return pageListEquip(@RequestBody SearchVo pageFilter) {
return Return.success(new PageInfo<>(basicInfoService.findPageEquip(pageFilter.toJSONObject()))); return Return.success(new PageInfo<>(basicInfoService.findPageEquip(pageFilter.toJSONObject())));
...@@ -62,7 +69,14 @@ public class BasicInfoController { ...@@ -62,7 +69,14 @@ public class BasicInfoController {
return Return.success(); return Return.success();
} }
@ApiOperation(value = "分页查询工位列表", notes = "使用通用搜索组件,searchCode:PAINTSHOP_STATION") @ApiOperation(value = "分页查询工位列表", notes = "使用通用搜索组件,searchCode:PAINTSHOP_STATION\n" +
"字段含义:\n{\n" +
" \"workshopCode\": \"车间,字符串类型\",\n" +
" \"areaName\": \"区域,字符串类型\",\n" +
" \"laneCode\": \"车道编号,字符串类型\",\n" +
" \"code\": \"工位编号,字符串类型\"\n" +
" \"keyStation\": \"是否为关键工位,boolean\"\n" +
"}")
@PostMapping("/stationPage") @PostMapping("/stationPage")
public Return pageListStation(@RequestBody SearchVo pageFilter) { public Return pageListStation(@RequestBody SearchVo pageFilter) {
return Return.success(new PageInfo<>(basicInfoService.findPageStation(pageFilter.toJSONObject()))); return Return.success(new PageInfo<>(basicInfoService.findPageStation(pageFilter.toJSONObject())));
......
...@@ -26,13 +26,27 @@ public class RunRecordController { ...@@ -26,13 +26,27 @@ public class RunRecordController {
@Autowired @Autowired
private RunRecordService runRecordService; private RunRecordService runRecordService;
@ApiOperation(value = "运行时间列表(分页查询)", notes = "使用通用搜索组件,searchCode:MACHINE_RUNTIME_RECORD") @ApiOperation(value = "运行时间列表(分页查询)", notes = "使用通用搜索组件,searchCode:MACHINE_RUNTIME_RECORD\n" +
"字段含义:\n{\n" +
" \"workshopCode\": \"车间,字符串类型\",\n" +
" \"equipCode\": \"设备编号,字符串类型\",\n" +
" \"alias\": \"设备名称,字符串类型\"\n" +
" \"currentRuntime\": \"当班运行时间,LONG\"\n" +
" \"totalRuntime\": \"累计运行时间,LONG\"\n" +
"}")
@PostMapping("/runtimePage") @PostMapping("/runtimePage")
public Return pageListRuntime(@RequestBody SearchVo pageFilter) { public Return pageListRuntime(@RequestBody SearchVo pageFilter) {
return Return.success(new PageInfo<>(runRecordService.findPageRunTime(pageFilter.toJSONObject()))); return Return.success(new PageInfo<>(runRecordService.findPageRunTime(pageFilter.toJSONObject())));
} }
@ApiOperation(value = "故障信息列表(分页查询)", notes = "使用通用搜索组件,searchCode:MACHINE_WARNING_RECORD") @ApiOperation(value = "故障信息列表(分页查询)", notes = "使用通用搜索组件,searchCode:MACHINE_WARNING_RECORD\n" +
"字段含义:\n{\n" +
" \"workshopCode\": \"车间,字符串类型\",\n" +
" \"equipCode\": \"设备编号,字符串类型\",\n" +
" \"alias\": \"设备名称,字符串类型\"\n" +
" \"warningInfo\": \"故障信息,字符串类型\"\n" +
" \"beginTime\": \"时间,Date\"\n" +
"}")
@PostMapping("/faultPage") @PostMapping("/faultPage")
public Return pageListFault(@RequestBody SearchVo pageFilter) { public Return pageListFault(@RequestBody SearchVo pageFilter) {
return Return.success(new PageInfo<>(runRecordService.findPageFault(pageFilter.toJSONObject()))); return Return.success(new PageInfo<>(runRecordService.findPageFault(pageFilter.toJSONObject())));
......
...@@ -38,6 +38,11 @@ public class FaultRecord { ...@@ -38,6 +38,11 @@ public class FaultRecord {
@Search @Search
private String equipCode; private String equipCode;
@ApiModelProperty(notes = "设备名称")
@JoinColumn(tableName = EquipInfo.class, name = "alias")
@Search
private String alias;
@ApiModelProperty(notes = "故障信息") @ApiModelProperty(notes = "故障信息")
@Column(name = "warning_info") @Column(name = "warning_info")
private String warningInfo; private String warningInfo;
......
...@@ -38,6 +38,11 @@ public class RuntimeRecord { ...@@ -38,6 +38,11 @@ public class RuntimeRecord {
@Search @Search
private String equipCode; private String equipCode;
@ApiModelProperty(notes = "设备名称")
@JoinColumn(tableName = EquipInfo.class, name = "alias")
@Search
private String alias;
@ApiModelProperty(notes = "当前运行时间") @ApiModelProperty(notes = "当前运行时间")
@Column(name = "current_runtime") @Column(name = "current_runtime")
private Long currentRuntime; private Long currentRuntime;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment