From 15732a55b862cdc423475f4fb6b45fb8a7b55ed3 Mon Sep 17 00:00:00 2001 From: liriming <1343021927@qq.com> Date: 星期五, 29 十一月 2024 09:02:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleDataConstructor.java | 46 +++++++++++++++++++++------------------------- 1 files changed, 21 insertions(+), 25 deletions(-) diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleDataConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleDataConstructor.java index 34a5900..6b3b291 100644 --- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleDataConstructor.java +++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleDataConstructor.java @@ -39,11 +39,12 @@ * @param endTime * @return */ - public List<DataValueVO> completionData(int length, List<DataValueVO> dataEntityList, Date startTime, Date endTime, String paramId,String paramType) { + public List<DataValueVO> completionData(int length, List<DataValueVO> dataEntityList, Date startTime, Date endTime, + String paramId, String paramType) { if (CollectionUtils.isEmpty(dataEntityList) || length == dataEntityList.size()) { return dataEntityList; - }else if (length < dataEntityList.size()){ - return dataEntityList.subList(dataEntityList.size()-length,dataEntityList.size()); + } else if (length < dataEntityList.size()) { + return dataEntityList.subList(dataEntityList.size() - length, dataEntityList.size()); } List<DataValueVO> completionDataEntityList = new ArrayList<>(); @@ -54,24 +55,24 @@ long mins = 0L; switch (ModelParamType.getEumByCode(paramType)) { - case PREDICTITEM: + case NORMALITEM: + case MERGEITEM: // 预测值 Calendar calendar = Calendar.getInstance(); calendar.setTime(startTime); - calendar.set(Calendar.HOUR_OF_DAY,0); - calendar.set(Calendar.MINUTE,0); - calendar.set(Calendar.SECOND,0); - calendar.add(Calendar.DAY_OF_YEAR,1); + calendar.set(Calendar.HOUR_OF_DAY, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + calendar.add(Calendar.DAY_OF_YEAR, 1); startTime = calendar.getTime(); start = startTime.getTime(); calendar.setTime(endTime); - calendar.set(Calendar.HOUR_OF_DAY,0); - calendar.set(Calendar.MINUTE,0); - calendar.set(Calendar.SECOND,0); + calendar.set(Calendar.HOUR_OF_DAY, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); endTime = calendar.getTime(); end = endTime.getTime(); - oneMin = 24 * 60 * 60 * 1000; mins = ((end - start) / oneMin); @@ -80,12 +81,9 @@ // 测点值 ApiPointDTO dataPoint = dataPointApi.getInfoById(paramId); oneMin = 1000L * DataPointFreqEnum.getEumByCode(dataPoint.getMinfreqid()).getValue(); - // 设置时间偏移量 start = start - (start % oneMin) + oneMin; end = end - (end % oneMin) + oneMin; - - mins = ((end - start) / oneMin); break; case IND: @@ -93,18 +91,16 @@ oneMin = 24 * 60 * 60 * 1000; Calendar calendar2 = Calendar.getInstance(); calendar2.setTime(startTime); - calendar2.set(Calendar.HOUR_OF_DAY,0); - calendar2.set(Calendar.MINUTE,0); - calendar2.set(Calendar.SECOND,0); + calendar2.set(Calendar.HOUR_OF_DAY, 0); + calendar2.set(Calendar.MINUTE, 0); + calendar2.set(Calendar.SECOND, 0); start = calendar2.getTime().getTime(); calendar2.setTime(endTime); - calendar2.set(Calendar.HOUR_OF_DAY,0); - calendar2.set(Calendar.MINUTE,0); - calendar2.set(Calendar.SECOND,0); + calendar2.set(Calendar.HOUR_OF_DAY, 0); + calendar2.set(Calendar.MINUTE, 0); + calendar2.set(Calendar.SECOND, 0); end = calendar2.getTime().getTime(); - - mins = ((end - start) / oneMin); break; default: @@ -117,7 +113,7 @@ //找出缺少项 Map<Long, Double> dataMap = new LinkedHashMap<>(); - for (int i = 0; i < mins; i ++) { + for (int i = 0; i < mins; i++) { Long key = start + oneMin * i; Double value = sourceDataMap.get(key); dataMap.put(key, value); @@ -132,7 +128,7 @@ } else if (item.getValue() == null) { item.setValue(lastItem.getValue()); } - k ++; + k++; lastItem = item; DataValueVO dataEntity = new DataValueVO(); -- Gitblit v1.9.3