From 15234416214389224cf5ca45a481108b5e345c97 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 11 六月 2025 08:58:06 +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 | 264 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 228 insertions(+), 36 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 689ea5f..eaee015 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
@@ -1,24 +1,20 @@
package com.iailab.module.ansteel.api.controller.admin;
-import cn.hutool.core.util.NumberUtil;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.framework.common.exception.ErrorCode;
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.PowerCapacitorHisPageReqVO;
import com.iailab.module.ansteel.api.vo.PowerMaxDemandMainPageReqVO;
+import com.iailab.module.ansteel.common.constant.CommonConstant;
+import com.iailab.module.ansteel.common.enums.TransferTypeEnum;
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.common.utils.PowerUtil;
import com.iailab.module.ansteel.power.entity.*;
import com.iailab.module.ansteel.power.service.*;
import com.iailab.module.data.api.point.DataPointApi;
@@ -26,18 +22,23 @@
import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
import com.iailab.module.data.api.point.dto.ApiPointsValueQueryDTO;
import com.iailab.module.model.api.mcs.McsApi;
+import com.iailab.module.model.api.mcs.dto.ChartParamDTO;
import com.iailab.module.model.api.mcs.dto.PredictLastValueReqVO;
+import com.iailab.module.model.api.mdk.MdkApi;
+import com.iailab.module.model.api.mdk.dto.MdkScheduleReqDTO;
+import com.iailab.module.model.api.mdk.dto.MdkScheduleRespDTO;
import io.swagger.v3.oas.annotations.Operation;
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.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
+import java.lang.reflect.Array;
import java.math.BigDecimal;
import java.util.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
import static com.iailab.framework.common.pojo.CommonResult.error;
@@ -83,6 +84,9 @@
private McsApi mcsApi;
@Autowired
+ private MdkApi mdkApi;
+
+ @Autowired
private PowerCapacitorHisService powerCapacitorHisService;
@Autowired
@@ -100,9 +104,17 @@
@Autowired
private PowerMaxdemandDetService powerMaxdemandDetService;
+ @Autowired
+ private PowerPriceMainService powerPriceMainService;
+
+ @Autowired
+ private PowerFactorControlService powerFactorControlService;
+
public static final String VALUE = "value";
public static final String TIME = "time";
+
+ private String pointNo = "F0000201825";
@GetMapping("/net-factor/list")
@Operation(summary = "功率因数-电网拓扑")
@@ -239,6 +251,32 @@
powerNetFactorDTO.setQstatus(1);
}
}
+
+ // 日功率因数
+ if (StringUtils.isNotBlank(entity.getPDay()) && StringUtils.isNotBlank(entity.getQDay())) {
+ List<String> pointNos = new ArrayList<>();
+ pointNos.add(entity.getPDay());
+ pointNos.add(entity.getQDay());
+ Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(pointNos);
+ if (!CollectionUtils.isEmpty(pointsRealValue)) {
+ double pValue = new BigDecimal(pointsRealValue.get(entity.getPDay()).toString()).doubleValue();
+ double qValue = new BigDecimal(pointsRealValue.get(entity.getQDay()).toString()).doubleValue();
+ powerNetFactorDTO.setDayCos(new BigDecimal(PowerUtil.calculateCos(pValue, qValue)).setScale(2, BigDecimal.ROUND_HALF_UP));
+ }
+ }
+
+ // 月功率因数
+ if (StringUtils.isNotBlank(entity.getPMon()) && StringUtils.isNotBlank(entity.getQMon())) {
+ List<String> pointNos = new ArrayList<>();
+ pointNos.add(entity.getPMon());
+ pointNos.add(entity.getQMon());
+ Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(pointNos);
+ if (!CollectionUtils.isEmpty(pointsRealValue)) {
+ double pValue = new BigDecimal(pointsRealValue.get(entity.getPMon()).toString()).doubleValue();
+ double qValue = new BigDecimal(pointsRealValue.get(entity.getQMon()).toString()).doubleValue();
+ powerNetFactorDTO.setMonthCos(new BigDecimal(PowerUtil.calculateCos(pValue, qValue)).setScale(2, BigDecimal.ROUND_HALF_UP));
+ }
+ }
result.add(powerNetFactorDTO);
}
return success(result);
@@ -335,28 +373,41 @@
@GetMapping("/gen-status/list")
@Operation(summary = "功率因数-发电机组实时状态")
public CommonResult<List<PowerGenStatusDTO>> getPowerGenStatusList(@RequestParam Map<String, Object> params) {
+ List<PowerGenStatusDTO> result = new ArrayList<>();
List<PowerGenStatusEntity> list = powerGenStatusDaoService.list(params);
- List<PowerGenStatusDTO> result = ConvertUtils.sourceToTarget(list, PowerGenStatusDTO.class);
- if (CollectionUtils.isEmpty(result)) {
+ if (CollectionUtils.isEmpty(list)) {
return success(result);
}
- for (PowerGenStatusDTO dto : result) {
+ for (PowerGenStatusEntity entity : list) {
+ PowerGenStatusDTO dto = new PowerGenStatusDTO();
+ dto.setId(entity.getId());
+ dto.setName(entity.getName());
+ dto.setSort(entity.getSort());
+
List<String> points = new ArrayList<>();
- if (StringUtils.isNotBlank(dto.getCurP())) {
- points.add(dto.getCurP());
+ if (StringUtils.isNotBlank(entity.getCurP())) {
+ points.add(entity.getCurP());
}
- if (StringUtils.isNotBlank(dto.getCurQ())) {
- points.add(dto.getCurQ());
+ if (StringUtils.isNotBlank(entity.getCurQ())) {
+ points.add(entity.getCurQ());
+ }
+ if (StringUtils.isNotBlank(entity.getCurCos())) {
+ points.add(entity.getCurCos());
}
if (!CollectionUtils.isEmpty(points)) {
Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
- if (pointsRealValue.get(dto.getCurP()) != null) {
- dto.setCurP(pointsRealValue.get(dto.getCurP()).toString());
+ if (pointsRealValue.get(entity.getCurP()) != null) {
+ dto.setCurP(new BigDecimal(pointsRealValue.get(entity.getCurP()).toString()));
}
- if (pointsRealValue.get(dto.getCurQ()) != null) {
- dto.setCurQ(pointsRealValue.get(dto.getCurQ()).toString());
+ if (pointsRealValue.get(entity.getCurQ()) != null) {
+ dto.setCurQ(new BigDecimal(pointsRealValue.get(entity.getCurQ()).toString()));
+ }
+ if (pointsRealValue.get(entity.getCurCos()) != null) {
+ dto.setCurCos(new BigDecimal(pointsRealValue.get(entity.getCurCos()).toString()));
}
}
+
+ result.add(dto);
}
return success(result);
@@ -478,9 +529,11 @@
if (pv.compareTo(BigDecimal.ZERO) <= 0) {
continue;
}
- onCount ++;
+ onCount++;
}
dto.setOnCount(onCount);
+ String remark = String.format("共%d台，在投%d台", DecimalUtil.toBigDecimal(entity.getMainCount()).intValue(), onCount);
+ dto.setRemark(remark);
result.add(dto);
}
return success(result);
@@ -638,7 +691,7 @@
}
if (!StringUtils.isEmpty(entity.getMaxDemand())) {
- ApiPointValueQueryDTO apiPointValueQueryDTO = new ApiPointValueQueryDTO();
+ /*ApiPointValueQueryDTO apiPointValueQueryDTO = new ApiPointValueQueryDTO();
apiPointValueQueryDTO.setStart(start);
apiPointValueQueryDTO.setEnd(end);
apiPointValueQueryDTO.setPointNo(entity.getMaxDemand());
@@ -646,6 +699,11 @@
if (maxValue != null) {
demandDTO.setMaxDemand(new BigDecimal(maxValue.get(VALUE).toString()));
demandDTO.setOccurTime(DateUtils.parse( maxValue.get(TIME).toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ }*/
+ PowerMaxdemandMainEntity maxdemandMainEntity = powerMaxDemandMainService.getMonthMax(entity.getCode(), start);
+ if (maxdemandMainEntity != null) {
+ demandDTO.setMaxDemand(maxdemandMainEntity.getMaxDemand());
+ demandDTO.setOccurTime(maxdemandMainEntity.getOccurTime());
}
}
result.add(demandDTO);
@@ -727,7 +785,7 @@
pointNos.add(netDropdown.getExt1());
}
}
- for(PowerNetDropdownEntity netDropdown : dropdownList) {
+ for (PowerNetDropdownEntity netDropdown : dropdownList) {
PowerDemandQueryRespDTO dto = ConvertUtils.sourceToTarget(netDropdown, PowerDemandQueryRespDTO.class);
dto.setCurDemand(null);
result.add(dto);
@@ -770,7 +828,7 @@
log.info("pointsHisValues is null");
return success(result);
}
- for(PowerDemandQueryRespDTO respDTO : result) {
+ for (PowerDemandQueryRespDTO respDTO : result) {
if (StringUtils.isBlank(demandPointMap.get(respDTO.getNodeCode()))) {
continue;
}
@@ -780,7 +838,7 @@
}
Map<String, Object> valueMap = hisList.get(hisList.size() - 1);
respDTO.setDataTime(DateUtils.parse(valueMap.get("time").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
- respDTO.setCurDemand( DecimalUtil.toBigDecimal(valueMap.get("value")));
+ respDTO.setCurDemand(DecimalUtil.toBigDecimal(valueMap.get("value")));
}
return success(result);
}
@@ -886,16 +944,10 @@
calendar0.set(Calendar.MILLISECOND, 0);
calendar0.set(Calendar.SECOND, 0);
Date end0 = dto.getEndTime() == null ? calendar0.getTime() : dto.getEndTime();
- calendar0.add(Calendar.MINUTE, -1440);
+ calendar0.set(Calendar.MINUTE, 0);
+ calendar0.set(Calendar.HOUR_OF_DAY, 0);
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) {
@@ -936,16 +988,18 @@
apiPointValueQueryDTO.setStart(start0);
List<ApiPointValueDTO> chartData = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
List<Object[]> dataList = new ArrayList<>();
+ List<Double> valueList = 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);
+ valueList.add(pv.getV());
}
powerHistoryDTO.setDataList(dataList);
//查询月最大最小值
- ApiPointValueQueryDTO apiPointValueQueryDTO1 = new ApiPointValueQueryDTO();
+ /*ApiPointValueQueryDTO apiPointValueQueryDTO1 = new ApiPointValueQueryDTO();
apiPointValueQueryDTO1.setStart(start1);
apiPointValueQueryDTO1.setEnd(new Date());
apiPointValueQueryDTO1.setPointNo(pointNo);
@@ -956,7 +1010,28 @@
}
if (minV != null && minV.containsKey(pointNo)) {
powerHistoryDTO.setMin(new BigDecimal(minV.get(pointNo).toString()));
+ }*/
+
+ double fsl = 0;
+ double max = 0;
+ double min = 0;
+ double avg = 0;
+ if (!CollectionUtils.isEmpty(valueList)) {
+ max = valueList.stream().mapToDouble(Double::doubleValue).max().getAsDouble();
+ min = valueList.stream().mapToDouble(Double::doubleValue).min().getAsDouble();
+ avg = valueList.stream().mapToDouble(Double::doubleValue).average().getAsDouble();
+
+ for (Double val : valueList) {
+ if (val < 0) {
+ fsl += val;
+ }
+ }
}
+ powerHistoryDTO.setFsl(new BigDecimal(fsl).setScale(2, BigDecimal.ROUND_HALF_UP));
+ powerHistoryDTO.setMax(new BigDecimal(max).setScale(2, BigDecimal.ROUND_HALF_UP));
+ powerHistoryDTO.setMin(new BigDecimal(min).setScale(2, BigDecimal.ROUND_HALF_UP));
+ powerHistoryDTO.setAvg(new BigDecimal(avg).setScale(2, BigDecimal.ROUND_HALF_UP));
+
result.put(nodeCode, powerHistoryDTO);
}
return success(result);
@@ -1213,7 +1288,7 @@
@PostMapping("/power-maxdemand/det-list")
@Operation(summary = "负荷移植-最大需量发生记录详情")
- public CommonResult<List<PowerMaxdemandDetDTO>> getPowerMaxDemandDetList(@RequestParam Map<String, Object> params) {
+ public CommonResult<List<PowerMaxdemandDetDTO>> getPowerMaxDemandDetList(@RequestBody Map<String, Object> params) {
String relId = (String) params.get("relId");
if (StringUtils.isBlank(relId)) {
return error(GlobalErrorCodeConstants.BAD_REQUEST);
@@ -1221,4 +1296,121 @@
List<PowerMaxdemandDetEntity> list = powerMaxdemandDetService.selectListByRelId(relId);
return success(ConvertUtils.sourceToTarget(list, PowerMaxdemandDetDTO.class));
}
+
+ @GetMapping("/power-price/list")
+ @Operation(summary = "获取峰谷平电价信息")
+ public CommonResult<List<PowerPriceMainDTO>> getPowerPriceList(@RequestParam Map<String, Object> params) {
+ List<PowerPriceMainDTO> result = powerPriceMainService.list(params);
+ return success(result);
+ }
+
+ @PostMapping("/power-price/save")
+ @Operation(summary = "保存峰谷平电价信息")
+ public CommonResult<Boolean> savePowerPriceList(@RequestBody PowerPriceMainDTO mainDTO) {
+ return success(powerPriceMainService.save(mainDTO));
+ }
+
+ @PostMapping("/power-price/update")
+ @Operation(summary = "修改峰谷平电价信息")
+ public CommonResult<Boolean> updatePowerPriceList(@RequestBody PowerPriceMainDTO mainDTO) {
+ if (StringUtils.isBlank(mainDTO.getId())) {
+ return error(GlobalErrorCodeConstants.BAD_REQUEST);
+ }
+ return success(powerPriceMainService.update(mainDTO));
+ }
+
+ @PostMapping("/factor-control/list")
+ @Operation(summary = "功率因数管控")
+ public CommonResult<List<PowerFactorControlDTO>> powerFactorControlList(@RequestBody PowerFactorReqVO powerFactorReqVO) {
+ Map<String, Object> chartMap = new HashMap<>();
+ List<ChartParamDTO> chartList = mcsApi.getChartParamList(CommonConstant.POWER_CODE);
+ chartList.forEach(item -> {
+ chartMap.put(item.getParamName(), item.getParamCode());
+ });
+ List<String> contentList = powerFactorReqVO.getContentList();
+ if (CollectionUtils.isEmpty(contentList)) {
+ log.info("contentList为空");
+ return new CommonResult<>();
+ }
+ List<Integer> contentListNew = new ArrayList<>();
+ contentList.forEach(item -> {
+ chartMap.forEach((key, value) -> {
+ if (item.contains(key)) {
+ contentListNew.add(Integer.parseInt(value.toString()));
+ }
+ });
+ });
+
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.MILLISECOND, 0);
+ calendar.set(Calendar.SECOND, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ MdkScheduleReqDTO dto = new MdkScheduleReqDTO();
+ dto.setScheduleTime(calendar.getTime());
+ dto.setScheduleCode("AnsteelOffPowerAC");
+ Map<String, String> dynamicSettings = new HashMap<>();
+ dynamicSettings.put("option_param", JSONArray.toJSONString(contentListNew.stream().toArray(Integer[]::new)));
+ dynamicSettings.put("cos_param", JSONArray.toJSONString(powerFactorReqVO.getAdjustValueList().stream().toArray(String[]::new)));
+ dto.setDynamicSettings(dynamicSettings);
+
+ log.info("调度方案开始执行，" + JSONObject.toJSONString(dto));
+ MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(dto);
+ log.info("调度方案执行完成，" + mdkScheduleRespDTO);
+
+ String statusCode = mdkScheduleRespDTO.getStatusCode();
+ if (!CommonConstant.MDK_STATUS_100.equals(statusCode)) {
+ log.info("statusCode=" + statusCode);
+ return CommonResult.error(GlobalErrorCodeConstants.UNKNOWN.getCode(), "工序异常，无计算结果");
+ }
+
+ Map<String, Object> data = mdkScheduleRespDTO.getResult();
+ List<String> adjustCosList = Arrays.asList(data.get("adjust_cos").toString().split(","));//管控结果
+
+ PowerFactorControlDTO powerFactorControlDTO = new PowerFactorControlDTO();
+ List<PowerFactorControlDTO> result = new ArrayList<>();
+ List<PowerFactorControlDTO> list = powerFactorControlService.list(powerFactorControlDTO);
+ if (CollectionUtils.isEmpty(list)) {
+ log.info("list is empty");
+ return success(result);
+ }
+
+ for (int i = 0; i < list.size(); i++) {
+ PowerFactorControlDTO controlDTO = list.get(i);
+ try {
+ PredictLastValueReqVO reqVO = new PredictLastValueReqVO();
+ reqVO.setPredictTime(calendar.getTime());
+ List<String[]> itemNos = new ArrayList<>();
+ if (StringUtils.isNotBlank(controlDTO.getPredResult())) {
+ itemNos.add(controlDTO.getPredResult().split(","));
+ }
+ if (!CollectionUtils.isEmpty(itemNos)) {
+ reqVO.setItemNos(itemNos);
+ log.info("reqVO=" + JSONObject.toJSONString(reqVO));
+ Map<String, BigDecimal> preValues = mcsApi.getPredictValueByTime(reqVO);
+ if (!ObjectUtils.isEmpty(preValues.get(controlDTO.getPredResult()))) {
+ controlDTO.setPredResult(preValues.get(controlDTO.getPredResult()).toString());
+ }
+ }
+ controlDTO.setAdjustCos(adjustCosList.get(i));
+
+ } catch (Exception ex) {
+ log.info(controlDTO.getName() + "获取预测值异常," + ex.getMessage());
+ ex.printStackTrace();
+ }
+ result.add(controlDTO);
+ }
+
+ List<String> points = new ArrayList<>();
+ points.add(pointNo);
+ Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
+
+ PowerFactorControlDTO controlDTO = new PowerFactorControlDTO();
+ controlDTO.setName("望铁关口最大无功倒送量");
+ controlDTO.setPredResult(pointsRealValue.get(pointNo).toString());
+ controlDTO.setAdjustCos(data.get("back_wugong_buchang").toString());
+ controlDTO.setSort(list.size() + 1);
+ result.add(controlDTO);
+ log.info("result===" + JSONObject.toJSONString(result));
+ return success(result);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3