From 0087434cc70ca8cee692be654d9e1c6ec82c3da7 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 24 七月 2024 21:09:21 +0800
Subject: [PATCH] 数采bug调整
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 73 ++++++++++++++++++++++++++----------
1 files changed, 52 insertions(+), 21 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..71f8b14 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
@@ -28,9 +28,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)琛ㄦ帶鍒跺眰
@@ -167,28 +169,22 @@
@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
@ApiOperation(value = "鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�")
@GetMapping("/determineWhetherToCollectData")
- public Result<?> determineWhetherToCollectData(@RequestParam("managementNumber") String managementNumber) {
+ public Result<?> determineWhetherToCollectData(@RequestParam("managementNumber") String managementNumber, HttpServletRequest request) {
+ String ip = DataAcquisition.getIp(request);
Device device = deviceService.getOne(Wrappers.<Device>lambdaQuery()
- .eq(Device::getManagementNumber, managementNumber));
+ .eq(Device::getManagementNumber, managementNumber)
+ .eq(Device::getIp, ip));
if (ObjectUtils.isEmpty(device)) {
- return Result.fail("璁惧缂栧彿閿欒锛�");
+ return Result.success(false);
}
if (ObjectUtils.isEmpty(device.getFileType()) || ObjectUtils.isEmpty(device.getCollectUrl())) {
return Result.success(false);
@@ -200,26 +196,61 @@
@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()) {
+ Device one = deviceService.getOne(Wrappers.<Device>lambdaQuery()
+ .eq(Device::getIp, dataConfigList.getIp()));
+ if (ObjectUtils.isNotEmpty(one)) {
+ throw new ErrorException("璇P锛�" + dataConfigList.getIp() + "宸茬粡缁戝畾浜嗚澶囷細" + one.getDeviceName());
+ }
+ 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 = "inspectionItem", required = false) String inspectionItem,
+ @RequestParam(value = "inspectionItemSubclass", required = false) String inspectionItemSubclass) {
+ if (isDevice) {
+ List<DataConfig> list = dataConfigService.list(Wrappers.<DataConfig>lambdaQuery()
.eq(DataConfig::getDeviceId, deviceId)
- .eq(DataConfig::getInsProductItem, insProductItem));
- return Result.success(list);
+ .eq(DataConfig::getInspectionItem, inspectionItem)
+ .eq(DataConfig::getInspectionItemSubclass, inspectionItemSubclass));
+ 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();
}
}
--
Gitblit v1.9.3