From 153763807debc575d0ee05e8db7d9ad20a58071b Mon Sep 17 00:00:00 2001 From: dengzedong <dengzedong@email> Date: 星期五, 17 一月 2025 17:34:47 +0800 Subject: [PATCH] 电力页面数据绑定接口: 调度模型最新结果查询 动态limit 查询时间范围内预测结果 --- iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java index 6fa52c5..d2ba7ba 100644 --- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java +++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java @@ -98,15 +98,8 @@ if (reqDTO.getModuleType() == null) { throw new Exception("ModuleType不能为空"); } - Calendar calendar = Calendar.getInstance(); - calendar.setTime(reqDTO.getPredictTime()); - calendar.set(Calendar.MILLISECOND, 0); - calendar.set(Calendar.SECOND, 0); - reqDTO.setPredictTime(calendar.getTime()); + log.info("预测参数:" + JSON.toJSONString(reqDTO)); - MdkPredictModuleRespDTO result = new MdkPredictModuleRespDTO(); - result.setPredictTime(reqDTO.getPredictTime()); - result.setModuleType(reqDTO.getModuleType()); List<DmModuleEntity> moduleList = dmModuleService.getModuleByModuleType(reqDTO.getModuleType()); log.info("预测计算开始: " + System.currentTimeMillis()); for (DmModuleEntity module : moduleList) { @@ -249,13 +242,19 @@ @Override public MdkScheduleRespDTO runSchedule(MdkScheduleReqDTO reqDTO) { MdkScheduleRespDTO resp = new MdkScheduleRespDTO(); + if (reqDTO.getScheduleTime() == null) { + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.MILLISECOND, 0); + calendar.set(Calendar.SECOND, 0); + reqDTO.setScheduleTime(calendar.getTime()); + } resp.setScheduleCode(reqDTO.getScheduleCode()); resp.setScheduleTime(reqDTO.getScheduleTime()); String catchKey = "ScheduleResult:" + reqDTO.getScheduleCode(); try { if (redisTemplate.hasKey(catchKey)) { log.info("查找调度结果缓存: " + catchKey); - return JSON.parseObject(JSONObject.toJSONString(redisTemplate.opsForValue().get(catchKey)), MdkScheduleRespDTO.class); + return JSON.parseObject(redisTemplate.opsForValue().get(catchKey).toString(), MdkScheduleRespDTO.class); } log.info("调度计算开始: " + System.currentTimeMillis()); log.info("reqDTO=" + JSON.toJSONString(reqDTO)); -- Gitblit v1.9.3