From 795836ddc0dc78cc598b94419753e9750c04fbfb Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期六, 20 七月 2024 19:01:46 +0800
Subject: [PATCH] 文件采集完成 - 100%
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index 6fecd36..eb36cf3 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/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
--
Gitblit v1.9.3