文件采集完成 - 100%

Crunchy

2024-07-20 795836ddc0dc78cc598b94419753e9750c04fbfb

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

@@ -8,12 +8,10 @@
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.DataConfigDto;
import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.exception.ErrorException;
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.DataAcquisition;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
@@ -167,18 +165,10 @@
    @ValueClassify("设备")
    @ApiOperation("/数采-数据采集")
    @GetMapping("/dataCollection")
    public Result<?> text(HttpServletRequest request, @RequestParam("managementNumber") String managementNumber,
    public Result<?> dataAcquisition(HttpServletRequest request, @RequestParam("id") Integer id,
                          @RequestParam("entrustCode") String entrustCode,
                          @RequestParam("sampleCode") String sampleCode) {
        Device device = deviceService.getOne(Wrappers.<Device>lambdaQuery()
                .eq(Device::getManagementNumber, managementNumber));
        if (ObjectUtils.isEmpty(device.getFileType()) || ObjectUtils.isEmpty(device.getCollectUrl())) {
            throw new ErrorException("未给该：" + device.getDeviceName() + "设备配置采集路径或文件后缀！");
        }
        List<DataConfig> list = dataConfigService.list(Wrappers.<DataConfig>lambdaQuery()
                .eq(DataConfig::getDeviceId, device.getId())
                .orderBy(false, false, DataConfig::getId));
        return DataAcquisition.dataAcquisitionEntrance(request,list, device, entrustCode, sampleCode);
        return deviceService.dataAcquisition(request, id, entrustCode, sampleCode);
    }

    @ValueAuth