tree优化

liding

2 天以前 16d1c46ce0c5469d2e3e2cfa247dc595af320d58

 cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java

@@ -49,13 +49,14 @@
    @Autowired
    private DataConfigService dataConfigService;

    @ApiOperation(value = "查询设备详情")
    @GetMapping("/getDeviceById")
    public Result getDeviceById(Integer deviceId){
        return Result.success(deviceService.getById(deviceId));
    }

    @ApiOperation(value = "查看设备二维码按钮")
    @GetMapping("/showDeviceQrCodeButton")
    public void showDeviceQrCodeButton() { }

    //设备工具明细

    @ApiOperation(value = "查询设备详情列表")
    @GetMapping("/selectDeviceParameter")
    public Result selectDeviceParameter(Page page, DeviceDto itemParameter, Boolean laboratoryNameIsNull){
@@ -134,12 +135,6 @@
        }
    }

    @ApiOperation(value = "获取设备负责人")
    @GetMapping("/selectDevicePrincipal")
    public Result selectDevicePrincipal() {
        return Result.success(deviceService.selectDevicePrincipal());
    }

    @ApiOperation(value = "通过项目获取设备列表")
    @GetMapping("/selectDeviceByCategory")
    public Result selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass,String laboratory) {
@@ -159,10 +154,10 @@
        return deviceService.dataAcquisition(request, dto);
    }

    @ApiOperation(value = "维护数采配置")
    @PostMapping("/saveDataAcquisitionConfiguration")
    public Result<?> saveDataAcquisitionConfiguration(@RequestParam(value = "deviceId") Integer deviceId, @RequestBody DataConfigDto dataConfigList) {
        dataConfigService.saveDataAcquisitionConfiguration(deviceId, dataConfigList);
    @ApiOperation(value = "维护设备文件配置")
    @PostMapping("/saveDeviceFileConfiguration")
    public Result<?> saveDeviceFileConfiguration(@RequestBody DataConfigDto dataConfigList) {
        dataConfigService.saveDeviceFileConfiguration(dataConfigList);
        return Result.success();
    }

@@ -172,6 +167,25 @@
        return dataConfigService.queryDataAcquisitionConfiguration(dataConfig);
    }

    @ApiOperation(value = "查询检验项数采配置")
    @GetMapping("/queryProductConfiguration")
    public Result<?> queryProductConfiguration(DataConfig dataConfig) {
        return dataConfigService.queryProductConfiguration(dataConfig);
    }

    @ApiOperation(value = "维护数采配置")
    @PostMapping("/saveDataAcquisitionConfiguration")
    public Result<?> saveDataAcquisitionConfiguration(@RequestBody DataConfigDto dataConfigList) {
        dataConfigService.saveDataAcquisitionConfiguration(dataConfigList);
        return Result.success();
    }


    @ApiOperation(value = "查询绑定了但是没有配置的检验项")
    @GetMapping("/getNoConfigProduct")
    public Result<?> getNoConfigProduct(Page page, Integer deviceId) {
        return Result.success(dataConfigService.getNoConfigProduct(page, deviceId));
    }

    @ApiOperation(value = "删除数采配置")
    @DeleteMapping("/deleteDataAcquisitionConfiguration")
@@ -182,8 +196,6 @@
        return Result.success();
    }



    @ApiOperation(value = "左侧设备树形栏")
    @GetMapping("/treeDevice")
    public Result treeDevice(String deviceName) {
@@ -193,13 +205,13 @@

    @ApiOperation(value = "设备档案导出")
    @GetMapping("/exportDeviceFile")
    public void exportDeviceFile(@RequestParam Integer deviceId, HttpServletResponse response) throws Exception {
    public void exportDeviceFile(@RequestParam Integer deviceId, HttpServletResponse response){
        deviceService.exportDeviceFile(deviceId,response);
    }

    @ApiOperation(value = "仪器设备一览表导出")
    @GetMapping("/exportEquipmentDetails")
    public void exportEquipmentDetails(HttpServletResponse response) throws Exception {
    public void exportEquipmentDetails(HttpServletResponse response){
        deviceService.exportEquipmentDetails(response);
    }
}