From c1b7868762ef7d596325877627720ca75e45ba09 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 26 七月 2024 11:23:05 +0800
Subject: [PATCH] 数采bug调整
---
cnas-server/src/main/resources/mapper/DataConfigMapper.xml | 4 ++--
cnas-server/src/main/java/com/yuanchu/mom/mapper/DataConfigMapper.java | 2 +-
cnas-server/src/main/java/com/yuanchu/mom/service/DataConfigService.java | 2 +-
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DataConfigServiceImpl.java | 7 +++++--
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DataConfigMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DataConfigMapper.java
index 56572b2..1e0768f 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DataConfigMapper.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DataConfigMapper.java
@@ -18,5 +18,5 @@
List<DeviceConfigDtoPage> selectDataConfigList(Integer deviceId);
- List<DataConfig> deleteDataConfig();
+ List<Integer> deleteDataConfig();
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/DataConfigService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/DataConfigService.java
index 32959f0..3ca77f9 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/DataConfigService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/DataConfigService.java
@@ -18,5 +18,5 @@
List<DeviceConfigDtoPage> selectDataConfigList(Integer deviceId);
- List<DataConfig> deleteDataConfig();
+ void deleteDataConfig();
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DataConfigServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DataConfigServiceImpl.java
index 7c8c492..f5ddc08 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DataConfigServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DataConfigServiceImpl.java
@@ -32,7 +32,10 @@
}
@Override
- public List<DataConfig> deleteDataConfig() {
- return dataConfigMapper.deleteDataConfig();
+ public void deleteDataConfig() {
+ List<Integer> integers = dataConfigMapper.deleteDataConfig();
+ if (!integers.isEmpty()) {
+ dataConfigMapper.deleteBatchIds(integers);
+ }
}
}
diff --git a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
index 592af80..e1188f1 100644
--- a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
@@ -35,8 +35,8 @@
where d.id = #{deviceId}
</select>
- <select id="deleteDataConfig" resultType="com.yuanchu.mom.pojo.DataConfig">
- SELECT ddc.*
+ <select id="deleteDataConfig" resultType="integer">
+ SELECT ddc.id
FROM device d
left join structure_item_parameter ip on not FIND_IN_SET(ip.id, d.ins_product_ids)
inner join device_data_config ddc on ddc.device_id = d.id and ddc.structure_item_parameter_id = ip.id
--
Gitblit v1.9.3