From 3997480e0195d39fef4abd0b4bb2a6bd1d80772a Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期五, 09 五月 2025 10:26:36 +0800 Subject: [PATCH] t_power_maxdemand --- ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPowerMaxdemandTask.java | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPowerMaxdemandTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPowerMaxdemandTask.java index 076de83..c44a380 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPowerMaxdemandTask.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPowerMaxdemandTask.java @@ -71,17 +71,18 @@ return; } for (PowerDemandEntity demand : demandList) { - // 查询今天的最大需量 + logger.info("查询今天的最大需量"); ApiPointValueQueryDTO pointValueQuery0 = new ApiPointValueQueryDTO(); pointValueQuery0.setStart(dayStart); pointValueQuery0.setEnd(nowTime); pointValueQuery0.setPointNo(demand.getCurDemand()); Map<String, Object> maxValue = dataPointApi.queryPointMaxValue(pointValueQuery0); - BigDecimal todayMax = BigDecimal.ZERO; - if (CollectionUtils.isEmpty(maxValue) && maxValue.containsKey(demand.getCurDemand())) { - todayMax = new BigDecimal(maxValue.get(demand.getCurDemand()).toString()); + if (CollectionUtils.isEmpty(maxValue)) { + logger.info("maxValue is empty"); + continue; } - + BigDecimal todayMax = new BigDecimal(maxValue.get(demand.getCurDemand()).toString()); + logger.info("todayMax=" + todayMax); List<ApiPointValueDTO> valueList = dataPointApi.queryPointHistoryValue(pointValueQuery0); if (CollectionUtils.isEmpty(valueList)) { logger.info("valueList is empty"); @@ -95,7 +96,7 @@ } } - // 查询本月需量发生记录 + logger.info("查询本月需量发生记录"); BigDecimal monthMax = powerMaxdemandMainService.getMax(demand.getCode(), monStart, nowTime); // 保存记录 @@ -110,7 +111,7 @@ String mainId = powerMaxdemandMainService.add(mainEntity); Map<String, Object> params1 = new HashMap<>(); - params1.put("pCode", demand.getCode()); + params1.put("groupName", demand.getName()); List<PowerNetDropdownEntity> dropdownList = powerNetDropdownService.list(params1); if (CollectionUtils.isEmpty(dropdownList)) { logger.info("dropdownList is empty"); -- Gitblit v1.9.3