From 9a4d5981d798bc93042b247837e0e8209ff298b3 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 25 二月 2025 15:05:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/ArcPointDataServiceImpl.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/ArcPointDataServiceImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/ArcPointDataServiceImpl.java
index c695f29..cd5b092 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/ArcPointDataServiceImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/ArcPointDataServiceImpl.java
@@ -1,5 +1,6 @@
package com.iailab.module.data.point.service.impl;
+import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.service.impl.BaseServiceImpl;
import com.iailab.module.data.api.point.DataPointApiImpl;
import com.iailab.module.data.api.point.dto.ApiPointValueDTO;
@@ -11,15 +12,14 @@
import com.iailab.module.data.point.service.ArcPointDataService;
import com.iailab.module.data.common.enums.ArcTypeEnum;
import com.iailab.module.data.point.service.ArcPointSettingService;
+import com.iailab.module.data.point.vo.ArcPointDataPageReqVO;
+import com.iailab.module.data.point.vo.ArcPointSettingPageReqVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
@Service
@@ -31,13 +31,18 @@
@Autowired
private DataPointApiImpl dataPointApi;
+ @Autowired
+ private ArcPointDataDao arcPointDataDao;
+
//根据归档类型进行归档
@Override
public void archiving(String type) {
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put("type", type);
switch (ArcTypeEnum.getEumByCode(type)) {
case HOUR:
//查询对应类型的归档设置列表
- List<ArcPointSettingEntity> arcHourList = arcPointSettingService.getListByType(ArcTypeEnum.HOUR.getCode());
+ List<ArcPointSettingEntity> arcHourList = arcPointSettingService.list(params);
//遍历列表
arcHourList.forEach(item -> {
log.debug("开始归档，point："+item.getPoint());
@@ -67,7 +72,7 @@
break;
case SHIFT:
//查询对应类型的归档设置列表
- List<ArcPointSettingEntity> arcShiftList = arcPointSettingService.getListByType(ArcTypeEnum.SHIFT.getCode());
+ List<ArcPointSettingEntity> arcShiftList = arcPointSettingService.list(params);
//遍历列表
arcShiftList.forEach(item -> {
log.debug("开始归档，point："+item.getPoint());
@@ -97,7 +102,7 @@
break;
case DAY:
//查询对应类型的归档设置列表
- List<ArcPointSettingEntity> arcDayList = arcPointSettingService.getListByType(ArcTypeEnum.DAY.getCode());
+ List<ArcPointSettingEntity> arcDayList = arcPointSettingService.list(params);
//遍历列表
arcDayList.forEach(item -> {
log.debug("开始归档，point："+item.getPoint());
@@ -127,7 +132,7 @@
break;
case MONTH:
//查询对应类型的归档设置列表
- List<ArcPointSettingEntity> arcMonthList = arcPointSettingService.getListByType(ArcTypeEnum.MONTH.getCode());
+ List<ArcPointSettingEntity> arcMonthList = arcPointSettingService.list(params);
//遍历列表
arcMonthList.forEach(item -> {
log.debug("开始归档，point："+item.getPoint());
@@ -157,7 +162,7 @@
break;
case YEAR:
//查询对应类型的归档设置列表
- List<ArcPointSettingEntity> arcYearList = arcPointSettingService.getListByType(ArcTypeEnum.YEAR.getCode());
+ List<ArcPointSettingEntity> arcYearList = arcPointSettingService.list(params);
//遍历列表
arcYearList.forEach(item -> {
log.debug("开始归档，point："+item.getPoint());
@@ -229,4 +234,9 @@
}
return value;
}
+
+ @Override
+ public PageResult<ArcPointDataEntity> queryPage(ArcPointDataPageReqVO reqVO) {
+ return arcPointDataDao.selectPage(reqVO);
+ }
}
--
Gitblit v1.9.3