From 27ced365924b88c8656136516b00d9bc3b628e73 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期一, 13 一月 2025 14:58:19 +0800
Subject: [PATCH] 1、增加ImageDao.xml文件 2、增加JmDragExternalServiceImpl.java文件
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java
index dd9b84a..a8d9f0c 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java
@@ -38,7 +38,16 @@
@Override
public ApiPointDTO getInfoById(String pointId) {
- return ConvertUtils.sourceToTarget(daPointService.getSimpleInfoById(pointId), ApiPointDTO.class);
+ return daPointService.getSimpleInfoById(pointId);
+ }
+
+ @Override
+ public List<ApiPointDTO> getInfoByIds(Set<String> pointIds) {
+ List<ApiPointDTO> result = new ArrayList<>(pointIds.size());
+ for (String pointId : pointIds) {
+ result.add(daPointService.getSimpleInfoById(pointId));
+ }
+ return result;
}
@Override
@@ -54,12 +63,16 @@
@Override
public Map<String, List<Map<String, Object>>> queryPointsHistoryValue(ApiPointsValueQueryDTO queryDto) {
Map<String, List<Map<String, Object>>> data = new HashMap<>();
- if (queryDto.getStart() == null) {
- queryDto.setStart(new Date());
- }
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.MILLISECOND, 0);
if (queryDto.getEnd() == null) {
- queryDto.setEnd(new Date());
+ queryDto.setEnd(calendar.getTime());
}
+ if (queryDto.getStart() == null) {
+ calendar.add(Calendar.HOUR_OF_DAY, -1);
+ queryDto.setStart(calendar.getTime());
+ }
+
Map<String, Object> params = new HashMap<>(1);
params.put("pointNos", queryDto.getPointNos());
List<DaPointDTO> pointList = daPointService.list(params);
@@ -84,6 +97,15 @@
pojo.setType(daPointDTO.getDataType());
Date startTime = queryDto.getStart();
Date endTime = queryDto.getEnd();
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.MILLISECOND, 0);
+ if (endTime == null) {
+ endTime = calendar.getTime();
+ }
+ if (startTime == null) {
+ calendar.add(Calendar.HOUR_OF_DAY, -1);
+ startTime = calendar.getTime();
+ }
List<Map<String, Object>> list = influxDBService.queryPointValues(pojo, startTime, endTime);
List<ApiPointValueDTO> pointValueList = new ArrayList<>();
for (int i = 0; list.size() - i >= 1; i++) {
@@ -104,6 +126,7 @@
pointCollector.setValue(wr);
return true;
} catch (Exception ex) {
+ ex.printStackTrace();
return false;
}
}
--
Gitblit v1.9.3