From 47ecac334ac27d99de2a3a69b3f4bc654298ee1f Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期三, 28 五月 2025 17:30:10 +0800
Subject: [PATCH] 调度建议快照
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotRecordController.java | 52 ++++++++++++++++++++++------------------------------
1 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotRecordController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotRecordController.java
index 41c8f7f..1be57c0 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotRecordController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotRecordController.java
@@ -64,7 +64,7 @@
@PostMapping("/getChartData")
public CommonResult<List<StSuggestSnapshotRecordRespVO>> getChartData(@RequestBody List<StSuggestSnapshotRecordRespVO> reqList){
reqList.forEach(item -> {
- List<Object[][]> dataList = new ArrayList<>();
+ List<Object[]> dataList = new ArrayList<>();
if(DataCategoryEnum.DATAPOINT.getCode().equals(item.getDataType())){
ApiPointValueQueryDTO queryDTO = new ApiPointValueQueryDTO();
queryDTO.setPointNo(item.getDataNo());
@@ -72,12 +72,12 @@
queryDTO.setEnd(item.getEndTime());
List<ApiPointValueDTO> valueList = dataPointApi.queryPointHistoryValue(queryDTO);
if (valueList != null && !valueList.isEmpty()){
- Object [][] data = new Object[valueList.size()][2];
- for (int i = 0; i < valueList.size(); i++){
- data[i][0] = DateUtils.format(new Date(String.valueOf(valueList.get(i).getT())),DATE_TIME_PATTERN);
- data[i][1] = valueList.get(i).getV();
+ for (ApiPointValueDTO apiPointValueDTO : valueList) {
+ Object[] data = new Object[2];
+ data[0] = DateUtils.format(new Date(String.valueOf(apiPointValueDTO.getT())), DATE_TIME_PATTERN);
+ data[1] = apiPointValueDTO.getV();
+ dataList.add(data);
}
- dataList.add(data);
}
} else if (DataCategoryEnum.IND.getCode().equals(item.getDataType())) {
ApiIndItemQueryDTO queryDTO = new ApiIndItemQueryDTO();
@@ -86,12 +86,12 @@
queryDTO.setEnd(item.getEndTime());
List<ApiIndItemValueDTO> valueList = indItemApi.queryIndItemHistoryValue(queryDTO);
if (valueList != null && !valueList.isEmpty()){
- Object [][] data = new Object[valueList.size()][2];
- for (int i = 0; i < valueList.size(); i++){
- data[i][0] = DateUtils.format(new Date(valueList.get(i).getDataTime()),DATE_TIME_PATTERN);
- data[i][1] = valueList.get(i).getDataValue();
+ for (ApiIndItemValueDTO apiIndItemValueDTO : valueList) {
+ Object[] data = new Object[2];
+ data[0] = DateUtils.format(new Date(apiIndItemValueDTO.getDataTime()), DATE_TIME_PATTERN);
+ data[1] = apiIndItemValueDTO.getDataValue();
+ dataList.add(data);
}
- dataList.add(data);
}
} else if (DataCategoryEnum.PLAN.getCode().equals(item.getDataType())) {
ApiDataQueryDTO queryDTO = new ApiDataQueryDTO();
@@ -100,12 +100,12 @@
queryDTO.setEnd(item.getEndTime());
List<ApiDataValueDTO> valueList = planItemApi.queryPlanItemHistoryValue(queryDTO);
if (valueList != null && !valueList.isEmpty()){
- Object [][] data = new Object[valueList.size()][2];
- for (int i = 0; i < valueList.size(); i++){
- data[i][0] = DateUtils.format(valueList.get(i).getDataTime(),DATE_TIME_PATTERN);
- data[i][1] = valueList.get(i).getDataValue();
+ for (ApiDataValueDTO apiDataValueDTO : valueList) {
+ Object[] data = new Object[2];
+ data[0] = DateUtils.format(apiDataValueDTO.getDataTime(), DATE_TIME_PATTERN);
+ data[1] = apiDataValueDTO.getDataValue();
+ dataList.add(data);
}
- dataList.add(data);
}
} else if (DataCategoryEnum.PREDICT_ITEM_N.getCode().equals(item.getDataType())) {
dataList = getPreDataList(item, "N");
@@ -119,8 +119,8 @@
});
return success(reqList);
}
- private List<Object[][]> getPreDataList(StSuggestSnapshotRecordRespVO resVo, String type){
- List<Object[][]> dataList = new ArrayList<>();
+ private List<Object[]> getPreDataList(StSuggestSnapshotRecordRespVO resVo, String type){
+ List<Object[]> dataList = new ArrayList<>();
PreDataBarLineReqVO reqVO = new PreDataBarLineReqVO();
List<String> outIds = new ArrayList<>();
outIds.add(resVo.getDataNo());
@@ -128,23 +128,15 @@
reqVO.setStartTime(resVo.getStartTime());
reqVO.setEndTime(resVo.getEndTime());
PreDataBarLineRespVO result = mcsApi.getPreDataCharts(reqVO);
- if (result == null || result.getDataViewList() == null || result.getDataViewList().size() == 0){
+ if (result == null || result.getDataViewList() == null || result.getDataViewList().isEmpty()){
return dataList;
}
- List<String> xData = result.getCategories();
- List<Object[]> yData = new ArrayList<>();
if ("N".equals(type) && result.getDataViewList().get(0).getPreDataN()!=null){
- yData = result.getDataViewList().get(0).getPreDataN();
+ dataList = result.getDataViewList().get(0).getPreDataN();
}else if ("L".equals(type) && result.getDataViewList().get(0).getPreDataL()!=null){
- yData = result.getDataViewList().get(0).getPreDataL();
+ dataList = result.getDataViewList().get(0).getPreDataL();
}else if ("C".equals(type) && result.getDataViewList().get(0).getCurData()!=null){
- yData = result.getDataViewList().get(0).getCurData();
- }
- Object [][] data = new Object[xData.size()][1];
- for (int i = 0; i < xData.size(); i++){
- data[i][0] = xData.get(i);
- data[i][1] = yData.get(i);
- dataList.add(data);
+ dataList = result.getDataViewList().get(0).getCurData();
}
return dataList;
}
--
Gitblit v1.9.3