提交 0e04e44b 编辑于 作者: 夏东伟's avatar 夏东伟
浏览文件

接口名称修改

上级 a1c4a559
加载中
加载中
加载中
加载中
+10 −10
原始行号 差异行号 差异行
@@ -29,7 +29,7 @@ public class BasicInfoController {
    BasicInfoService basicInfoService;

    @ApiOperation(value = "分页查询设备列表", notes = "使用通用搜索组件,searchCode:SCADA_EQUIP_INFO")
    @PostMapping("/equip/page")
    @PostMapping("/equipPage")
    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/create")
    @PostMapping("/equipCreate")
    public Return createEquip(@Valid @RequestBody EquipInfo equipInfo) {
        basicInfoService.createEquip(equipInfo);
        return Return.success();
    }

    @ApiOperation("修改设备")
    @PutMapping("/equip/update")
    @PutMapping("/equipUpdate")
    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("/equipDelete")
    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/page")
        @PostMapping("/stationPage")
    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/create")
    @PostMapping("/stationCreate")
    public Return createStation(@Valid @RequestBody PaintshopStation station) {
        basicInfoService.createStation(station);
        return Return.success();
    }

    @ApiOperation("修改工位")
    @PutMapping("/station/update")
    @PutMapping("/stationUpdate")
    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("/stationDelete")
    public Return deleteStation(@RequestParam Long id) {
        Assert.notNull(id, "Id is null");
        basicInfoService.deleteStationById(id);
        return Return.success();
+2 −2
原始行号 差异行号 差异行
@@ -27,13 +27,13 @@ public class RunRecordController {
    private RunRecordService runRecordService;

    @ApiOperation(value = "运行时间列表(分页查询)", notes = "使用通用搜索组件,searchCode:MACHINE_RUNTIME_RECORD")
    @PostMapping("/runtime/page")
    @PostMapping("/runtimePage")
    public Return pageListRuntime(@RequestBody SearchVo pageFilter) {
        return Return.success(new PageInfo<>(runRecordService.findPageRunTime(pageFilter.toJSONObject())));
    }

    @ApiOperation(value = "故障信息列表(分页查询)", notes = "使用通用搜索组件,searchCode:MACHINE_WARNING_RECORD")
    @PostMapping("/fault/page")
    @PostMapping("/faultPage")
    public Return pageListFault(@RequestBody SearchVo pageFilter) {
        return Return.success(new PageInfo<>(runRecordService.findPageFault(pageFilter.toJSONObject())));
    }