From ed2835b42336fd902c255bdc62e9837debc31c44 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 06 五月 2025 14:31:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/DataService.java | 2
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java | 15 +++++
ansteel-biz/src/main/java/com/iailab/module/ansteel/power/entity/PeakValleyFlatEntity.java | 4 +
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java | 68 ++++++++++++++++++++++
doc/鞍钢数据接口文档_master.doc | 0
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPeakValleyFlatTask.java | 69 +++++++++++-----------
6 files changed, 124 insertions(+), 34 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java
index 4a7fe68..8d763d2 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java
@@ -1,8 +1,16 @@
package com.iailab.module.ansteel.api.controller.admin;
import com.iailab.framework.common.pojo.CommonResult;
+import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.module.ansteel.api.dto.*;
import com.iailab.module.ansteel.api.service.DataService;
+import com.iailab.module.ansteel.coking.dto.CokingTraceChartDTO;
+import com.iailab.module.ansteel.coking.dto.CokingTraceDataDTO;
+import com.iailab.module.ansteel.common.enums.ProcessConfDataTypeEnum;
+import com.iailab.module.data.api.ind.dto.ApiIndItemQueryDTO;
+import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
+import com.iailab.module.data.api.point.dto.ApiPointValueDTO;
+import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
import com.iailab.module.model.api.mcs.dto.PreDataSingleChartReqVO;
import com.iailab.module.model.api.mcs.dto.StAlarmAndSuggestReqVO;
import io.swagger.v3.oas.annotations.Operation;
@@ -10,6 +18,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.util.*;
import static com.iailab.framework.common.pojo.CommonResult.success;
@@ -59,5 +68,11 @@
return success(dataService.ignoreSuggest(ReqVO));
}
+ @GetMapping("/data/history-value")
+ @Operation(summary = "指标/测点历史数据")
+ public CommonResult<List<Object[]>> getHistoryValue(@RequestParam Map<String, Object> params) {
+ return success(dataService.getHistoryValue(params));
+ }
+
}
\ No newline at end of file
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/DataService.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/DataService.java
index e4cf4db..e106fcb 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/DataService.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/DataService.java
@@ -33,4 +33,6 @@
List<PowerControlMainDTO> getPowerControlMainList();
List<PowerControlDetDTO> getPowerControlDetList(Map<String, Object> params);
+
+ List<Object[]> getHistoryValue(Map<String, Object> params);
}
\ No newline at end of file
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 a3fb940..0932aee 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
@@ -5,6 +5,7 @@
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.module.ansteel.api.dao.*;
import com.iailab.module.ansteel.api.dto.*;
+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;
@@ -12,6 +13,9 @@
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;
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;
@@ -30,12 +34,16 @@
import java.util.*;
import java.util.stream.Collectors;
+import static com.iailab.framework.common.pojo.CommonResult.success;
+
@Slf4j
@Service
public class DataServiceImpl implements DataService {
@Autowired
private DataPointApi dataPointApi;
+ @Autowired
+ private IndItemApi indItemApi;
@Autowired
private McsApi mcsApi;
@@ -370,4 +378,64 @@
wrapper.orderByAsc("sort");
return ConvertUtils.sourceToTarget(powerControlDetDao.selectList(wrapper), PowerControlDetDTO.class);
}
+
+ @Override
+ public List<Object[]> getHistoryValue(Map<String, Object> params) {
+ List<Object[]> dataList = new ArrayList<>();
+
+ if (!params.containsKey("dataType") || !params.containsKey("dataNo")) {
+ return dataList;
+ }
+ String dataType = params.get("dataType").toString();
+ String dataNo = params.get("dataNo").toString();
+
+ Date startTime = null;
+ Date endTime = null;
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.MILLISECOND, 0);
+ 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") || 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)) {
+ case DATAPOINT:
+ ApiPointValueQueryDTO queryParams1 = new ApiPointValueQueryDTO();
+ queryParams1.setPointNo(dataNo);
+ queryParams1.setStart(startTime);
+ queryParams1.setEnd(endTime);
+ List<com.iailab.module.data.api.point.dto.ApiPointValueDTO> pointHisValue = dataPointApi.queryPointHistoryValue(queryParams1);
+ pointHisValue.forEach(item -> {
+ Object[] values = new Object[2];
+ values[0] = DateUtils.format(item.getT(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+ values[1] = new BigDecimal(item.getV()).setScale(3, BigDecimal.ROUND_HALF_UP);
+ dataList.add(values);
+ });
+ break;
+ case IND:
+ log.info("IND");
+ ApiIndItemQueryDTO queryParams2 = new ApiIndItemQueryDTO();
+ queryParams2.setItemNo(dataNo);
+ queryParams2.setStart(startTime);
+ queryParams2.setEnd(endTime);
+ List<ApiIndItemValueDTO> indValues = indItemApi.queryIndItemHistoryValue(queryParams2);
+ indValues.forEach(item -> {
+ Object[] values = new Object[2];
+ values[0] = item.getDataTime();
+ values[1] = item.getDataValue();
+ dataList.add(values);
+ });
+ break;
+ default:
+ break;
+ }
+ return dataList;
+ }
}
\ No newline at end of file
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPeakValleyFlatTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPeakValleyFlatTask.java
index a15bf16..4cb978d 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPeakValleyFlatTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPeakValleyFlatTask.java
@@ -43,11 +43,11 @@
//根据测点分组
Map<String, List<PeakValleyFlatEntity>> groupedByPointNo = list.stream()
- .collect(Collectors.groupingBy(PeakValleyFlatEntity::getPowerNo));
+ .collect(Collectors.groupingBy(PeakValleyFlatEntity::getPointNo));
groupedByPointNo.entrySet().stream().forEach(entry -> {
- //计算昨日的累积量
+ //计算昨日的峰/谷累积量
double value = getSumValue(entry.getValue(), 1, calendar);
//计算昨日总电耗
@@ -58,39 +58,36 @@
Date endTime = calendar.getTime();
cal.add(Calendar.DAY_OF_YEAR, -1);
Date startTime = cal.getTime();
- double totalValue = getSumValueTotal(entry.getValue().get(0).getPowerNo(), startTime,endTime);
+ cal.add(Calendar.DAY_OF_YEAR, -29);
+ Date monthStartTime = cal.getTime();
+ double totalValue = getSumValueTotal(entry.getValue().get(0).getPowerNo(), startTime, endTime);
//下发昨日占比
- ApiPointValueWriteDTO dto = new ApiPointValueWriteDTO();
- dto.setPointNo(entry.getValue().get(0).getPointNo());
- double percent = totalValue==0?0:value/totalValue*100;
- dto.setValue(percent);
- dataPointApi.writePointRealValue(dto);
+ ApiPointValueWriteDTO percentDto = new ApiPointValueWriteDTO();
+ percentDto.setPointNo(entry.getValue().get(0).getPointNo());
+ double percent = totalValue == 0 ? 0 : value / totalValue * 100;
+ percentDto.setValue(percent);
+ dataPointApi.writePointRealValue(percentDto);
- if(entry.getValue().get(0).getPointNoMonth()!=null){
- //计算前三十日累积量
- double value30 = 0;
- for (int i = 1; i < 31; i++) {
- //计算前三十日累积量
- value30 = value30 + getSumValue(entry.getValue(), i, calendar);
- }
+ //下发昨日峰/谷累积量
+ ApiPointValueWriteDTO totalDto = new ApiPointValueWriteDTO();
+ percentDto.setPointNo(entry.getValue().get(0).getPointNoTotal());
+ percentDto.setValue(value);
+ dataPointApi.writePointRealValue(totalDto);
- //计算前三十日总电耗
- Calendar monthCal = (Calendar) calendar.clone();
- monthCal.set(Calendar.MILLISECOND, 0);
- monthCal.set(Calendar.MINUTE, 0);
- monthCal.set(Calendar.HOUR_OF_DAY, 0);
- monthCal.add(Calendar.DAY_OF_YEAR, -30);
- Date startTimeMonth = monthCal.getTime();
- double totalValueMonth = getSumValueTotal(entry.getValue().get(0).getPowerNo(), startTimeMonth,endTime);
+ //计算前三十日峰/谷累积量
+ double valueMonth = getSumValueTotal(entry.getValue().get(0).getPointNoTotal(), monthStartTime, endTime);
- //下发前三十日占比
- ApiPointValueWriteDTO monthDto = new ApiPointValueWriteDTO();
- monthDto.setPointNo(entry.getValue().get(0).getPointNoMonth());
- double percentMonth = totalValueMonth==0?0:value30/totalValueMonth*100;
- monthDto.setValue(percentMonth);
- dataPointApi.writePointRealValue(monthDto);
- }
+ //计算前三十日总电耗
+ double totalValueMonth = getSumValueTotal(entry.getValue().get(0).getPowerNo(), monthStartTime, endTime);
+
+ //下发前三十日占比
+ ApiPointValueWriteDTO monthDto = new ApiPointValueWriteDTO();
+ monthDto.setPointNo(entry.getValue().get(0).getPointNoMonth());
+ double percentMonth = totalValueMonth == 0 ? 0 : valueMonth / totalValueMonth * 100;
+ monthDto.setValue(percentMonth);
+ dataPointApi.writePointRealValue(monthDto);
+
});
} catch (Exception ex) {
logger.error("runPeakValleyFlatTask运行异常", ex);
@@ -173,10 +170,14 @@
dto.setPointNo(entity.getPowerNo());
dto.setStart(startTime);
dto.setEnd(endTime);
- logger.info("开始查询,测点："+entity.getPowerNo()+"startTime:"+startTime+"endTime:"+endTime);
-
+ logger.info("开始查询,测点：" + entity.getPowerNo() + "startTime:" + startTime + "endTime:" + endTime);
+ List<ApiPointValueDTO> valueList;
//查找数据
- List<ApiPointValueDTO> valueList = dataPointApi.queryPointHistoryValue(dto);
+ try {
+ valueList = dataPointApi.queryPointHistoryValue(dto);
+ } catch (Exception e) {
+ throw new RuntimeException("查询测点异常");
+ }
//补全数据
valueList = fillMissingData(valueList, startTime, endTime);
//累加
@@ -197,6 +198,6 @@
//补全数据
valueList = fillMissingData(valueList, startTime, endTime);
//累加
- return valueList.stream().mapToDouble(ApiPointValueDTO::getV).sum()/ 60;
+ return valueList.stream().mapToDouble(ApiPointValueDTO::getV).sum() / 60;
}
}
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/entity/PeakValleyFlatEntity.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/entity/PeakValleyFlatEntity.java
index 974cc8c..e476ad3 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/entity/PeakValleyFlatEntity.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/entity/PeakValleyFlatEntity.java
@@ -41,6 +41,10 @@
*/
private String pointNoMonth;
/**
+ * 下发测点编码
+ */
+ private String pointNoTotal;
+ /**
* 功率测点编码
*/
private String powerNo;
diff --git "a/doc/\351\236\215\351\222\242\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243_master.doc" "b/doc/\351\236\215\351\222\242\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243_master.doc"
index cef4773..046aeba 100644
--- "a/doc/\351\236\215\351\222\242\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243_master.doc"
+++ "b/doc/\351\236\215\351\222\242\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243_master.doc"
Binary files differ
--
Gitblit v1.9.3