1.14调整

zss

2025-01-14 3adcc36797b576b6c6f793e0eeac41068b6dd717

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

@@ -59,10 +59,10 @@
    @ValueClassify("设备")
    @ApiOperation(value = "查询设备详情列表")
    @PostMapping("/selectDeviceParameter")
    public Result selectDeviceParameter(@RequestBody Map<String, Object> data) throws Exception {
    public Result selectDeviceParameter(@RequestBody Map<String, Object> data,@RequestParam(value = "laboratoryNameIsNull", required = false) Boolean laboratoryNameIsNull) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
        DeviceDto itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), DeviceDto.class);
        return Result.success(deviceService.selectDeviceParameter(page, itemParameter));
        return Result.success(deviceService.selectDeviceParameter(page, itemParameter,laboratoryNameIsNull));
    }

    @ValueClassify("设备")
@@ -150,7 +150,7 @@
    }

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