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/dto/DeviceConfigDtoPage.java | 3 +++
cnas-server/src/main/java/com/yuanchu/mom/dto/DataConfigDto.java | 6 ++++++
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 2 ++
cnas-server/src/main/resources/mapper/DataConfigMapper.xml | 2 ++
4 files changed, 13 insertions(+), 0 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 024130c..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
@@ -203,6 +203,8 @@
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());
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/dto/DataConfigDto.java b/cnas-server/src/main/java/com/yuanchu/mom/dto/DataConfigDto.java
index d3fafcc..ffb2a0a 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/dto/DataConfigDto.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/dto/DataConfigDto.java
@@ -24,4 +24,10 @@
@ApiModelProperty("璁惧IP")
private String ip;
+
+ @ApiModelProperty("鏁伴噰-濮旀墭瀛楁")
+ private String mdbEntrustCode;
+
+ @ApiModelProperty("鏁伴噰-鏍峰搧瀛楁")
+ private String mdbSampleCode;
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceConfigDtoPage.java b/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceConfigDtoPage.java
index 73ad6d8..d3cbb36 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceConfigDtoPage.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceConfigDtoPage.java
@@ -69,4 +69,7 @@
@ApiModelProperty(value = "妫�楠岄」鐩甶d")
private Integer structureItemParameterId;
+
+ private String mdbEntrustCode;
+ private String mdbSampleCode;
}
diff --git a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
index e1188f1..69e1e5f 100644
--- a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
@@ -18,6 +18,8 @@
d.collect_url,
d.storage_url,
d.ip,
+ d.mdb_entrust_code,
+ d.mdb_sample_code,
ip.inspection_item,
if(ip.inspection_item_subclass is not null and ip.inspection_item_subclass != '',
ip.inspection_item_subclass, ip.inspection_item) inspection_item_subclass,
--
Gitblit v1.9.3