From 19ef4ca4f7252c34fe2e2a03b8868fc997ddd86f Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期五, 13 九月 2024 08:37:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/DataController.java | 39 ---------------------------------------
1 files changed, 0 insertions(+), 39 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/DataController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/DataController.java
index b2da9e3..bc0bdf7 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/DataController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/DataController.java
@@ -5,21 +5,16 @@
import com.iailab.module.data.api.dto.IndexQueryDTO;
import com.iailab.module.data.api.dto.echarts.BarLineDTO;
import com.iailab.module.data.api.dto.echarts.SeriesItem;
-import com.iailab.module.data.channel.kio.entity.ChannelKioDeviceEntity;
-import com.iailab.module.data.common.utils.Constant;
-import com.iailab.module.data.common.utils.R;
import com.iailab.module.data.api.dto.ApiPointValueQueryDTO;
import com.iailab.module.data.point.collection.PointCollector;
import com.iailab.module.data.point.common.PointDataTypeEnum;
import com.iailab.module.data.point.dto.DaPointDTO;
import com.iailab.module.data.point.service.DaPointService;
import com.iailab.module.data.point.service.DaPointValueService;
-import com.iailab.module.data.ind.collection.IndItemCollector;
import com.iailab.module.data.influxdb.pojo.InfluxPointValuePOJO;
import com.iailab.module.data.influxdb.service.InfluxDBService;
import com.iailab.module.data.api.dto.DeviceValueDTO;
import com.iailab.module.data.api.utils.ApiSecurityUtils;
-import com.iailab.module.data.ind.dto.IndItemValueDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
@@ -34,7 +29,6 @@
import java.util.stream.Collectors;
import static com.iailab.framework.common.pojo.CommonResult.success;
-import static com.iailab.framework.common.pojo.CommonResult.error;
/**
* @author PanZhibao
@@ -61,9 +55,6 @@
@Resource
private PointCollector pointCollector;
-
- @Resource
- private IndItemCollector indItemCollector;
@PostMapping("/point/history")
@Operation(summary = "point历史数据")
@@ -211,35 +202,5 @@
});
}
return CommonResult;
- }
-
- @PostMapping("/ind-item/values")
- @Operation(summary = "point当前实时数据")
- public CommonResult<Map<String, List<IndItemValueDTO>>> indItemValues(HttpServletResponse response, HttpServletRequest
- request, @RequestBody List<String> itemNos) {
- try {
- // apiSecurityUtils.validate(request);
- Map<String, List<IndItemValueDTO>> data = indItemCollector.getValueList(itemNos);
- return success(data);
- } catch (Exception ex) {
- return new CommonResult<Map<String, List<IndItemValueDTO>>>().setMsg(ex.getMessage());
- }
- }
-
- @PostMapping("/ind-item/current-value")
- @Operation(summary = "point当前实时数据")
- public CommonResult<Map<String, BigDecimal>> indItemCurrentValue(HttpServletResponse response, HttpServletRequest
- request, @RequestBody List<String> itemNos) {
- try {
- Map<String, BigDecimal> data = new HashMap<>();
- // apiSecurityUtils.validate(request);
- Map<String, List<IndItemValueDTO>> dataList = indItemCollector.getValueList(itemNos);
- dataList.forEach((k, v) -> {
- data.put(k, CollectionUtils.isEmpty(v) ? null : v.get(0).getDataValue());
- });
- return success(data);
- } catch (Exception ex) {
- return new CommonResult<Map<String, BigDecimal>>().setMsg(ex.getMessage());
- }
}
}
--
Gitblit v1.9.3