From afa8fc57084c423218c6816b710dfb2f0b87ea89 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 14 十一月 2024 15:55:48 +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/admin/ApiDataController.java | 287 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 205 insertions(+), 82 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java
index 125fedb..d5a4c21 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java
@@ -2,30 +2,46 @@
import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.framework.common.util.date.DateUtils;
+import com.iailab.framework.common.util.object.ConvertUtils;
+import com.iailab.framework.excel.core.util.ExcelUtils;
+import com.iailab.framework.tenant.core.context.TenantContextHolder;
+import com.iailab.module.data.api.dto.DeviceValueDTO;
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.api.dto.ApiPointValueQueryDTO;
-import com.iailab.module.data.point.collection.PointCollector;
+import com.iailab.module.data.api.ind.dto.ApiIndItemQueryDTO;
+import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
+import com.iailab.module.data.api.plan.PlanItemApi;
+import com.iailab.module.data.api.plan.dto.ApiPlanDataDTO;
+import com.iailab.module.data.api.point.DataPointApi;
+import com.iailab.module.data.api.point.dto.ApiPointValueDTO;
+import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
+import com.iailab.module.data.api.point.dto.ApiPointsValueQueryDTO;
+import com.iailab.module.data.common.ApiDataQueryDTO;
+import com.iailab.module.data.common.ApiDataValueDTO;
+import com.iailab.module.data.common.utils.ApiSecurityUtils;
+import com.iailab.module.data.ind.collection.IndItemCollector;
+import com.iailab.module.data.ind.item.vo.IndItemValueVO;
+import com.iailab.module.data.plan.item.entity.PlanItemEntity;
+import com.iailab.module.data.plan.item.service.PlanItemService;
+import com.iailab.module.data.plan.item.vo.PlanItemValueExportVO;
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.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 io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
-import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
@@ -38,7 +54,7 @@
*/
@Slf4j
@RestController
-@RequestMapping("/data/api/data")
+@RequestMapping("/data/api")
@Tag(name = "数据")
public class ApiDataController {
@@ -48,43 +64,27 @@
@Resource
private ApiSecurityUtils apiSecurityUtils;
- @Resource
- private DaPointValueService daPointValueService;
+ @Autowired
+ private DataPointApi dataPointApi;
- @Resource
- private InfluxDBService influxDBService;
+ @Autowired
+ private PlanItemApi planItemApi;
- @Resource
- private PointCollector pointCollector;
+ @Autowired
+ private IndItemCollector indItemCollector;
+
+ @Autowired
+ private PlanItemService planItemService;
@PermitAll
- @PostMapping("/point/history")
- @Operation(summary = "point历史数据")
- public CommonResult<Map<String, List<Map<String, Object>>>> pointHistory(@RequestBody ApiPointValueQueryDTO queryDto) {
+ @PostMapping("/query-points/history-value")
+ @Operation(summary = "查询多个测点历史值")
+ public CommonResult<Map<String, List<Map<String, Object>>>> queryPointsRealValue(HttpServletResponse response, HttpServletRequest
+ request, @RequestBody ApiPointsValueQueryDTO queryDto) {
+ Map<String, List<Map<String, Object>>> data = new HashMap<>();
try {
- Map<String, List<Map<String, Object>>> data = new HashMap<>();
- if (CollectionUtils.isEmpty(queryDto.getPointNos())) {
- return success(data);
- }
- if (queryDto.getStart() == null) {
- queryDto.setStart(new Date());
- }
- if (queryDto.getEnd() == null) {
- queryDto.setEnd(new Date());
- }
- Map<String, Object> params = new HashMap<>(1);
- params.put("pointNos", queryDto.getPointNos());
- List<DaPointDTO> pointList = daPointService.list(params);
- if (CollectionUtils.isEmpty(pointList)) {
- return success(data);
- }
- List<InfluxPointValuePOJO> influxParams = pointList.stream().map(item -> {
- InfluxPointValuePOJO pojo = new InfluxPointValuePOJO();
- pojo.setPoint(item.getPointNo());
- pojo.setType(item.getDataType());
- return pojo;
- }).collect(Collectors.toList());
- data = influxDBService.queryPointsValues(influxParams, queryDto.getStart(), queryDto.getEnd());
+ apiSecurityUtils.validate(request);
+ data = dataPointApi.queryPointsHistoryValue(queryDto);
return success(data);
} catch (Exception ex) {
@@ -92,29 +92,48 @@
}
}
- @PostMapping("/point/current")
- @Operation(summary = "point当前实时数据")
- public CommonResult<Map<String, Object>> pointCurrent(HttpServletResponse response, HttpServletRequest
- request, @RequestBody List<String> pointNos) {
+ @PermitAll
+ @PostMapping("/query-point/history-value")
+ @Operation(summary = "查询单个测点历史值")
+ public CommonResult<List<ApiPointValueDTO>> queryPointHistoryValue(HttpServletResponse response, HttpServletRequest
+ request, @RequestBody ApiPointValueQueryDTO queryDto) {
+ List<ApiPointValueDTO> pointValueList = new ArrayList<>();
try {
- // apiSecurityUtils.validate(request);
- Map<String, Object> data = pointCollector.getCurrentValue(pointNos);
+ apiSecurityUtils.validate(request);
+ pointValueList = dataPointApi.queryPointHistoryValue(queryDto);
+ return success(pointValueList);
+
+ } catch (Exception ex) {
+ return new CommonResult<List<ApiPointValueDTO>>().setMsg(ex.getMessage());
+ }
+ }
+
+ @PostMapping("/query-points/real-value")
+ @Operation(summary = "查询多个测点当前值")
+ public CommonResult<Map<String, Object>> queryPointsRealValue(HttpServletResponse response, HttpServletRequest
+ request, @RequestBody List<String> pointNos) {
+ Map<String, Object> data = new HashMap<>();
+ try {
+ apiSecurityUtils.validate(request);
+ data = dataPointApi.queryPointsRealValue(pointNos);
return success(data);
} catch (Exception ex) {
return new CommonResult<Map<String, Object>>().setMsg(ex.getMessage());
}
}
- @PostMapping("/point/chart")
- public CommonResult<BarLineDTO> pointChart(@RequestBody IndexQueryDTO dto) {
+ @PostMapping("/query-points/chart")
+ public CommonResult<BarLineDTO> queryPointsChart(HttpServletResponse response, HttpServletRequest
+ request, @RequestBody IndexQueryDTO dto) {
BarLineDTO CommonResult = new BarLineDTO();
try {
+ apiSecurityUtils.validate(request);
List<String> legend = new ArrayList<>();
List<SeriesItem> series = new ArrayList<>();
String endDateStr = dto.getEndDate() == null ? DateUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss") : DateUtils.format(dto.getEndDate(), "yyyy-MM-dd HH:mm:ss");
Date endDate = DateUtils.parse(endDateStr, "yyyy-MM-dd HH:mm");
Date startDate = dto.getStartDate() == null ? DateUtils.addDateHours(endDate, -2) : dto.getStartDate();
- List<String> categories = DateUtils.getTimeScale(startDate, endDate, dto.getGranularity() == null ? 10 : dto.getGranularity());
+ List<String> categories = DateUtils.getTimeScale(startDate, endDate, dto.getGranularity() == null ? 60 : dto.getGranularity());
if (CollectionUtils.isEmpty(dto.getCodes())) {
return new CommonResult<BarLineDTO>().setData(CommonResult);
}
@@ -126,13 +145,14 @@
legend.add(item.getPointName());
SeriesItem seriesItem = new SeriesItem();
seriesItem.setName(item.getPointName());
- InfluxPointValuePOJO pojo = new InfluxPointValuePOJO();
- pojo.setPoint(item.getPointNo());
- pojo.setType(item.getDataType());
- List<Map<String, Object>> list = influxDBService.queryPointValues(pojo, startDate, endDate);
+ ApiPointValueQueryDTO queryDto = new ApiPointValueQueryDTO();
+ queryDto.setStart(startDate);
+ queryDto.setEnd(endDate);
+ queryDto.setPointNo(item.getPointNo());
+ List<ApiPointValueDTO> list = dataPointApi.queryPointHistoryValue(queryDto);
List<Object[]> sData = list.stream().map(dataItem -> {
- Object[] valueArray = new Object[]{dataItem.get("time"),
- getFormatValue(item.getDataType(), dataItem.get("value"))};
+ Object[] valueArray = new Object[]{DateUtils.format(dataItem.getDataTime(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND),
+ getFormatValue(item.getDataType(), dataItem.getDataValue())};
return valueArray;
}).collect(Collectors.toList());
seriesItem.setData(sData);
@@ -160,31 +180,6 @@
}
- @PostMapping("/pointRelation/history")
- @Operation(summary = "pointRelation历史数据")
- 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 success(data);
- }
- if (queryDto.getStart() == null) {
- queryDto.setStart(new Date());
- }
- if (queryDto.getEnd() == null) {
- queryDto.setEnd(new Date());
- }
- data = daPointValueService.getHistoryList(queryDto);
- if (CollectionUtils.isEmpty(data)) {
- return success(data);
- }
- return success(data);
- } catch (Exception ex) {
- return new CommonResult<Map<String, List<Map<String, Object>>>>().setMsg(ex.getMessage());
- }
- }
-
@GetMapping("/device-value")
public List<DeviceValueDTO> getDeviceValue(@RequestParam Map<String, Object> params) {
List<DeviceValueDTO> CommonResult = new ArrayList<>();
@@ -192,7 +187,7 @@
return CommonResult;
}
List<String> pointNos = Arrays.asList(params.get("pointNos").toString().split(","));
- Map<String, Object> data = pointCollector.getCurrentValue(pointNos);
+ Map<String, Object> data = dataPointApi.queryPointsRealValue(pointNos);
if (!CollectionUtils.isEmpty(data)) {
data.forEach((k, v) -> {
DeviceValueDTO dto = new DeviceValueDTO();
@@ -203,4 +198,132 @@
}
return CommonResult;
}
+
+ @PermitAll
+ @PostMapping("/query-plan/history-value")
+ @Operation(summary = "查询单个计划历史值")
+ public CommonResult<List<ApiDataValueDTO>> queryPlanItemHistoryValue(HttpServletResponse response, HttpServletRequest
+ request, @RequestBody ApiDataQueryDTO dto) {
+ List<ApiDataValueDTO> result = new ArrayList<>();
+ try {
+ apiSecurityUtils.validate(request);
+ result = planItemApi.queryPlanItemHistoryValue(dto);
+ return new CommonResult<List<ApiDataValueDTO>>().setData(result);
+ } catch (Exception ex) {
+ return new CommonResult<List<ApiDataValueDTO>>().setMsg(ex.getMessage());
+ }
+ }
+
+ @PermitAll
+ @PostMapping("/query-plan/record-value")
+ @Operation(summary = "查询单个计划历史值")
+ public CommonResult<LinkedHashMap<String, List<ApiPlanDataDTO>>> queryPlanItemRecordValue(HttpServletResponse response, HttpServletRequest
+ request, @RequestBody ApiDataQueryDTO dto) {
+ LinkedHashMap<String, List<ApiPlanDataDTO>> result = new LinkedHashMap<>();
+ try {
+ apiSecurityUtils.validate(request);
+ result = planItemApi.queryPlanItemRecordValue(dto);
+ return new CommonResult<LinkedHashMap<String, List<ApiPlanDataDTO>>>().setData(result);
+ } catch (Exception ex) {
+ return new CommonResult<LinkedHashMap<String, List<ApiPlanDataDTO>>>().setMsg(ex.getMessage());
+ }
+ }
+
+ @PostMapping("/query-plans/chart")
+ public CommonResult<BarLineDTO> queryPlansChart(HttpServletResponse response, HttpServletRequest
+ request, @RequestBody ApiDataQueryDTO dto) {
+
+ BarLineDTO CommonResult = new BarLineDTO();
+
+ try {
+ apiSecurityUtils.validate(request);
+ List<String> legend = new ArrayList<>();
+ List<SeriesItem> series = new ArrayList<>();
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.MILLISECOND, 0);
+ calendar.set(Calendar.SECOND, 0);
+ Date endDate = dto.getEnd() == null ? DateUtils.addDateHours(calendar.getTime(), 2) : dto.getEnd();
+ Date startDate = dto.getStart() == null ? calendar.getTime() : dto.getStart();
+ List<String> categories = DateUtils.getTimeScale(startDate, endDate, dto.getGranularity() == null ? 60 : dto.getGranularity());
+ if (CollectionUtils.isEmpty(dto.getItemNos())) {
+ return new CommonResult<BarLineDTO>().setData(CommonResult);
+ }
+ List<PlanItemEntity> planItemList = new ArrayList<>();
+ dto.getItemNos().forEach(item -> {
+ planItemList.add(planItemService.getInfoByNo(item));
+ });
+ planItemList.forEach(item -> {
+ legend.add(item.getItemName());
+ SeriesItem seriesItem = new SeriesItem();
+ seriesItem.setName(item.getItemName());
+ ApiDataQueryDTO queryDto = new ApiDataQueryDTO();
+ queryDto.setItemNo(item.getItemNo());
+ queryDto.setStart(startDate);
+ queryDto.setEnd(endDate);
+ List<ApiDataValueDTO> list = planItemApi.queryPlanItemHistoryValue(queryDto);
+
+ List<Object[]> sData = list.stream().map(dataItem -> {
+ Object[] valueArray = new Object[]{DateUtils.format(dataItem.getDataTime(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND),
+ dataItem.getDataValue()};
+ return valueArray;
+ }).collect(Collectors.toList());
+ seriesItem.setData(sData);
+ series.add(seriesItem);
+ });
+ CommonResult.setLegend(legend);
+ CommonResult.setCategories(categories);
+ CommonResult.setSeries(series);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ return new CommonResult<BarLineDTO>().setData(CommonResult);
+ }
+
+ @PostMapping("/export-plan/history-value")
+ @Operation(summary = "导出计划数据")
+ public void exportPlanHistoryValue(HttpServletResponse response, HttpServletRequest
+ request, @RequestBody ApiDataQueryDTO dto) throws IOException {
+ //apiSecurityUtils.validate(request);
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.MILLISECOND, 0);
+ calendar.set(Calendar.SECOND, 0);
+ Date endDate = dto.getEnd() == null ? DateUtils.addDateHours(calendar.getTime(), 2) : dto.getEnd();
+ Date startDate = dto.getStart() == null ? calendar.getTime() : dto.getStart();
+ ApiDataQueryDTO queryDto = new ApiDataQueryDTO();
+ queryDto.setItemNo(dto.getItemNo());
+ queryDto.setStart(startDate);
+ queryDto.setEnd(endDate);
+ List<ApiDataValueDTO> list = planItemApi.queryPlanItemHistoryValue(queryDto);
+ List<PlanItemValueExportVO> exportList = list.stream().map(item -> {
+ PlanItemValueExportVO exportVO = new PlanItemValueExportVO();
+ exportVO.setDataTime(DateUtils.format(item.getDataTime(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ exportVO.setDataValue(BigDecimal.valueOf(item.getDataValue()).setScale(0, RoundingMode.HALF_UP).toString());
+ return exportVO;
+ }).collect(Collectors.toList());
+ ExcelUtils.write(response, "计划数据.xls", "计划数据", PlanItemValueExportVO.class, exportList);
+ }
+
+ @PermitAll
+ @GetMapping("/query-ind/default-value")
+ @Operation(summary = "查询指标默认值")
+ public CommonResult<List<ApiIndItemValueDTO>> queryIndItemDefaultValue(@RequestParam String itemNo) {
+ TenantContextHolder.setTenantId(161L);
+ List<IndItemValueVO> list = indItemCollector.queryValue(itemNo);
+ List<ApiIndItemValueDTO> dtoList = new ArrayList<>();
+ list.forEach(item -> {
+ ApiIndItemValueDTO dto = new ApiIndItemValueDTO();
+ dto.setDataTime(item.getDataTime());
+ dto.setDataValue(item.getDataValue().doubleValue());
+ dtoList.add(dto);
+ });
+ return success(dtoList);
+ }
+
+ @PermitAll
+ @GetMapping("/query-ind/history-value")
+ @Operation(summary = "查询指标历史值")
+ public CommonResult<List<ApiIndItemValueDTO>> queryIndItemHistoryValue(@RequestParam ApiIndItemQueryDTO dto) {
+ List<IndItemValueVO> list = indItemCollector.queryValue(dto.getItemNo(), dto.getStart(), dto.getEnd());
+ return success(ConvertUtils.sourceToTarget(list, ApiIndItemValueDTO.class));
+ }
}
--
Gitblit v1.9.3