From b1a5b68c98092e0a9393966aca79678c5983f00e Mon Sep 17 00:00:00 2001 From: huguanghan Date: Fri, 17 Jan 2025 15:44:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=98=A0=E5=B0=84=E8=A1=A8=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=EF=BC=8C=E9=93=BE=E8=B7=AF=E7=BB=91=E5=AE=9A=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../node/service/impl/SysNodeServiceImpl.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java index 375447c5..a7b39c40 100644 --- a/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java +++ b/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java @@ -43,6 +43,7 @@ import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.util.StopWatch; import org.springframework.web.multipart.MultipartFile; import java.io.BufferedReader; @@ -51,6 +52,7 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.util.*; +import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.stream.Collectors; @@ -398,17 +400,22 @@ public class SysNodeServiceImpl implements SysNodeService { } } //批量更新 + StopWatch stopWatch = new StopWatch(); + stopWatch.start("绑定设备新增映射表关联开始"); if (!CollectionUtils.isEmpty(addList)) { ListUtil.page(addList,COMMIT_COUNT, item -> { - sysImptabmappingMapper.insertOrUpdateBatch(item); + sysImptabmappingMapper.insertBatch(item); }); - } + stopWatch.stop(); + stopWatch.start("绑定设备更新映射表关联开始"); if (!CollectionUtils.isEmpty(updateList)) { ListUtil.page(updateList,COMMIT_COUNT, item -> { - sysImptabmappingMapper.insertOrUpdateBatch(item); + sysImptabmappingMapper.updateBatchById(item); }); } + stopWatch.stop(); + stopWatch.start("绑定设备删除映射表关联开始"); //删除为匹配的历史配置 List deleteList = new ArrayList<>(); for(SysTabMappingVo item : mappingVoMap.values()){ @@ -421,7 +428,8 @@ public class SysNodeServiceImpl implements SysNodeService { sysImptabmappingMapper.deleteBatchIds(item); }); } - + stopWatch.stop(); + log.debug("绑定设备时间{}",stopWatch.prettyPrint(TimeUnit.SECONDS)); } /** From dfc92fbfc1f3b9c3950b0d085577cc59d09f9d25 Mon Sep 17 00:00:00 2001 From: huguanghan Date: Fri, 17 Jan 2025 15:45:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=98=A0=E5=B0=84=E8=A1=A8=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=EF=BC=8C=E9=93=BE=E8=B7=AF=E7=BB=91=E5=AE=9A=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/das/modules/node/service/impl/SysNodeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java index a7b39c40..e56d0c07 100644 --- a/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java +++ b/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java @@ -468,7 +468,7 @@ public class SysNodeServiceImpl implements SysNodeService { } if (!CollectionUtils.isEmpty(list)) { ListUtil.page(list,COMMIT_COUNT, item -> { - sysImptabmappingMapper.insertOrUpdateBatch(item); + sysImptabmappingMapper.updateBatchById(item); }); } }