From c668dc0d507a260faf56c6c8134ef69d8255b9c2 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期五, 28 二月 2025 09:14:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/service/impl/ArcDataServiceImpl.java | 96 ++++++++++++++++++++++++++---------------------
1 files changed, 53 insertions(+), 43 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/arc/service/impl/ArcDataServiceImpl.java
similarity index 74%
rename from iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/ArcPointDataServiceImpl.java
rename to iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/service/impl/ArcDataServiceImpl.java
index 03907c8..d1dca00 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/arc/service/impl/ArcDataServiceImpl.java
@@ -1,16 +1,18 @@
-package com.iailab.module.data.point.service.impl;
+package com.iailab.module.data.arc.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;
import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
import com.iailab.module.data.common.enums.ArcCalculateTypeEnum;
-import com.iailab.module.data.point.dao.ArcPointDataDao;
-import com.iailab.module.data.point.entity.ArcPointDataEntity;
-import com.iailab.module.data.point.entity.ArcPointSettingEntity;
-import com.iailab.module.data.point.service.ArcPointDataService;
+import com.iailab.module.data.arc.dao.ArcDataDao;
+import com.iailab.module.data.arc.entity.ArcDataEntity;
+import com.iailab.module.data.arc.entity.ArcSettingEntity;
+import com.iailab.module.data.arc.service.ArcDataService;
import com.iailab.module.data.common.enums.ArcTypeEnum;
-import com.iailab.module.data.point.service.ArcPointSettingService;
+import com.iailab.module.data.arc.service.ArcSettingService;
+import com.iailab.module.data.arc.vo.ArcDataPageReqVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -20,13 +22,16 @@
@Service
-public class ArcPointDataServiceImpl extends BaseServiceImpl<ArcPointDataDao, ArcPointDataEntity> implements ArcPointDataService {
+public class ArcDataServiceImpl extends BaseServiceImpl<ArcDataDao, ArcDataEntity> implements ArcDataService {
@Autowired
- private ArcPointSettingService arcPointSettingService;
+ private ArcSettingService arcPointSettingService;
@Autowired
private DataPointApiImpl dataPointApi;
+
+ @Autowired
+ private ArcDataDao arcDataDao;
//根据归档类型进行归档
@Override
@@ -36,7 +41,7 @@
switch (ArcTypeEnum.getEumByCode(type)) {
case HOUR:
//查询对应类型的归档设置列表
- List<ArcPointSettingEntity> arcHourList = arcPointSettingService.list(params);
+ List<ArcSettingEntity> arcHourList = arcPointSettingService.list(params);
//遍历列表
arcHourList.forEach(item -> {
log.debug("开始归档，point："+item.getPoint());
@@ -55,18 +60,18 @@
//归档
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH");
String arcTime = dateFormat.format(startTime);
- ArcPointDataEntity arcPointDataEntity = new ArcPointDataEntity();
- arcPointDataEntity.setId(String.valueOf(new Date().getTime()));
- arcPointDataEntity.setArcTime(arcTime);
- arcPointDataEntity.setArcId(item.getId());
- arcPointDataEntity.setValue(String.valueOf(value));
- insert(arcPointDataEntity);
+ ArcDataEntity arcDataEntity = new ArcDataEntity();
+ arcDataEntity.setId(String.valueOf(new Date().getTime()));
+ arcDataEntity.setArcTime(arcTime);
+ arcDataEntity.setArcId(item.getId());
+ arcDataEntity.setArcValue(value);
+ insert(arcDataEntity);
log.debug("归档完成，point："+item.getPoint());
});
break;
case SHIFT:
//查询对应类型的归档设置列表
- List<ArcPointSettingEntity> arcShiftList = arcPointSettingService.list(params);
+ List<ArcSettingEntity> arcShiftList = arcPointSettingService.list(params);
//遍历列表
arcShiftList.forEach(item -> {
log.debug("开始归档，point："+item.getPoint());
@@ -85,18 +90,18 @@
//归档
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH");
String arcTime = dateFormat.format(startTime);
- ArcPointDataEntity arcPointDataEntity = new ArcPointDataEntity();
- arcPointDataEntity.setId(String.valueOf(new Date().getTime()));
- arcPointDataEntity.setArcTime(arcTime);
- arcPointDataEntity.setArcId(item.getId());
- arcPointDataEntity.setValue(String.valueOf(value));
- insert(arcPointDataEntity);
+ ArcDataEntity arcDataEntity = new ArcDataEntity();
+ arcDataEntity.setId(String.valueOf(new Date().getTime()));
+ arcDataEntity.setArcTime(arcTime);
+ arcDataEntity.setArcId(item.getId());
+ arcDataEntity.setArcValue(value);
+ insert(arcDataEntity);
log.debug("归档完成，point："+item.getPoint());
});
break;
case DAY:
//查询对应类型的归档设置列表
- List<ArcPointSettingEntity> arcDayList = arcPointSettingService.list(params);
+ List<ArcSettingEntity> arcDayList = arcPointSettingService.list(params);
//遍历列表
arcDayList.forEach(item -> {
log.debug("开始归档，point："+item.getPoint());
@@ -115,18 +120,18 @@
//归档
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
String arcTime = dateFormat.format(startTime);
- ArcPointDataEntity arcPointDataEntity = new ArcPointDataEntity();
- arcPointDataEntity.setId(String.valueOf(new Date().getTime()));
- arcPointDataEntity.setArcTime(arcTime);
- arcPointDataEntity.setArcId(item.getId());
- arcPointDataEntity.setValue(String.valueOf(value));
- insert(arcPointDataEntity);
+ ArcDataEntity arcDataEntity = new ArcDataEntity();
+ arcDataEntity.setId(String.valueOf(new Date().getTime()));
+ arcDataEntity.setArcTime(arcTime);
+ arcDataEntity.setArcId(item.getId());
+ arcDataEntity.setArcValue(value);
+ insert(arcDataEntity);
log.debug("归档完成，point："+item.getPoint());
});
break;
case MONTH:
//查询对应类型的归档设置列表
- List<ArcPointSettingEntity> arcMonthList = arcPointSettingService.list(params);
+ List<ArcSettingEntity> arcMonthList = arcPointSettingService.list(params);
//遍历列表
arcMonthList.forEach(item -> {
log.debug("开始归档，point："+item.getPoint());
@@ -145,18 +150,18 @@
//归档
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM");
String arcTime = dateFormat.format(startTime);
- ArcPointDataEntity arcPointDataEntity = new ArcPointDataEntity();
- arcPointDataEntity.setId(String.valueOf(new Date().getTime()));
- arcPointDataEntity.setArcTime(arcTime);
- arcPointDataEntity.setArcId(item.getId());
- arcPointDataEntity.setValue(String.valueOf(value));
- insert(arcPointDataEntity);
+ ArcDataEntity arcDataEntity = new ArcDataEntity();
+ arcDataEntity.setId(String.valueOf(new Date().getTime()));
+ arcDataEntity.setArcTime(arcTime);
+ arcDataEntity.setArcId(item.getId());
+ arcDataEntity.setArcValue(value);
+ insert(arcDataEntity);
log.debug("归档完成，point："+item.getPoint());
});
break;
case YEAR:
//查询对应类型的归档设置列表
- List<ArcPointSettingEntity> arcYearList = arcPointSettingService.list(params);
+ List<ArcSettingEntity> arcYearList = arcPointSettingService.list(params);
//遍历列表
arcYearList.forEach(item -> {
log.debug("开始归档，point："+item.getPoint());
@@ -175,12 +180,12 @@
//归档
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy");
String arcTime = dateFormat.format(startTime);
- ArcPointDataEntity arcPointDataEntity = new ArcPointDataEntity();
- arcPointDataEntity.setId(String.valueOf(new Date().getTime()));
- arcPointDataEntity.setArcTime(arcTime);
- arcPointDataEntity.setArcId(item.getId());
- arcPointDataEntity.setValue(String.valueOf(value));
- insert(arcPointDataEntity);
+ ArcDataEntity arcDataEntity = new ArcDataEntity();
+ arcDataEntity.setId(String.valueOf(new Date().getTime()));
+ arcDataEntity.setArcTime(arcTime);
+ arcDataEntity.setArcId(item.getId());
+ arcDataEntity.setArcValue(value);
+ insert(arcDataEntity);
log.debug("归档完成，point："+item.getPoint());
});
break;
@@ -228,4 +233,9 @@
}
return value;
}
+
+ @Override
+ public PageResult<ArcDataEntity> queryPage(ArcDataPageReqVO reqVO) {
+ return arcDataDao.selectPage(reqVO);
+ }
}
--
Gitblit v1.9.3