From 7eeb94c954e214b84a9d67517942b981976471b5 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 07 五月 2025 18:13:38 +0800
Subject: [PATCH] 需量值查询
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 480 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 371 insertions(+), 109 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
index b95b9d3..4061a19 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
@@ -77,12 +77,17 @@
@Autowired
private PowerNetDropdownService powerNetDropdownService;
+ @Autowired
+ private PowerVoltageStatusService powerVoltageStatusService;
+
@GetMapping("/net-factor/list")
@Operation(summary = "功率因数-电网拓扑")
public CommonResult<List<PowerNetFactorDTO>> getPowerNetFactorList(@RequestParam Map<String, Object> params) {
+ log.info("功率因数电网拓扑");
+ List<PowerNetFactorDTO> result = new ArrayList<>();
List<PowerNetFactorEntity> list = powerNetFactorService.list(params);
- List<PowerNetFactorDTO> result = ConvertUtils.sourceToTarget(list, PowerNetFactorDTO.class);
- if (CollectionUtils.isEmpty(result)) {
+ if (CollectionUtils.isEmpty(list)) {
+ log.info("list is empty");
return success(result);
}
Calendar calendar = Calendar.getInstance();
@@ -91,74 +96,126 @@
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.HOUR_OF_DAY, 0);
- for (PowerNetFactorDTO dto : result) {
+ for (PowerNetFactorEntity entity : list) {
+ PowerNetFactorDTO powerNetFactorDTO = new PowerNetFactorDTO();
+ powerNetFactorDTO.setId(entity.getId());
+ powerNetFactorDTO.setGroupName(entity.getGroupName());
+ powerNetFactorDTO.setNodeCode(entity.getNodeCode());
+ powerNetFactorDTO.setNodeName(entity.getNodeName());
boolean cosFlag = false;
try {
List<String> points = new ArrayList<>();
- if (StringUtils.isNotBlank(dto.getCurP())) {
- points.add(dto.getCurP());
+ if (StringUtils.isNotBlank(entity.getCurA())) {
+ points.add(entity.getCurA());
}
- if (StringUtils.isNotBlank(dto.getCurQ())) {
- points.add(dto.getCurQ());
+ if (StringUtils.isNotBlank(entity.getCurP())) {
+ points.add(entity.getCurP());
}
+ if (StringUtils.isNotBlank(entity.getCurQ())) {
+ points.add(entity.getCurQ());
+ }
+ if (StringUtils.isNotBlank(entity.getCurCos())) {
+ points.add(entity.getCurCos());
+ }
+ log.info("points=" + points);
if (!CollectionUtils.isEmpty(points)) {
Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
- if (pointsRealValue.get(dto.getCurP()) != null) {
- dto.setCurP(pointsRealValue.get(dto.getCurP()).toString());
+ log.info("pointsRealValue=" + pointsRealValue);
+ if (pointsRealValue.get(entity.getCurA()) != null) {
+ powerNetFactorDTO.setCurA(new BigDecimal(pointsRealValue.get(entity.getCurA()).toString()));
}
- if (pointsRealValue.get(dto.getCurQ()) != null) {
- dto.setCurQ(pointsRealValue.get(dto.getCurQ()).toString());
+ if (pointsRealValue.get(entity.getCurP()) != null) {
+ powerNetFactorDTO.setCurP(new BigDecimal(pointsRealValue.get(entity.getCurP()).toString()));
}
- if (pointsRealValue.get(dto.getCurCos()) != null) {
- dto.setCurCos(pointsRealValue.get(dto.getCurCos()).toString());
+ if (pointsRealValue.get(entity.getCurQ()) != null) {
+ powerNetFactorDTO.setCurQ(new BigDecimal(pointsRealValue.get(entity.getCurQ()).toString()));
+ }
+ if (pointsRealValue.get(entity.getCurCos()) != null) {
+ powerNetFactorDTO.setCurCos(new BigDecimal(pointsRealValue.get(entity.getCurCos()).toString()));
cosFlag = true;
}
}
} catch (Exception ex) {
- log.info(dto.getNodeName() + "获取当前值异常" + ex.getMessage());
+ log.info(entity.getNodeName() + "获取当前值异常" + ex.getMessage());
+ ex.printStackTrace();
}
try {
PredictLastValueReqVO reqVO = new PredictLastValueReqVO();
reqVO.setPredictTime(calendar.getTime());
List<String[]> itemNos = new ArrayList<>();
- if (StringUtils.isNotBlank(dto.getPreP())) {
- itemNos.add(dto.getPreP().split(","));
+ if (StringUtils.isNotBlank(entity.getPreP())) {
+ itemNos.add(entity.getPreP().split(","));
}
- if (StringUtils.isNotBlank(dto.getPreQ())) {
- itemNos.add(dto.getPreQ().split(","));
+ if (StringUtils.isNotBlank(entity.getPreQ())) {
+ itemNos.add(entity.getPreQ().split(","));
}
- if (StringUtils.isNotBlank(dto.getPreCos())) {
- itemNos.add(dto.getPreCos().split(","));
+ if (StringUtils.isNotBlank(entity.getPreCos())) {
+ itemNos.add(entity.getPreCos().split(","));
}
if (!CollectionUtils.isEmpty(itemNos)) {
reqVO.setItemNos(itemNos);
log.info("reqVO=" + JSONObject.toJSONString(reqVO));
Map<String, BigDecimal> preValues = mcsApi.getPredictValueByTime(reqVO);
- if (StringUtils.isNotBlank(dto.getPreP()) && preValues.get(dto.getPreP()) != null) {
- dto.setPreP(preValues.get(dto.getPreP()).toString());
+ if (StringUtils.isNotBlank(entity.getPreP()) && preValues.get(entity.getPreP()) != null) {
+ powerNetFactorDTO.setPreP(new BigDecimal(preValues.get(entity.getPreP()).toString()));
}
- if (StringUtils.isNotBlank(dto.getPreQ()) && preValues.get(dto.getPreQ()) != null) {
- dto.setPreQ(preValues.get(dto.getPreQ()).toString());
+ if (StringUtils.isNotBlank(entity.getPreQ()) && preValues.get(entity.getPreQ()) != null) {
+ powerNetFactorDTO.setPreQ(new BigDecimal(preValues.get(entity.getPreQ()).toString()));
}
- if (StringUtils.isNotBlank(dto.getPreCos()) && preValues.get(dto.getPreCos()) != null) {
- dto.setPreCos(preValues.get(dto.getPreCos()).toString());
+ if (StringUtils.isNotBlank(entity.getPreCos()) && preValues.get(entity.getPreCos()) != null) {
+ powerNetFactorDTO.setPreCos(new BigDecimal(preValues.get(entity.getPreCos()).toString()));
}
}
} catch (Exception ex) {
- log.info(dto.getNodeName() + "获取预测值异常," + ex.getMessage());
+ log.info(entity.getNodeName() + "获取预测值异常," + ex.getMessage());
+ ex.printStackTrace();
}
- // 设置状态
- if (cosFlag && StringUtils.isNotBlank(dto.getCurCos()) && NumberUtil.isNumber(dto.getCurCos())) {
- BigDecimal curCos = new BigDecimal(dto.getCurCos());
- if (dto.getLimitL() != null && dto.getLimitH() != null &&
- curCos.compareTo(dto.getLimitL()) < 0 || curCos.compareTo(dto.getLimitH()) > 0) {
- dto.setStatus(1);
- } else {
- dto.setStatus(0);
+ // 设置电流状态
+ powerNetFactorDTO.setStatus(0);
+ if (powerNetFactorDTO.getCurA() != null) {
+ BigDecimal curA = powerNetFactorDTO.getCurA();
+ if (entity.getLimitL() != null && curA.compareTo(entity.getLimitL()) < 0) {
+ powerNetFactorDTO.setStatus(1);
+ } else if (entity.getLimitH() != null && curA.compareTo(entity.getLimitH()) > 0) {
+ powerNetFactorDTO.setStatus(1);
}
}
+
+ // 设置功率因数状态
+ powerNetFactorDTO.setQstatus(0);
+ if (cosFlag && powerNetFactorDTO.getCurCos() != null) {
+ BigDecimal curCos = powerNetFactorDTO.getCurCos();
+ if (entity.getCosLimitL() != null && curCos.compareTo(entity.getCosLimitL()) < 0) {
+ powerNetFactorDTO.setQstatus(1);
+ } else if (entity.getCosLimitH() != null && curCos.compareTo(entity.getCosLimitH()) > 0) {
+ powerNetFactorDTO.setQstatus(1);
+ }
+ }
+
+ // 设置有功预警状态
+ powerNetFactorDTO.setPstatus(0);
+ if (powerNetFactorDTO.getCurP() != null) {
+ BigDecimal curP = powerNetFactorDTO.getCurP();
+ if (entity.getPLimitL() != null && curP.compareTo(entity.getPLimitL()) < 0) {
+ powerNetFactorDTO.setPstatus(1);
+ } else if (entity.getPLimitH() != null && curP.compareTo(entity.getPLimitH()) > 0) {
+ powerNetFactorDTO.setPstatus(1);
+ }
+ }
+
+ // 设置无功预警状态
+ powerNetFactorDTO.setQstatus(0);
+ if (powerNetFactorDTO.getCurQ() != null) {
+ BigDecimal curQ = powerNetFactorDTO.getCurQ();
+ if (entity.getQLimitL() != null && curQ.compareTo(entity.getQLimitL()) < 0) {
+ powerNetFactorDTO.setQstatus(1);
+ } else if (entity.getQLimitH() != null && curQ.compareTo(entity.getQLimitH()) > 0) {
+ powerNetFactorDTO.setQstatus(1);
+ }
+ }
+ result.add(powerNetFactorDTO);
}
return success(result);
}
@@ -216,32 +273,32 @@
if (CollectionUtils.isEmpty(dtoList)) {
return success(result);
}
- for (PowerNetFactorDTO dto : dtoList) {
+ for (PowerNetFactorEntity entity : list) {
List<String> points = new ArrayList<>();
String message = "";
- if (StringUtils.isNotBlank(dto.getCurQ())) {
- points.add(dto.getCurQ());
+ if (StringUtils.isNotBlank(entity.getCurQ())) {
+ points.add(entity.getCurQ());
}
- if (StringUtils.isNotBlank(dto.getCurCos())) {
- points.add(dto.getCurCos());
+ if (StringUtils.isNotBlank(entity.getCurCos())) {
+ points.add(entity.getCurCos());
}
if (CollectionUtils.isEmpty(points)) {
continue;
}
Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
- if (pointsRealValue.get(dto.getCurQ()) != null) {
- BigDecimal curQ = new BigDecimal(pointsRealValue.get(dto.getCurQ()).toString());
- if (curQ.compareTo(BigDecimal.ZERO) == dto.getCurFlag()) {
- message = dto.getNodeName() + "发生无功返送;";
+ if (pointsRealValue.get(entity.getCurQ()) != null) {
+ BigDecimal curQ = new BigDecimal(pointsRealValue.get(entity.getCurQ()).toString());
+ if (curQ.compareTo(BigDecimal.ZERO) == entity.getCurFlag()) {
+ message = entity.getNodeName() + "发生无功返送;";
}
}
- if (pointsRealValue.get(dto.getCurCos()) != null) {
- BigDecimal curCos = new BigDecimal(pointsRealValue.get(dto.getCurCos()).toString());
- if (curCos.compareTo(dto.getLimitH()) > 0) {
- message += dto.getNodeName() + "功率因数超上限";
- } else if (curCos.compareTo(dto.getLimitL()) < 0) {
- message += dto.getNodeName() + "功率因数超下限";
+ if (pointsRealValue.get(entity.getCurCos()) != null) {
+ BigDecimal curCos = new BigDecimal(pointsRealValue.get(entity.getCurCos()).toString());
+ if (entity.getLimitH() != null && curCos.compareTo(entity.getLimitH()) > 0) {
+ message += entity.getNodeName() + "功率因数超上限";
+ } else if (entity.getLimitL() != null && curCos.compareTo(entity.getLimitL()) < 0) {
+ message += entity.getNodeName() + "功率因数超下限";
}
}
if (!message.isEmpty()) {
@@ -459,6 +516,13 @@
if (CollectionUtils.isEmpty(result)) {
return success(result);
}
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.DAY_OF_MONTH, 1);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
+ calendar.set(Calendar.MILLISECOND, 0);
+
for (PowerDemandDTO dto : result) {
List<String> points = new ArrayList<>();
if (StringUtils.isNotBlank(dto.getCurDemand())) {
@@ -467,11 +531,8 @@
if (StringUtils.isNotBlank(dto.getActivePower())) {
points.add(dto.getActivePower());
}
-
if (!CollectionUtils.isEmpty(points)) {
-
Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
-
if (pointsRealValue.get(dto.getCurDemand()) != null) {
dto.setCurDemand(pointsRealValue.get(dto.getCurDemand()).toString());
}
@@ -481,25 +542,17 @@
}
if (!StringUtils.isEmpty(dto.getMaxDemand())) {
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.DAY_OF_MONTH, 1);
- calendar.set(Calendar.HOUR_OF_DAY, 0);
- calendar.set(Calendar.MINUTE, 0);
- calendar.set(Calendar.SECOND, 0);
- calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
ApiPointValueQueryDTO apiPointValueQueryDTO = new ApiPointValueQueryDTO();
apiPointValueQueryDTO.setStart(start);
- apiPointValueQueryDTO.setEnd(new Date());
apiPointValueQueryDTO.setPointNo(dto.getMaxDemand());
+ Map<String, Object> maxValue = dataPointApi.queryPointMaxValue(apiPointValueQueryDTO);
+ if (maxValue != null) {
+ dto.setMaxDemand(maxValue.get(dto.getMaxDemand()) == null ? "" : maxValue.get(dto.getMaxDemand()).toString());
+ }
- Object maxValue = dataPointApi.queryPointMaxValue(apiPointValueQueryDTO);
- dto.setMaxDemand(maxValue == null ? "" : maxValue.toString());
}
-
-
}
-
return success(result);
}
@@ -541,11 +594,12 @@
}
@PostMapping("/demand-query/list")
- @Operation(summary = "负荷移植-功率因数查询")
- public CommonResult<List<PowerNetDropdownDTO>> getDemandDropdownList(@RequestBody PowerDemandQueryDTO queryDto) {
- List<PowerNetDropdownDTO> result = new ArrayList<>();
+ @Operation(summary = "负荷移植-需量值查询")
+ public CommonResult<List<PowerDemandQueryRespDTO>> getDemandDropdownList(@RequestBody PowerDemandQueryDTO queryDto) {
+ List<PowerDemandQueryRespDTO> result = new ArrayList<>();
if (StringUtils.isBlank(queryDto.getCode())) {
log.info("code isBlank");
+ return success(result);
}
log.info("code=" + queryDto.getCode());
if (StringUtils.isBlank(queryDto.getNodeCode())) {
@@ -556,25 +610,42 @@
log.info("PowerDemandEntity is null");
return success(result);
}
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.MILLISECOND, 0);
+ calendar.set(Calendar.SECOND, 0);
+ Date startTime = queryDto.getStartTime();
+ Date endTime = queryDto.getEndTime();
+ if (endTime == null) {
+ endTime = calendar.getTime();
+ }
+ if (startTime == null) {
+ calendar.add(Calendar.DAY_OF_YEAR, -1);
+ startTime = calendar.getTime();
+ }
+
Map<String, Object> params0 = new HashMap<>();
params0.put("groupName", entity.getName());
- List<PowerNetDropdownEntity> list = powerNetDropdownService.list(params0);
- List<String> points = list.stream().map(item -> {
- return item.getCurCos();
- }).collect(Collectors.toList());
- if (queryDto.getCurCos() == null) {
+ List<PowerNetDropdownEntity> dropdownList = powerNetDropdownService.list(params0);
+ List<String> pointNos = new ArrayList<>();
+ for (PowerNetDropdownEntity netDropdown : dropdownList) {
+ if (StringUtils.isNotBlank(netDropdown.getExt1())) {
+ pointNos.add(netDropdown.getExt1());
+ }
+ }
+ if (StringUtils.isBlank(queryDto.getNodeCode()) || queryDto.getCurDemand() == null) {
log.info("查询当前值");
Map<String, Object> pointsRealValue = new HashMap<>();
- if (!CollectionUtils.isEmpty(points)) {
- pointsRealValue = dataPointApi.queryPointsRealValue(points);
+ if (!CollectionUtils.isEmpty(pointNos)) {
+ pointsRealValue = dataPointApi.queryPointsRealValue(pointNos);
}
- for (PowerNetDropdownEntity netDropdown : list) {
- PowerNetDropdownDTO dto = ConvertUtils.sourceToTarget(netDropdown, PowerNetDropdownDTO.class);
- BigDecimal curCos = BigDecimal.ZERO;
- if (pointsRealValue.get(netDropdown.getCurCos()) != null) {
- curCos = new BigDecimal(pointsRealValue.get(netDropdown.getCurCos()).toString());
+ for (PowerNetDropdownEntity netDropdown : dropdownList) {
+ PowerDemandQueryRespDTO dto = ConvertUtils.sourceToTarget(netDropdown, PowerDemandQueryRespDTO.class);
+ BigDecimal demand = null;
+ if (pointsRealValue.get(netDropdown.getExt1()) != null) {
+ demand = new BigDecimal(pointsRealValue.get(netDropdown.getExt1()).toString());
}
- dto.setCurCos(curCos);
+ dto.setCurDemand(demand);
+ dto.setDataTime(calendar.getTime());
result.add(dto);
}
} else {
@@ -590,19 +661,7 @@
return success(result);
}
ApiPointsValueQueryDTO valueQueryDTO = new ApiPointsValueQueryDTO();
- valueQueryDTO.setPointNos(points);
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- Date startTime = queryDto.getStartTime();
- Date endTime = queryDto.getEndTime();
- if (endTime == null) {
- endTime = calendar.getTime();
- }
- if (startTime == null) {
- calendar.add(Calendar.DAY_OF_YEAR, -1);
- startTime = calendar.getTime();
- }
+ valueQueryDTO.setPointNos(pointNos);
valueQueryDTO.setStart(startTime);
valueQueryDTO.setEnd(endTime);
Map<String, List<Map<String, Object>>> pointsHisValues = dataPointApi.queryPointsHistoryValue(valueQueryDTO);
@@ -614,7 +673,7 @@
ApiPointValueQueryDTO pointValueQueryDTO = new ApiPointValueQueryDTO();
pointValueQueryDTO.setStart(startTime);
pointValueQueryDTO.setEnd(endTime);
- pointValueQueryDTO.setPointNo(powerNetDropdownEntity.getCurCos());
+ pointValueQueryDTO.setPointNo(powerNetDropdownEntity.getExt1());
List<ApiPointValueDTO> hisValue = dataPointApi.queryPointHistoryValue(pointValueQueryDTO);
if (CollectionUtils.isEmpty(hisValue)) {
log.info("hisValue is null");
@@ -622,28 +681,35 @@
ApiPointValueDTO curValue = null;
Collections.reverse(hisValue);
for (ApiPointValueDTO valueDTO : hisValue) {
- curValue = valueDTO;
- if ((queryDto.getCurCos().doubleValue() - valueDTO.getV()) <= 0.0001) {
+ if ((queryDto.getCurDemand().doubleValue() - valueDTO.getV()) <= 0.0001) {
+ curValue = valueDTO;
+ log.info("curValue is find");
break;
}
}
if (curValue == null) {
log.info("curValue is null");
+ for (PowerNetDropdownEntity netDropdown : dropdownList){
+ PowerDemandQueryRespDTO dto = ConvertUtils.sourceToTarget(netDropdown, PowerDemandQueryRespDTO.class);
+ if (dto.getNodeCode().equals(nodeCode)) {
+ dto.setCurDemand(queryDto.getCurDemand());
+ }
+ result.add(dto);
+ }
return success(result);
}
log.info("curValue=" + curValue);
- for (PowerNetDropdownEntity netDropdown : list) {
- PowerNetDropdownDTO dto = ConvertUtils.sourceToTarget(netDropdown, PowerNetDropdownDTO.class);
+ for (PowerNetDropdownEntity netDropdown : dropdownList) {
+ PowerDemandQueryRespDTO dto = ConvertUtils.sourceToTarget(netDropdown, PowerDemandQueryRespDTO.class);
+ if (!CollectionUtils.isEmpty(pointsHisValues.get(netDropdown.getExt1()))) {
+ Map<String, BigDecimal> pointValueMap = new HashMap<>();
+ pointsHisValues.get(netDropdown.getExt1()).forEach(item -> {
+ pointValueMap.put(item.get("time").toString(), DecimalUtil.toBigDecimal(item.get("value")));
- if (CollectionUtils.isEmpty(pointsHisValues.get(netDropdown.getCurCos()))) {
- continue;
+ });
+ dto.setCurDemand(pointValueMap.get(DateUtils.format(curValue.getT(),DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)));
+ dto.setDataTime(curValue.getT());
}
- Map<String, BigDecimal> pointValueMap = new HashMap<>();
- pointsHisValues.get(netDropdown.getCurCos()).forEach(item -> {
- pointValueMap.put(item.get("time").toString(), DecimalUtil.toBigDecimal(item.get("value")));
-
- });
- dto.setCurCos(pointValueMap.get(DateUtils.format(curValue.getT(),DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)));
result.add(dto);
}
}
@@ -651,7 +717,7 @@
}
@PostMapping("/net-factor/history")
- @Operation(summary = "功率因数-根据nodeName获取最近1440min历史数据，月最大，最小值")
+ @Operation(summary = "功率因数-电网拓扑功率历史")
public CommonResult<PowerHistoryDTO> getPowerHistoryData(@RequestBody PowerNetFactorHisReqDTO dto) {
log.info("PowerNetFactorHisReqDTO=" + JSONObject.toJSONString(dto));
PowerHistoryDTO result = new PowerHistoryDTO();
@@ -733,6 +799,98 @@
return success(result);
}
+ @PostMapping("/net-factor/history-list")
+ @Operation(summary = "功率因数-电网拓扑功率历史(多code)")
+ public CommonResult<LinkedHashMap<String, PowerHistoryDTO>> getPowerHistoryList(@RequestBody PowerNetFactorHisReqDTO dto) {
+ log.info("PowerNetFactorHisReqDTO=" + JSONObject.toJSONString(dto));
+ LinkedHashMap<String, PowerHistoryDTO> result = new LinkedHashMap<>();
+ List<String> nodeCodeList = dto.getNodeCodeList();
+ if (CollectionUtils.isEmpty(nodeCodeList)) {
+ return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST);
+ }
+ String queryType = dto.getQueryType();
+ if (StringUtils.isBlank(queryType)) {
+ return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST);
+ }
+ Calendar calendar0 = Calendar.getInstance();
+ calendar0.set(Calendar.MILLISECOND, 0);
+ calendar0.set(Calendar.SECOND, 0);
+ Date end0 = dto.getEndTime() == null ? calendar0.getTime() : dto.getEndTime();
+ calendar0.add(Calendar.MINUTE, -1440);
+ Date start0 = dto.getStartTime() == null ? calendar0.getTime() : dto.getStartTime();
+
+ Calendar calendar1 = Calendar.getInstance();
+ calendar1.set(Calendar.DAY_OF_MONTH, 1);
+ calendar1.set(Calendar.HOUR_OF_DAY, 0);
+ calendar1.set(Calendar.MINUTE, 0);
+ calendar1.set(Calendar.SECOND, 0);
+ calendar1.set(Calendar.MILLISECOND, 0);
+ Date start1 = calendar1.getTime();
+
+ List<String> categories = DateUtils.getTimeScale(start0, end0, 60);
+ for (String nodeCode : nodeCodeList) {
+ PowerHistoryDTO powerHistoryDTO = new PowerHistoryDTO();
+ PowerNetFactorQuery powerNetFactorQuery = null;
+ PowerNetFactorEntity powerNetFactorEntity = powerNetFactorService.getByNodeCode(nodeCode);
+ PowerNetDropdownEntity powerNetDropdownEntity = powerNetDropdownService.getByNodeCode(nodeCode);
+ if (powerNetFactorEntity != null) {
+ powerNetFactorQuery = ConvertUtils.sourceToTarget(powerNetFactorEntity, PowerNetFactorQuery.class);
+ } else if (powerNetDropdownEntity != null) {
+ powerNetFactorQuery = ConvertUtils.sourceToTarget(powerNetDropdownEntity, PowerNetFactorQuery.class);
+ }
+ if (powerNetFactorQuery == null) {
+ log.info("powerNetFactor is null");
+ continue;
+ }
+
+ log.info("开始查询，");
+ ApiPointValueQueryDTO apiPointValueQueryDTO = new ApiPointValueQueryDTO();
+ String pointNo = "";
+ switch (queryType.toUpperCase()) {
+ case "P":
+ pointNo = powerNetFactorQuery.getCurP();
+ break;
+ case "Q":
+ pointNo = powerNetFactorQuery.getCurQ();
+ break;
+ case "COS":
+ pointNo = powerNetFactorQuery.getCurCos();
+ break;
+ default:
+ break;
+ }
+
+ //查询图表
+ apiPointValueQueryDTO.setPointNo(pointNo);
+ apiPointValueQueryDTO.setEnd(end0);
+ apiPointValueQueryDTO.setStart(start0);
+ List<ApiPointValueDTO> chartData = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
+ List<Object[]> dataList = new ArrayList<>();
+ for (ApiPointValueDTO pv : chartData) {
+ Object[] data = new Object[2];
+ data[0] = DateUtils.format(pv.getT(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+ data[1] = pv.getV();
+ dataList.add(data);
+ }
+ powerHistoryDTO.setDataList(dataList);
+
+ //查询月最大最小值
+ ApiPointValueQueryDTO apiPointValueQueryDTO1 = new ApiPointValueQueryDTO();
+ apiPointValueQueryDTO1.setStart(start1);
+ apiPointValueQueryDTO1.setEnd(new Date());
+ apiPointValueQueryDTO1.setPointNo(pointNo);
+ List<ApiPointValueDTO> monthChartData = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO1);
+ if (!CollectionUtils.isEmpty(monthChartData)) {
+ List<Double> monthValues = monthChartData.stream().map(item -> item.getV()).collect(Collectors.toList());
+ powerHistoryDTO.setMax(monthValues.stream().max(Double::compareTo).get());
+ powerHistoryDTO.setMin(monthValues.stream().min(Double::compareTo).get());
+ }
+
+ result.put(nodeCode, powerHistoryDTO);
+ }
+ return success(result);
+ }
+
@GetMapping("/adjust-factor")
@Operation(summary = "功率因数-调整后的功率因数与无功倒送量")
public CommonResult<Map<String, Double>> getPowerAdjustFactor(@RequestParam Map<String, Object> params) {
@@ -762,7 +920,7 @@
}
@PostMapping("/demand/history")
- @Operation(summary = "负荷移植-实测需量，有功功率 历史")
+ @Operation(summary = "负荷移植-实测需量有功功率历史")
public CommonResult<PowerHistoryDTO> getPowerDemandHistory(@RequestBody PowerDemandHisReqDTO dto) {
log.info("请求参数: {}", JSONObject.toJSONString(dto));
@@ -830,4 +988,108 @@
return success(result);
}
+ @PostMapping("/demand/history-list")
+ @Operation(summary = "负荷移植-实测需量有功功率历史(多code)")
+ public CommonResult<LinkedHashMap<String, List<Object[]>>> getPowerDemandHistoryList(@RequestBody PowerDemandHisReqDTO dto) {
+ log.info("请求参数: {}", JSONObject.toJSONString(dto));
+ LinkedHashMap<String, List<Object[]>> result = new LinkedHashMap<>();
+
+ // 参数校验
+ if (CollectionUtils.isEmpty(dto.getCodeList())) {
+ return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST, "codeList不能为空");
+ }
+ if (StringUtils.isBlank(dto.getQueryType())) {
+ return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST, "queryType不能为空");
+ }
+ Calendar cal = Calendar.getInstance();
+ cal.set(Calendar.MILLISECOND, 0);
+ cal.set(Calendar.SECOND, 0);
+ Date endTime = dto.getEndTime() == null ? cal.getTime() : dto.getEndTime();
+ Date startTime = dto.getStartTime();
+ if (dto.getStartTime() == null) {
+ cal.add(Calendar.DAY_OF_YEAR, -1);
+ startTime = cal.getTime();
+ }
+
+ for (String code : dto.getCodeList()) {
+ PowerNetFactorQuery powerNetFactorQuery = new PowerNetFactorQuery();
+ PowerDemandEntity powerDemandEntity = powerDemandService.getByCode(code);
+ PowerNetDropdownEntity powerNetDropdownEntity = powerNetDropdownService.getByNodeCode(code);
+ if (powerDemandEntity != null) {
+ powerNetFactorQuery.setCurP(powerDemandEntity.getActivePower());
+ powerNetFactorQuery.setCurDem(powerDemandEntity.getCurDemand());
+ } else if (powerNetDropdownEntity != null) {
+ powerNetFactorQuery.setCurP(powerNetDropdownEntity.getCurP());
+ powerNetFactorQuery.setCurDem(powerNetDropdownEntity.getExt1());
+ } else {
+ log.info("未找到code对应的数据: {}", dto.getCode());
+ continue;
+ }
+
+ String queryType = dto.getQueryType().toUpperCase();
+ String pointNo;
+ switch (queryType.toUpperCase()) {
+ case "D":
+ pointNo = powerNetFactorQuery.getCurDem();
+ break;
+ case "P":
+ pointNo = powerNetFactorQuery.getCurP();
+ break;
+ default:
+ throw new IllegalArgumentException("不支持的queryType: " + queryType);
+ }
+
+ // 查询历史数据
+ ApiPointValueQueryDTO query = new ApiPointValueQueryDTO();
+ query.setPointNo(pointNo);
+ query.setStart(startTime);
+ query.setEnd(endTime);
+ log.info("开始查询实测需量有功功率历史数据，测点: {}", pointNo);
+ List<ApiPointValueDTO> chartData = dataPointApi.queryPointHistoryValue(query);
+ List<Object[]> dataList = chartData.stream()
+ .map(pv -> new Object[]{
+ DateUtils.format(pv.getT(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND),
+ pv.getV()
+ })
+ .collect(Collectors.toList());
+
+ result.put(code, dataList);
+ }
+
+ return success(result);
+ }
+
+
+ @GetMapping("/voltage/status-list")
+ @Operation(summary = "功率因数-母线电压状态")
+ public CommonResult<List<PowerVoltageStatusDTO>> getPowerVoltageStatusList(@RequestParam Map<String, Object> params) {
+ List<PowerVoltageStatusDTO> result = new ArrayList<>();
+ List<PowerVoltageStatusEntity> list = powerVoltageStatusService.list(params);
+ if (CollectionUtils.isEmpty(list)) {
+ return success(result);
+ }
+
+ List<String> points = new ArrayList<>();
+ for (PowerVoltageStatusEntity entity : list) {
+ if (StringUtils.isBlank(entity.getPoint())) {
+ continue;
+ }
+ points.add(entity.getPoint());
+ }
+ Map<String, Object> pointsRealValue = new HashMap<>();
+ if (!CollectionUtils.isEmpty(points)) {
+ pointsRealValue = dataPointApi.queryPointsRealValue(points);
+ }
+ for (PowerVoltageStatusEntity entity : list) {
+ PowerVoltageStatusDTO dto = ConvertUtils.sourceToTarget(entity, PowerVoltageStatusDTO.class);
+ dto.setStatus(0);
+ BigDecimal value = new BigDecimal(pointsRealValue.get(entity.getPoint()).toString());
+ if (value.compareTo(entity.getLimitH()) > 0) {
+ dto.setStatus(1);
+ }
+ dto.setVoltage(value);
+ result.add(dto);
+ }
+ return success(result);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3