From 266448b4c6380ceb4ef025c196114e32381b3bf0 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期一, 12 五月 2025 13:13:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 155 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 102 insertions(+), 53 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 e3c8a2e..116fa6d 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;
@@ -79,6 +90,11 @@
@Autowired
private PowerVoltageStatusService powerVoltageStatusService;
+
+ @Autowired
+ private PowerMaxdemandMainService powerMaxDemandMainService;
+ @Autowired
+ private PowerMaxdemandDetService powerMaxdemandDetService;
@GetMapping("/net-factor/list")
@Operation(summary = "功率因数-电网拓扑")
@@ -456,14 +472,14 @@
}
@GetMapping("/control-main/list")
- @Operation(summary = "功率因数-管控变电站列表")
+ @Operation(summary = "功率因数-管控变电站列表(已废弃)")
public CommonResult<List<PowerControlMainDTO>> getPowerControlMainList(@RequestParam Map<String, Object> params) {
List<PowerControlMainEntity> list = powerControlMainService.list(params);
return success(ConvertUtils.sourceToTarget(list, PowerControlMainDTO.class));
}
@PostMapping("/control-main/update")
- @Operation(summary = "功率因数-管控变电站修改上下限")
+ @Operation(summary = "功率因数-管控变电站修改上下限(已废弃)")
public CommonResult<Boolean> updatePowerControlMain(@RequestBody PowerControlMainDTO dto) {
if (StringUtils.isBlank(dto.getId())) {
return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST);
@@ -477,7 +493,7 @@
}
@GetMapping("/control-det/list")
- @Operation(summary = "功率因数-管控功率因数详情")
+ @Operation(summary = "功率因数-管控功率因数详情(已废弃)")
public CommonResult<List<PowerControlDetDTO>> getPowerControlDetList(@RequestParam Map<String, Object> params) {
List<PowerControlDetDTO> result = new ArrayList<>();
String name = (String) params.get("name");
@@ -492,18 +508,13 @@
result = ConvertUtils.sourceToTarget(list, PowerControlDetDTO.class);
result.forEach(item -> {
- // 设置随机数据，0.8左右
- Random rand = new Random();
- int min = 700;
- int max = 900;
- int randomNumber = rand.nextInt(max - min + 1) + min;
- BigDecimal rv = new BigDecimal(randomNumber * 0.001).setScale(4, BigDecimal.ROUND_HALF_UP);
+ /*BigDecimal rv = new BigDecimal(randomNumber * 0.001).setScale(4, BigDecimal.ROUND_HALF_UP);
item.setValue(rv);
if (item.getLimitL() != null && rv.compareTo(item.getLimitL()) < 0) {
item.setStatus(1);
} else {
item.setStatus(0);
- }
+ }*/
});
return success(result);
}
@@ -594,11 +605,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())) {
@@ -609,25 +621,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 {
@@ -643,19 +672,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);
@@ -667,7 +684,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");
@@ -675,28 +692,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);
}
}
@@ -999,7 +1023,7 @@
}
for (String code : dto.getCodeList()) {
- PowerNetFactorQuery powerNetFactorQuery = null;
+ PowerNetFactorQuery powerNetFactorQuery = new PowerNetFactorQuery();
PowerDemandEntity powerDemandEntity = powerDemandService.getByCode(code);
PowerNetDropdownEntity powerNetDropdownEntity = powerNetDropdownService.getByNodeCode(code);
if (powerDemandEntity != null) {
@@ -1079,4 +1103,29 @@
}
return success(result);
}
+
+ @GetMapping("/power-maxdemand/page")
+ @Operation(summary = "负荷移植-最大需量发生记录分页")
+ public CommonResult<PageResult<PowerMaxDemandMainDTO>> getPowerMaxDemandMainPage(@Validated PowerMaxDemandMainPageReqVO reqVO) {
+ PageResult<PowerMaxdemandMainEntity> page = powerMaxDemandMainService.page(reqVO);
+ PageResult<PowerMaxDemandMainDTO> result = BeanUtils.toBean(page, PowerMaxDemandMainDTO.class);
+ /*List<String> parentIds = result.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));*/
+ result.getList().forEach(dto0 -> {
+ List<PowerMaxdemandDetEntity> detList0 = powerMaxdemandDetService.selectListByRelId(dto0.getId(), dto0.getOccurTime());
+ dto0.setChildren(ConvertUtils.sourceToTarget(detList0, PowerMaxdemandDetDTO.class));
+ if (CollectionUtils.isEmpty(dto0.getChildren())) {
+ dto0.getChildren().forEach(dto1 -> {
+ List<PowerMaxdemandDetEntity> detList1 = powerMaxdemandDetService.selectListByRelId(dto1.getId(), dto1.getOccurTime());
+ dto1.setChildren(ConvertUtils.sourceToTarget(detList1, PowerMaxdemandDetDTO.class));
+ });
+ }
+ });
+ return success(result);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3