Merge remote-tracking branch 'origin/master'

Crunchy

2024-04-25 cfdaaae8690e188f6971057259873aa408ebc9e3

 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java

@@ -118,14 +118,18 @@
        return Result.success(deviceService.selectDevicePrincipal());
    }

    @ApiOperation(value = "通过设备分类获取设备列表")
    @ApiOperation(value = "通过项目获取设备列表")
    @PostMapping("/selectDeviceByCategory")
    @ValueAuth
    @ApiImplicitParams({
            @ApiImplicitParam(name = "category", value = "设备分类", dataTypeClass = String.class),
    })
    public Result selectDeviceByCategory(String category) {
        return Result.success(deviceService.selectDeviceByCategory(category));
    public Result selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass) {
        return Result.success(deviceService.selectDeviceByCategory(inspectionItem, inspectionItemSubclass));
    }

    @ApiOperation(value = "通过设备编号获取设备列表")
    @PostMapping("/selectDeviceByCode")
    @ValueAuth
    public Result selectDeviceByCode(String code) {
        return Result.success(deviceService.selectDeviceByCode(code));
    }
}