From 8d3c3fec23edeabe3b40aa1eefc7fdd0c6c57d57 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 26 七月 2024 17:12:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 8 ++------
1 files changed, 2 insertions(+), 6 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 c28b9dd..00d3ad2 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,7 +8,6 @@
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;
@@ -198,17 +197,14 @@
@PostMapping("/saveDataAcquisitionConfiguration")
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());
+ device.setMdbEntrustCode(dataConfigList.getMdbEntrustCode());
+ device.setMdbSampleCode(dataConfigList.getMdbSampleCode());
deviceService.updateById(device);
} else {
dataConfigService.saveOrUpdateBatch(dataConfigList.getDataConfigList());
--
Gitblit v1.9.3