From 60fa13f76afe72a6f48416de2904d58164859382 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 17 一月 2025 13:51:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java
index b365cb9..beada3c 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java
@@ -6,7 +6,9 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.iailab.framework.common.constant.Constant;
 import com.iailab.framework.common.pojo.PageResult;
+import com.iailab.framework.common.service.impl.BaseServiceImpl;
 import com.iailab.framework.common.util.object.BeanUtils;
 import com.iailab.framework.common.util.object.ConvertUtils;
 import com.iailab.module.data.api.point.dto.ApiPointDTO;
@@ -45,7 +47,7 @@
  * @createTime 2024年09月2日
  */
 @Service
-public class DaPointServiceImpl extends ServiceImpl<DaPointDao, DaPointEntity> implements DaPointService {
+public class DaPointServiceImpl extends BaseServiceImpl<DaPointDao, DaPointEntity> implements DaPointService {
 
     @Autowired
     private DaMeasurePointService daMeasurePointService;
@@ -395,7 +397,7 @@
         importPoints.forEach(importPoint -> {
 
             // 判断如果不存在,再进行插入
-            DaPointEntity existPoint = baseMapper.selectByPointName(importPoint.getPointName());
+            DaPointEntity existPoint = baseDao.selectByPointName(importPoint.getPointName());
             if (existPoint == null) {
                 DaPointEntity daPointEntity = ConvertUtils.sourceToTarget(importPoint, DaPointEntity.class);
                 daPointEntity.setId(UUID.randomUUID().toString());
@@ -444,7 +446,7 @@
 
             DaPointEntity updatePoint = BeanUtils.toBean(importPoint, DaPointEntity.class);
             updatePoint.setId(existPoint.getId());
-            baseMapper.updateById(updatePoint);
+            baseDao.updateById(updatePoint);
             DaMeasurePointEntity measurePoint = new DaMeasurePointEntity();
             measurePoint.setSourceType(importPoint.getSourceType());
             measurePoint.setSourceId(sourcesIdMap.get(importPoint.getSourceType()).get(importPoint.getSourceName()));

--
Gitblit v1.9.3