From bc8a34add41098d482224b5b549d624a5b7f9011 Mon Sep 17 00:00:00 2001 From: dengzedong <dengzedong@email> Date: 星期四, 08 五月 2025 17:06:38 +0800 Subject: [PATCH] ArcDataApi 测点新增 平滑尺度 值类型 为空的bug --- iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/ind/ArcDataApi.xml | 0 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java | 2 +- iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/arc/ArcDataApiImpl.java | 3 +-- iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/arc/ArcDataApi.java | 3 +-- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/arc/arcDataApi.java b/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/arc/ArcDataApi.java similarity index 92% rename from iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/arc/arcDataApi.java rename to iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/arc/ArcDataApi.java index 8811b2c..2db7772 100644 --- a/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/arc/arcDataApi.java +++ b/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/arc/ArcDataApi.java @@ -2,7 +2,6 @@ import com.iailab.module.data.api.arc.dto.ApiArcDataDTO; import com.iailab.module.data.api.arc.dto.ApiArcValueQueryDTO; -import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO; import com.iailab.module.data.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -21,7 +20,7 @@ **/ @FeignClient(name = ApiConstants.NAME) @Tag(name = "归档数据") -public interface arcDataApi { +public interface ArcDataApi { String PREFIX = ApiConstants.PREFIX + "/arc"; diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/arc/ArcDataApiImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/arc/ArcDataApiImpl.java index 63d0fad..0e2325a 100644 --- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/arc/ArcDataApiImpl.java +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/arc/ArcDataApiImpl.java @@ -2,7 +2,6 @@ import com.iailab.module.data.api.arc.dto.ApiArcDataDTO; import com.iailab.module.data.api.arc.dto.ApiArcValueQueryDTO; -import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO; import com.iailab.module.data.arc.service.ArcDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -17,7 +16,7 @@ **/ @RestController // 提供 RESTful API 接口,给 Feign 调用 @Validated -public class ArcDataApiImpl implements arcDataApi { +public class ArcDataApiImpl implements ArcDataApi { @Autowired private ArcDataService arcDataService; 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 48dcf01..96220b7 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 @@ -164,7 +164,7 @@ daPointEntity.setId(UUID.randomUUID().toString()); switch (PointTypeEnum.getEumByCode(dataPoint.getPointType())) { case MEASURE_POINT: - DaMeasurePointDTO measurePoint = new DaMeasurePointDTO(); + DaMeasurePointDTO measurePoint = dataPoint.getMeasurePoint(); measurePoint.setSourceType(dataPoint.getSourceOption().get(0)); measurePoint.setSourceId(dataPoint.getSourceOption().get(1)); measurePoint.setTagNo(dataPoint.getSourceOption().get(2)); diff --git a/iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/ind/IndItemDao.xml b/iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/ind/ArcDataApi.xml similarity index 100% rename from iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/ind/IndItemDao.xml rename to iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/ind/ArcDataApi.xml -- Gitblit v1.9.3