From 72cbef110ad59f3601d9db958f178847d2fc15dd Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 12 五月 2025 14:52:17 +0800
Subject: [PATCH] 最大需量发生记录分页
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java | 71 +++++++++++++++++++++++++++--------
1 files changed, 54 insertions(+), 17 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
index ae19b06..3a13312 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
@@ -3,16 +3,17 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.module.ansteel.api.dao.*;
+import com.iailab.module.ansteel.api.dao.MainProcessIndexDayDao;
+import com.iailab.module.ansteel.api.dao.MainProcessIndexTeamDao;
import com.iailab.module.ansteel.api.dto.*;
+import com.iailab.module.ansteel.api.service.DataService;
+import com.iailab.module.ansteel.common.constant.CommonConstant;
import com.iailab.module.ansteel.common.enums.ProcessConfDataTypeEnum;
import com.iailab.module.ansteel.power.dao.*;
import com.iailab.module.ansteel.power.entity.PowerCapacitorStatusEntity;
import com.iailab.module.ansteel.power.entity.PowerControlDetEntity;
import com.iailab.module.ansteel.power.entity.PowerControlMainEntity;
import com.iailab.module.ansteel.power.entity.PowerNetFactorEntity;
-import com.iailab.module.ansteel.api.service.DataService;
-import com.iailab.module.ansteel.common.constant.CommonConstant;
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;
@@ -32,9 +33,8 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
-
-import static com.iailab.framework.common.pojo.CommonResult.success;
@Slf4j
@Service
@@ -113,9 +113,9 @@
@Override
public List<MainProcessIndexDTO> getIndexList(Map<String, Object> params) {
List<MainProcessIndexDTO> list = new ArrayList<>();
- if("day".equals(params.get("type"))) {
+ if ("day".equals(params.get("type"))) {
list = ConvertUtils.sourceToTarget(mainProcessIndexDayDao.selectList(new QueryWrapper<>()), MainProcessIndexDTO.class);
- }else if("team".equals(params.get("type"))){
+ } else if ("team".equals(params.get("type"))) {
list = ConvertUtils.sourceToTarget(mainProcessIndexTeamDao.selectList(new QueryWrapper<>()), MainProcessIndexDTO.class);
}
if (!CollectionUtils.isEmpty(list)) {
@@ -180,6 +180,7 @@
int lengthRight = tMap.get(CommonConstant.LENGTH_RIGHT) == null ? predictItem.getPredictLength() : new BigDecimal(tMap.get(CommonConstant.LENGTH_RIGHT)).intValue();
String trendsDataH = tMap.get(CommonConstant.TRENDSDATA_H) == null ? null : tMap.get(CommonConstant.TRENDSDATA_H);
String trendsDataL = tMap.get(CommonConstant.TRENDSDATA_L) == null ? null : tMap.get(CommonConstant.TRENDSDATA_L);
+ String culIndex = tMap.get(CommonConstant.CUL_INDEX) == null ? null : tMap.get(CommonConstant.CUL_INDEX);//累计量
Date[] timeArray = calResultTime(predictItem, reqVO.getStartTime(), reqVO.getEndTime(), lengthLeft, lengthRight);
Date startTime = timeArray[1];
@@ -188,9 +189,12 @@
PreDataSingleChartRespVO resultOld = mcsApi.getPreDataSingleChart(reqVO);
PreDataChartRespVO result = ConvertUtils.sourceToTarget(resultOld, PreDataChartRespVO.class);
PreDataViewDTO preDataView = ConvertUtils.sourceToTarget(resultOld.getDataView(), PreDataViewDTO.class);
- if(trendsDataH != null) {
+ if (StringUtils.isNotBlank(trendsDataH)) {
+ // 动态上限
ApiPointValueQueryDTO pointValueQueryDTO = new ApiPointValueQueryDTO();
pointValueQueryDTO.setPointNo(trendsDataH);
+ pointValueQueryDTO.setStart(startTime);
+ pointValueQueryDTO.setEnd(endTime);
List<ApiPointValueDTO> trendsDataHList = ConvertUtils.sourceToTarget(dataPointApi.queryPointHistoryValue(pointValueQueryDTO), ApiPointValueDTO.class);
List<Object[]> newList = new ArrayList<>();
trendsDataHList.forEach(item -> {
@@ -201,9 +205,12 @@
});
preDataView.setTrendsDataH(newList);
}
- if(trendsDataL != null) {
+ if (StringUtils.isNotBlank(trendsDataL)) {
+ // 动态下限
ApiPointValueQueryDTO pointValueQueryDTO = new ApiPointValueQueryDTO();
pointValueQueryDTO.setPointNo(trendsDataL);
+ pointValueQueryDTO.setStart(startTime);
+ pointValueQueryDTO.setEnd(endTime);
List<ApiPointValueDTO> trendsDataLList = ConvertUtils.sourceToTarget(dataPointApi.queryPointHistoryValue(pointValueQueryDTO), ApiPointValueDTO.class);
List<Object[]> newList = new ArrayList<>();
trendsDataLList.forEach(item -> {
@@ -215,8 +222,20 @@
preDataView.setTrendsDataL(newList);
}
+ List<Object[]> culData = new ArrayList<>();
+ double leiji = 0;
+ if (StringUtils.isNotBlank(culIndex) && !CollectionUtils.isEmpty(preDataView.getCurData())) {
+ for(int i = 0; i < preDataView.getCurData().size(); i++) {
+ Object[] item = preDataView.getCurData().get(i);
+ Object[] dataItem = new Object[2];
+ dataItem[0] = item[0];
+ leiji = leiji + new BigDecimal(item[1].toString()).doubleValue();
+ dataItem[1] = new BigDecimal(leiji).divide(new BigDecimal(60), 2, BigDecimal.ROUND_HALF_UP) ;
+ culData.add(dataItem);
+ }
+ }
+ preDataView.setCulData(culData);
preDataView.setPreData(resultOld.getDataView().getPreDataL());
-
result.setPreDataView(preDataView);
return result;
}
@@ -252,7 +271,7 @@
}
/**
- * 查询原始计划、修正计划数据
+ * 查询原始计划、修正计划数据
*/
@Override
public Map<String, Object> getPlanDataChart(PlanDataChartReqVO reqVO) {
@@ -284,6 +303,9 @@
}
result.put("planData", planData);
result.put("predData", predData);
+ result.put("predictTime", DateUtils.format(predictTime, "yyyy-MM-dd HH:mm:00"));
+ result.put("startTime", DateUtils.format(startTime, "yyyy-MM-dd HH:mm:00"));
+ result.put("endTime", DateUtils.format(endTime, "yyyy-MM-dd HH:mm:00"));
return result;
}
@@ -393,16 +415,16 @@
Date endTime = null;
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.MILLISECOND, 0);
- if (params.containsKey("endTime")) {
- endTime = DateUtils.parse(params.get("endTime").toString(),DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
- }else {
+ if (!params.containsKey("endTime") || StringUtils.isBlank(params.get("endTime").toString())) {
endTime = calendar.getTime();
+ } else {
+ endTime = DateUtils.parse(params.get("endTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
}
- if (params.containsKey("startTime")) {
- startTime = DateUtils.parse(params.get("startTime").toString(),DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
- }else {
+ if (!params.containsKey("startTime") || StringUtils.isBlank(params.get("startTime").toString())) {
calendar.add(Calendar.DAY_OF_YEAR, -1);
startTime = calendar.getTime();
+ } else {
+ startTime = DateUtils.parse(params.get("startTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
}
switch (ProcessConfDataTypeEnum.getEumByCode(dataType)) {
@@ -438,4 +460,19 @@
}
return dataList;
}
+
+ @Override
+ public List<PreDataViewSimpleDTO> getPreDataByOutIds(PreDataBarLineReqVO reqVO) {
+ PreDataBarLineRespVO preDataBarLineRespVO = mcsApi.getPreDataCharts(reqVO);
+ List<PreDataViewSimpleDTO> preDataViewSimpleDTOList = new ArrayList<>();
+ preDataBarLineRespVO.getDataViewList().forEach(item -> {
+ PreDataViewSimpleDTO preDataViewSimpleDTO = new PreDataViewSimpleDTO();
+ preDataViewSimpleDTO.setItemName(item.getResultName());
+ preDataViewSimpleDTO.setPredictTime(preDataBarLineRespVO.getPredictTime());
+ preDataViewSimpleDTO.setCurData(item.getCurData());
+ preDataViewSimpleDTO.setRealData(item.getRealData());
+ preDataViewSimpleDTOList.add(preDataViewSimpleDTO);
+ });
+ return preDataViewSimpleDTOList;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3