From c7f70933adf89a163d0049c907492a6df60cb45f Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期二, 27 八月 2024 17:29:14 +0800
Subject: [PATCH] http modbus data服务代码升级
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/DataController.java | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 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 01273df..b2da9e3 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,6 +5,8 @@
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;
@@ -30,6 +32,9 @@
import java.math.BigDecimal;
import java.util.*;
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
@@ -62,13 +67,13 @@
@PostMapping("/point/history")
@Operation(summary = "point历史数据")
- public R pointHistory(HttpServletResponse response, HttpServletRequest
+ public CommonResult<Map<String, List<Map<String, Object>>>> pointHistory(HttpServletResponse response, HttpServletRequest
request, @RequestBody ApiPointValueQueryDTO queryDto) {
try {
apiSecurityUtils.validate(request);
Map<String, List<Map<String, Object>>> data = new HashMap<>();
if (CollectionUtils.isEmpty(queryDto.getPointNos())) {
- return R.ok().put("data", data);
+ return success(data);
}
if (queryDto.getStart() == null) {
queryDto.setStart(new Date());
@@ -80,7 +85,7 @@
params.put("pointNos", queryDto.getPointNos());
List<DaPointDTO> pointList = daPointService.list(params);
if (CollectionUtils.isEmpty(pointList)) {
- return R.ok().put("data", data);
+ return success(data);
}
List<InfluxPointValuePOJO> influxParams = pointList.stream().map(item -> {
InfluxPointValuePOJO pojo = new InfluxPointValuePOJO();
@@ -89,23 +94,23 @@
return pojo;
}).collect(Collectors.toList());
data = influxDBService.queryPointsValues(influxParams, queryDto.getStart(), queryDto.getEnd());
- return R.ok().put("data", data);
+ return success(data);
} catch (Exception ex) {
- return R.error(ex.getMessage());
+ return new CommonResult<Map<String, List<Map<String, Object>>>>().setMsg(ex.getMessage());
}
}
@PostMapping("/point/current")
@Operation(summary = "point当前实时数据")
- public R pointCurrent(HttpServletResponse response, HttpServletRequest
+ public CommonResult<Map<String, Object>> pointCurrent(HttpServletResponse response, HttpServletRequest
request, @RequestBody List<String> pointNos) {
try {
// apiSecurityUtils.validate(request);
Map<String, Object> data = pointCollector.getCurrentValue(pointNos);
- return R.ok().put("data", data);
+ return success(data);
} catch (Exception ex) {
- return R.error(ex.getMessage());
+ return new CommonResult<Map<String, Object>>().setMsg(ex.getMessage());
}
}
@@ -166,12 +171,12 @@
@PostMapping("/pointRelation/history")
@Operation(summary = "pointRelation历史数据")
- public R pointRelationHistory(HttpServletResponse response, HttpServletRequest
+ public CommonResult<Map<String, List<Map<String, Object>>>> pointRelationHistory(HttpServletResponse response, HttpServletRequest
request, @RequestBody ApiPointValueQueryDTO queryDto) {
try {
Map<String, List<Map<String, Object>>> data = new HashMap<>();
if (CollectionUtils.isEmpty(queryDto.getPointNos())) {
- return R.ok().put("data", data);
+ return success(data);
}
if (queryDto.getStart() == null) {
queryDto.setStart(new Date());
@@ -181,11 +186,11 @@
}
data = daPointValueService.getHistoryList(queryDto);
if (CollectionUtils.isEmpty(data)) {
- return R.ok().put("data", data);
+ return success(data);
}
- return R.ok().put("data", data);
+ return success(data);
} catch (Exception ex) {
- return R.error(ex.getMessage());
+ return new CommonResult<Map<String, List<Map<String, Object>>>>().setMsg(ex.getMessage());
}
}
@@ -210,20 +215,20 @@
@PostMapping("/ind-item/values")
@Operation(summary = "point当前实时数据")
- public R indItemValues(HttpServletResponse response, HttpServletRequest
+ 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 R.ok().put("data", data);
+ return success(data);
} catch (Exception ex) {
- return R.error(ex.getMessage());
+ return new CommonResult<Map<String, List<IndItemValueDTO>>>().setMsg(ex.getMessage());
}
}
@PostMapping("/ind-item/current-value")
@Operation(summary = "point当前实时数据")
- public R indItemCurrentValue(HttpServletResponse response, HttpServletRequest
+ public CommonResult<Map<String, BigDecimal>> indItemCurrentValue(HttpServletResponse response, HttpServletRequest
request, @RequestBody List<String> itemNos) {
try {
Map<String, BigDecimal> data = new HashMap<>();
@@ -232,9 +237,9 @@
dataList.forEach((k, v) -> {
data.put(k, CollectionUtils.isEmpty(v) ? null : v.get(0).getDataValue());
});
- return R.ok().put("data", data);
+ return success(data);
} catch (Exception ex) {
- return R.error(ex.getMessage());
+ return new CommonResult<Map<String, BigDecimal>>().setMsg(ex.getMessage());
}
}
}
--
Gitblit v1.9.3