lims检测中心设备联调

chenrui

2025-03-11 fb2f97c1e66abc8a6d06287213187ce23dd5d7e0

lims检测中心设备联调

 cnas-require/src/main/java/com/ruoyi/requier/controller/DeviceController.java

@@ -78,11 +78,9 @@

    //设备工具明细
    @ApiOperation(value = "查询设备详情列表")
    @PostMapping("/selectDeviceParameter")
    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, laboratoryNameIsNull));
    @GetMapping("/selectDeviceParameter")
    public Result selectDeviceParameter(Page page,DeviceDto deviceDto,Boolean laboratoryNameIsNull) {
        return Result.success(deviceService.selectDeviceParameter(page, deviceDto, laboratoryNameIsNull));
    }

    @ApiOperation(value = "添加设备详情参数")
@@ -92,7 +90,7 @@
    }

    @ApiOperation(value = "删除设备详情参数")
    @PostMapping("/delDeviceParameter")
    @DeleteMapping("/delDeviceParameter")
    public Result<?> delDeviceParameter(Integer id) {
        return Result.success(deviceService.delDeviceParameter(id));
    }

 cnas-require/src/main/java/com/ruoyi/requier/service/impl/DeviceServiceImpl.java

@@ -76,11 +76,7 @@

    @Override
    public IPage<DeviceDto> selectDeviceParameter(Page page, DeviceDto itemParameter, Boolean laboratoryNameIsNull) {
        itemParameter.setCreateUser(SecurityUtils.getUserId().intValue());
        String storagePoint = itemParameter.getStoragePoint();//存放点
        itemParameter.setStoragePoint(null);
        QueryWrapper<DeviceDto> wrapper = QueryWrappers.queryWrappers(itemParameter).eq(StringUtils.isNotBlank(storagePoint), "storage_point", storagePoint);
        IPage<DeviceDto> iPage = deviceMapper.selectDeviceParameterPage(page, wrapper, laboratoryNameIsNull);
        IPage<DeviceDto> iPage = deviceMapper.selectDeviceParameterPage(page, QueryWrappers.queryWrappers(itemParameter), laboratoryNameIsNull);
        return iPage;
    }