1.数采 2.国产网分仪

liding

2025-04-23 bc1b3ee367f7e9aef88fc59647a9631f39eca6b5

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

@@ -53,13 +53,14 @@

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

    //设备工具明细

    @ApiOperation(value = "查询设备详情列表")
    @GetMapping("/selectDeviceParameter")
    public Result selectDeviceParameter(Page page, DeviceDto itemParameter, Boolean laboratoryNameIsNull){
    public Result selectDeviceParameter(Page page, DeviceDto itemParameter, Boolean laboratoryNameIsNull) {
        return Result.success(deviceService.selectDeviceParameter(page, itemParameter, laboratoryNameIsNull));
    }

@@ -137,8 +138,8 @@

    @ApiOperation(value = "通过项目获取设备列表")
    @GetMapping("/selectDeviceByCategory")
    public Result selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass,String laboratory) {
        return Result.success(deviceService.selectDeviceByCategory(inspectionItem, inspectionItemSubclass,laboratory));
    public Result selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass, String laboratory) {
        return Result.success(deviceService.selectDeviceByCategory(inspectionItem, inspectionItemSubclass, laboratory));
    }

    @ApiOperation(value = "通过设备编号获取设备列表")
@@ -150,8 +151,14 @@

    @ApiOperation("/数采-数据采集")
    @PostMapping("/dataCollection")
    public Result<?> dataAcquisition(HttpServletRequest request,@RequestBody DeviceCollectionDto dto) {
    public Result<?> dataAcquisition(HttpServletRequest request, @RequestBody DeviceCollectionDto dto) {
        return deviceService.dataAcquisition(request, dto);
    }

    @ApiOperation("/数采-数据采集")
    @PostMapping("/dataCollection1")
    public Result<?> dataCollection1(HttpServletRequest request, @RequestBody DeviceCollectionDto dto) {
        return deviceService.dataCollection1(request, dto);
    }

    @ApiOperation(value = "维护数采配置")
@@ -167,6 +174,12 @@
        return dataConfigService.queryDataAcquisitionConfiguration(dataConfig);
    }

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


    @ApiOperation(value = "删除数采配置")
    @DeleteMapping("/deleteDataAcquisitionConfiguration")
@@ -176,7 +189,6 @@
        dataConfigService.removeBatchByIds(collect);
        return Result.success();
    }



    @ApiOperation(value = "左侧设备树形栏")
@@ -189,7 +201,7 @@
    @ApiOperation(value = "设备档案导出")
    @GetMapping("/exportDeviceFile")
    public void exportDeviceFile(@RequestParam Integer deviceId, HttpServletResponse response) throws Exception {
        deviceService.exportDeviceFile(deviceId,response);
        deviceService.exportDeviceFile(deviceId, response);
    }

    @ApiOperation(value = "仪器设备一览表导出")
@@ -200,11 +212,12 @@

    /**
     * 导入设备
     *
     * @return
     */
    @ApiOperation(value = "导入设备")
    @PostMapping("/importDevice")
    public Result importDevice(@RequestParam("file") MultipartFile file){
    public Result importDevice(@RequestParam("file") MultipartFile file) {
        try {
            EasyExcel.read(file.getInputStream(), Device.class, new DeviceListener(deviceService))
                    .registerConverter(new LocalDateTimeStringConverters())
@@ -218,7 +231,7 @@

    @ApiOperation(value = "判断该设备是否可以数采")
    @GetMapping("/determineWhetherToCollectData")
    public Result<?> determineWhetherToCollectData(@RequestParam(value = "managementNumber",defaultValue = "") String managementNumber, HttpServletRequest request) {
    public Result<?> determineWhetherToCollectData(@RequestParam(value = "managementNumber", defaultValue = "") String managementNumber, HttpServletRequest request) {
        return deviceService.determineWhetherToCollectData(managementNumber, request);
    }
}