From f5ec1f3326f75e18222859a534ed5a249f5e2cc3 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期三, 04 六月 2025 17:35:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotRecordController.java | 118 ++++-------------------------------------------------------
1 files changed, 8 insertions(+), 110 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 1be57c0..8526a83 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
@@ -1,35 +1,16 @@
package com.iailab.module.model.mcs.sche.controller.admin;
import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.module.data.api.ind.IndItemApi;
-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.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.common.ApiDataQueryDTO;
-import com.iailab.module.data.common.ApiDataValueDTO;
-import com.iailab.module.model.api.mcs.McsApi;
-import com.iailab.module.model.api.mcs.dto.PreDataBarLineReqVO;
-import com.iailab.module.model.api.mcs.dto.PreDataBarLineRespVO;
-import com.iailab.module.model.common.enums.DataCategoryEnum;
-import com.iailab.module.model.common.utils.DateUtils;
import com.iailab.module.model.mcs.sche.service.StSuggestSnapshotRecordService;
-import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotRecordRespVO;
-import com.mysql.cj.util.TimeUtil;
+import com.iailab.module.model.api.mcs.dto.StSuggestSnapshotRecordRespVO;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.text.DateFormat;
-import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import static com.iailab.framework.common.pojo.CommonResult.success;
-import static com.iailab.module.model.common.utils.DateUtils.DATE_TIME_PATTERN;
/**
* @author Jay
@@ -42,102 +23,19 @@
@Autowired
private StSuggestSnapshotRecordService stSuggestSnapshotRecordService;
- @Autowired
- private DataPointApi dataPointApi;
-
- @Autowired
- private IndItemApi indItemApi;
-
- @Autowired
- private PlanItemApi planItemApi;
-
- @Autowired
- private McsApi mcsApi;
-
-
@GetMapping("/list")
@Parameter(name = "operationId", description = "操作id", required = true, example = "1024")
- public CommonResult<List<StSuggestSnapshotRecordRespVO>> getListByOperationId(@RequestParam("operationId") String operationId) {
- return success(stSuggestSnapshotRecordService.getListByOperationId(operationId));
+ public CommonResult<List<StSuggestSnapshotRecordRespVO>> getListByOperationId(@RequestParam("suggestId") String suggestId) {
+ return success(stSuggestSnapshotRecordService.getListBySuggestId(suggestId));
}
@PostMapping("/getChartData")
public CommonResult<List<StSuggestSnapshotRecordRespVO>> getChartData(@RequestBody List<StSuggestSnapshotRecordRespVO> reqList){
- reqList.forEach(item -> {
- List<Object[]> dataList = new ArrayList<>();
- if(DataCategoryEnum.DATAPOINT.getCode().equals(item.getDataType())){
- ApiPointValueQueryDTO queryDTO = new ApiPointValueQueryDTO();
- queryDTO.setPointNo(item.getDataNo());
- queryDTO.setStart(item.getStartTime());
- queryDTO.setEnd(item.getEndTime());
- List<ApiPointValueDTO> valueList = dataPointApi.queryPointHistoryValue(queryDTO);
- if (valueList != null && !valueList.isEmpty()){
- 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);
- }
- }
- } else if (DataCategoryEnum.IND.getCode().equals(item.getDataType())) {
- ApiIndItemQueryDTO queryDTO = new ApiIndItemQueryDTO();
- queryDTO.setItemNo(item.getDataNo());
- queryDTO.setStart(item.getStartTime());
- queryDTO.setEnd(item.getEndTime());
- List<ApiIndItemValueDTO> valueList = indItemApi.queryIndItemHistoryValue(queryDTO);
- if (valueList != null && !valueList.isEmpty()){
- 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);
- }
- }
- } else if (DataCategoryEnum.PLAN.getCode().equals(item.getDataType())) {
- ApiDataQueryDTO queryDTO = new ApiDataQueryDTO();
- queryDTO.setItemNo(item.getDataNo());
- queryDTO.setStart(item.getStartTime());
- queryDTO.setEnd(item.getEndTime());
- List<ApiDataValueDTO> valueList = planItemApi.queryPlanItemHistoryValue(queryDTO);
- if (valueList != null && !valueList.isEmpty()){
- 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);
- }
- }
- } else if (DataCategoryEnum.PREDICT_ITEM_N.getCode().equals(item.getDataType())) {
- dataList = getPreDataList(item, "N");
- }else if (DataCategoryEnum.PREDICT_ITEM_L.getCode().equals(item.getDataType())) {
- dataList = getPreDataList(item, "L");
- }else if (DataCategoryEnum.PREDICT_ITEM_C.getCode().equals(item.getDataType())) {
- dataList = getPreDataList(item, "C");
- }
- item.setDataList(dataList);
-
- });
- return success(reqList);
+ return success(stSuggestSnapshotRecordService.getChartData(reqList));
}
- 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());
- reqVO.setOutIds(outIds);
- reqVO.setStartTime(resVo.getStartTime());
- reqVO.setEndTime(resVo.getEndTime());
- PreDataBarLineRespVO result = mcsApi.getPreDataCharts(reqVO);
- if (result == null || result.getDataViewList() == null || result.getDataViewList().isEmpty()){
- return dataList;
- }
- if ("N".equals(type) && result.getDataViewList().get(0).getPreDataN()!=null){
- dataList = result.getDataViewList().get(0).getPreDataN();
- }else if ("L".equals(type) && result.getDataViewList().get(0).getPreDataL()!=null){
- dataList = result.getDataViewList().get(0).getPreDataL();
- }else if ("C".equals(type) && result.getDataViewList().get(0).getCurData()!=null){
- dataList = result.getDataViewList().get(0).getCurData();
- }
- return dataList;
+
+ @GetMapping("/getAllChartData")
+ public CommonResult<List<StSuggestSnapshotRecordRespVO>> getAllChartData(@RequestParam("suggestId") String suggestId){
+ return success(stSuggestSnapshotRecordService.getAllChartData(suggestId));
}
}
--
Gitblit v1.9.3