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()));