Merge remote-tracking branch 'origin/master'

zhuo

2024-07-23 5ed5f51d479989d5b2149b09c82b6b3ea495b589

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

@@ -26,9 +26,11 @@
import java.io.File;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * 设备(DeviceController)表控制层
@@ -190,26 +192,55 @@
    @ValueClassify("设备")
    @ApiOperation(value = "维护数采配置")
    @PostMapping("/saveDataAcquisitionConfiguration")
    public Result<?> saveDataAcquisitionConfiguration(@RequestBody DataConfigDto dataConfigList) {
        dataConfigService.saveOrUpdateBatch(dataConfigList.getDataConfigList());
    public Result<?> saveDataAcquisitionConfiguration(@RequestParam(value = "deviceId") Integer deviceId, @RequestBody DataConfigDto dataConfigList) {
        if (dataConfigList.getIsDevice()) {
            System.out.println();
            Device device = new Device();
            device.setId(deviceId);
            device.setCollectUrl(dataConfigList.getCollectUrl());
            device.setStorageUrl(dataConfigList.getStorageUrl());
            device.setIp(dataConfigList.getIp());
            device.setFileType(dataConfigList.getFileType());
            deviceService.updateById(device);
        } else {
            dataConfigService.saveOrUpdateBatch(dataConfigList.getDataConfigList());
        }
        return Result.success();
    }

//    @ValueClassify("设备")
//    @ApiOperation(value = "查询数采配置")
//    @GetMapping("/queryDataAcquisitionConfiguration")
//    public Result<?> queryDataAcquisitionConfiguration(@RequestParam("deviceId") Integer deviceId, @RequestParam("insProductItem") String insProductItem) {
//        List<DataConfig> list = dataConfigService.list(Wrappers.<DataConfig>lambdaQuery()
//                .eq(DataConfig::getDeviceId, deviceId)
//                .eq(DataConfig::getInsProductItem, insProductItem));
//        return Result.success(list);
//    }

    @ValueClassify("设备")
    @ApiOperation(value = "查询数采配置")
    @GetMapping("/queryDataAcquisitionConfiguration")
    public Result<?> queryDataAcquisitionConfiguration(@RequestParam("deviceId") Integer deviceId, @RequestParam("insProductItem") String insProductItem) {
        List<DataConfig> list = dataConfigService.list(Wrappers.<DataConfig>lambdaQuery()
    public Result<?> queryDataAcquisitionConfiguration(@RequestParam("deviceId") Integer deviceId,
                                                       @RequestParam("isDevice") Boolean isDevice,
                                                       @RequestParam(value = "insProductItem", required = false) String insProductItem) {
        if (isDevice) {
            List<DataConfig> list = dataConfigService.list(Wrappers.<DataConfig>lambdaQuery()
                .eq(DataConfig::getDeviceId, deviceId)
                .eq(DataConfig::getInsProductItem, insProductItem));
        return Result.success(list);
            return Result.success(list);
        } else {
            return Result.success(dataConfigService.selectDataConfigList(deviceId));
        }
    }

    @ValueClassify("设备")
    @ApiOperation(value = "删除数采配置")
    @DeleteMapping("/deleteDataAcquisitionConfiguration")
    public Result<?> deleteDataAcquisitionConfiguration(@RequestParam("id") Integer id) {
        dataConfigService.removeById(id);
    public Result<?> deleteDataAcquisitionConfiguration(@RequestParam("ids") String ids) {
        List<String> split = Arrays.asList(ids.split(","));
        List<String> collect = split.stream().distinct().collect(Collectors.toList());
        dataConfigService.removeBatchByIds(collect);
        return Result.success();
    }
}