Merge remote-tracking branch 'origin/master'

zhuo

2024-07-23 5ed5f51d479989d5b2149b09c82b6b3ea495b589

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

@@ -1,28 +1,36 @@
package com.yuanchu.mom.controller;


import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.DataConfigDto;
import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.dto.DeviceDto1;
import com.yuanchu.mom.pojo.DataConfig;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.service.DataConfigService;
import com.yuanchu.mom.service.DeviceService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
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)表控制层
@@ -36,6 +44,9 @@

    @Value("${file.path}")
    private String filePath;

    @Autowired
    private DataConfigService dataConfigService;

    @ValueClassify("设备")
    @ApiOperation(value = "查询设备详情列表")
@@ -134,22 +145,103 @@
        return Result.success(deviceService.selectDeviceByCode(code));
    }

//    @ValueClassify("设备")
//    @ApiOperation(value = "查询数采配置")
//    @PostMapping("/getNumberCollect")
//    public Result<?> getNumberCollect(Integer id) {
//        DeviceDto1 deviceDto1 = new DeviceDto1();
//        BeanUtils.copyProperties(deviceService.getById(id),deviceDto1);
//        return Result.success(deviceDto1);
//    }
//
//    @ValueClassify("设备")
//    @ApiOperation(value = "维护数采配置")
//    @PostMapping("/numberCollect")
//    public Result<?> numberCollect(@RequestBody DeviceDto1 deviceDto1) {
//        Device device = new Device();
//        BeanUtils.copyProperties(deviceDto1,device);
//        return Result.success(deviceService.updateById(device));
//    }

    @ValueAuth
    @ValueClassify("设备")
    @ApiOperation(value = "查询数采配置")
    @PostMapping("/getNumberCollect")
    public Result<?> getNumberCollect(Integer id) {
        DeviceDto1 deviceDto1 = new DeviceDto1();
        BeanUtils.copyProperties(deviceService.getById(id),deviceDto1);
        return Result.success(deviceDto1);
    @ApiOperation("/数采-数据采集")
    @GetMapping("/dataCollection")
    public Result<?> dataAcquisition(HttpServletRequest request, @RequestParam("id") Integer id,
                          @RequestParam("entrustCode") String entrustCode,
                          @RequestParam("sampleCode") String sampleCode) {
        return deviceService.dataAcquisition(request, id, entrustCode, sampleCode);
    }

    @ValueAuth
    @ApiOperation(value = "判断该设备是否可以数采")
    @GetMapping("/determineWhetherToCollectData")
    public Result<?> determineWhetherToCollectData(@RequestParam("managementNumber") String managementNumber) {
        Device device = deviceService.getOne(Wrappers.<Device>lambdaQuery()
                .eq(Device::getManagementNumber, managementNumber));
        if (ObjectUtils.isEmpty(device)) {
            return Result.fail("设备编号错误！");
        }
        if (ObjectUtils.isEmpty(device.getFileType()) || ObjectUtils.isEmpty(device.getCollectUrl())) {
            return Result.success(false);
        } else {
            return Result.success(true);
        }
    }

    @ValueClassify("设备")
    @ApiOperation(value = "维护数采配置")
    @PostMapping("/numberCollect")
    public Result<?> numberCollect(@RequestBody DeviceDto1 deviceDto1) {
        Device device = new Device();
        BeanUtils.copyProperties(deviceDto1,device);
        return Result.success(deviceService.updateById(device));
    @PostMapping("/saveDataAcquisitionConfiguration")
    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("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);
        } else {
            return Result.success(dataConfigService.selectDataConfigList(deviceId));
        }
    }

    @ValueClassify("设备")
    @ApiOperation(value = "删除数采配置")
    @DeleteMapping("/deleteDataAcquisitionConfiguration")
    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();
    }
}