From 0d7505f8301d2721edfa031d5f4ebf82b2d02a17 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 09 五月 2025 10:27:00 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/ansteel
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 332 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 251 insertions(+), 81 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 e80f133..973926e 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
@@ -2,12 +2,21 @@
import cn.hutool.core.util.NumberUtil;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iailab.framework.common.exception.enums.GlobalErrorCodeConstants;
import com.iailab.framework.common.pojo.CommonResult;
+import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.util.date.DateUtils;
+import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
+import com.iailab.framework.tenant.core.context.TenantContextHolder;
import com.iailab.module.ansteel.api.dto.*;
+import com.iailab.module.ansteel.api.vo.PowerMaxDemandMainPageReqVO;
import com.iailab.module.ansteel.common.utils.DecimalUtil;
+import com.iailab.module.ansteel.job.dto.ScheduleJobDTO;
+import com.iailab.module.ansteel.job.entity.ScheduleJobEntity;
+import com.iailab.module.ansteel.job.service.ScheduleJobService;
+import com.iailab.module.ansteel.job.vo.ScheduleJobReqVO;
import com.iailab.module.ansteel.power.entity.*;
import com.iailab.module.ansteel.power.service.*;
import com.iailab.module.data.api.point.DataPointApi;
@@ -20,7 +29,9 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
@@ -80,12 +91,19 @@
@Autowired
private PowerVoltageStatusService powerVoltageStatusService;
+ @Autowired
+ private PowerMaxdemandMainService powerMaxDemandMainService;
+ @Autowired
+ private PowerMaxdemandDetService powerMaxdemandDetService;
+
@GetMapping("/net-factor/list")
@Operation(summary = "功率因数-电网拓扑")
public CommonResult<List<PowerNetFactorDTO>> getPowerNetFactorList(@RequestParam Map<String, Object> params) {
- List<PowerNetFactorEntity> list = powerNetFactorService.list(params);
+ log.info("功率因数电网拓扑");
List<PowerNetFactorDTO> result = new ArrayList<>();
- if (CollectionUtils.isEmpty(result)) {
+ List<PowerNetFactorEntity> list = powerNetFactorService.list(params);
+ if (CollectionUtils.isEmpty(list)) {
+ log.info("list is empty");
return success(result);
}
Calendar calendar = Calendar.getInstance();
@@ -103,14 +121,25 @@
boolean cosFlag = false;
try {
List<String> points = new ArrayList<>();
+ if (StringUtils.isNotBlank(entity.getCurA())) {
+ points.add(entity.getCurA());
+ }
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);
+ log.info("pointsRealValue=" + pointsRealValue);
+ if (pointsRealValue.get(entity.getCurA()) != null) {
+ powerNetFactorDTO.setCurA(new BigDecimal(pointsRealValue.get(entity.getCurA()).toString()));
+ }
if (pointsRealValue.get(entity.getCurP()) != null) {
powerNetFactorDTO.setCurP(new BigDecimal(pointsRealValue.get(entity.getCurP()).toString()));
}
@@ -124,6 +153,7 @@
}
} catch (Exception ex) {
log.info(entity.getNodeName() + "获取当前值异常" + ex.getMessage());
+ ex.printStackTrace();
}
try {
@@ -155,43 +185,53 @@
}
} catch (Exception ex) {
log.info(entity.getNodeName() + "获取预测值异常," + ex.getMessage());
+ ex.printStackTrace();
+ }
+
+ // 设置电流状态
+ 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.getLimitL() != null && curCos.compareTo(entity.getLimitL()) < 0) {
- powerNetFactorDTO.setStatus(1);
- } else if (entity.getLimitH() != null && curCos.compareTo(entity.getLimitH()) > 0) {
- powerNetFactorDTO.setStatus(1);
- } else {
- powerNetFactorDTO.setStatus(0);
+ 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.getPLimitH() != null && curP.compareTo(entity.getPLimitL()) < 0) {
- powerNetFactorDTO.setStatus(1);
+ if (entity.getPLimitL() != null && curP.compareTo(entity.getPLimitL()) < 0) {
+ powerNetFactorDTO.setPstatus(1);
} else if (entity.getPLimitH() != null && curP.compareTo(entity.getPLimitH()) > 0) {
- powerNetFactorDTO.setStatus(1);
- } else {
- powerNetFactorDTO.setStatus(0);
+ powerNetFactorDTO.setPstatus(1);
}
}
// 设置无功预警状态
+ powerNetFactorDTO.setQstatus(0);
if (powerNetFactorDTO.getCurQ() != null) {
BigDecimal curQ = powerNetFactorDTO.getCurQ();
- if (entity.getQLimitH() != null && curQ.compareTo(entity.getQLimitL()) < 0) {
- powerNetFactorDTO.setStatus(1);
+ if (entity.getQLimitL() != null && curQ.compareTo(entity.getQLimitL()) < 0) {
+ powerNetFactorDTO.setQstatus(1);
} else if (entity.getQLimitH() != null && curQ.compareTo(entity.getQLimitH()) > 0) {
- powerNetFactorDTO.setStatus(1);
- } else {
- powerNetFactorDTO.setStatus(0);
+ powerNetFactorDTO.setQstatus(1);
}
}
+ result.add(powerNetFactorDTO);
}
return success(result);
}
@@ -249,32 +289,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()) {
@@ -570,11 +610,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())) {
@@ -585,25 +626,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 {
@@ -619,19 +677,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);
@@ -643,7 +689,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");
@@ -651,28 +697,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);
}
}
@@ -680,7 +733,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();
@@ -758,6 +811,98 @@
monthValues = monthChartData.stream().map(item -> item.getV()).collect(Collectors.toList());
result.setMax(monthValues.stream().max(Double::compareTo).get());
result.setMin(monthValues.stream().min(Double::compareTo).get());
+ }
+ 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);
}
@@ -883,20 +1028,28 @@
}
for (String code : dto.getCodeList()) {
- PowerDemandEntity powerDemand = powerDemandService.getByCode(code);
- if (powerDemand == null) {
+ 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());
- return success(new LinkedHashMap<>());
+ continue;
}
String queryType = dto.getQueryType().toUpperCase();
String pointNo;
switch (queryType.toUpperCase()) {
case "D":
- pointNo = powerDemand.getCurDemand();
+ pointNo = powerNetFactorQuery.getCurDem();
break;
case "P":
- pointNo = powerDemand.getActivePower();
+ pointNo = powerNetFactorQuery.getCurP();
break;
default:
throw new IllegalArgumentException("不支持的queryType: " + queryType);
@@ -955,4 +1108,21 @@
}
return success(result);
}
+
+ @GetMapping("/power-maxDemand/page")
+ @Operation(summary = "负荷移植-最大需量折叠分页列表")
+ public CommonResult<PageResult<PowerMaxDemandMainDTO>> getPowerMaxDemandMainPage(@Validated PowerMaxDemandMainPageReqVO reqVO) {
+ PageResult<PowerMaxDemandMainDTO> page = powerMaxDemandMainService.page(reqVO);
+ List<String> parentIds = page.getList()
+ .stream()
+ .map(PowerMaxDemandMainDTO::getId)
+ .collect(Collectors.toList());
+ List<PowerMaxdemandDetEntity> children = powerMaxdemandDetService.selectListByRelIds(parentIds);
+ Map<String, List<PowerMaxdemandDetEntity>> childrenMap = children.stream()
+ .collect(Collectors.groupingBy(PowerMaxdemandDetEntity::getRelId));
+ page.getList().forEach(
+ dto -> dto.setChildren(childrenMap.getOrDefault(dto.getId(), Collections.emptyList()))
+ );
+ return success(BeanUtils.toBean(page, PowerMaxDemandMainDTO.class));
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3