iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/service/impl/ArcDataServiceImpl.java

@@ -2,6 +2,8 @@

import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.service.impl.BaseServiceImpl;
import com.iailab.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.iailab.framework.mybatis.core.query.QueryWrapperX;
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;
@@ -65,6 +67,10 @@
                    arcDataEntity.setArcTime(arcTime);
                    arcDataEntity.setArcId(item.getId());
                    arcDataEntity.setArcValue(value);
                    arcDataDao.delete(new LambdaQueryWrapperX<ArcDataEntity>()
                            .eq(ArcDataEntity::getArcId, arcDataEntity.getArcId())
                            .eq(ArcDataEntity::getArcTime, arcDataEntity.getArcId())
                    );
                    insert(arcDataEntity);
                    log.debug("归档完成，point："+item.getPoint());
                });
@@ -95,6 +101,10 @@
                    arcDataEntity.setArcTime(arcTime);
                    arcDataEntity.setArcId(item.getId());
                    arcDataEntity.setArcValue(value);
                    arcDataDao.delete(new LambdaQueryWrapperX<ArcDataEntity>()
                            .eq(ArcDataEntity::getArcId, arcDataEntity.getArcId())
                            .eq(ArcDataEntity::getArcTime, arcDataEntity.getArcId())
                    );
                    insert(arcDataEntity);
                    log.debug("归档完成，point："+item.getPoint());
                });
@@ -125,6 +135,12 @@
                    arcDataEntity.setArcTime(arcTime);
                    arcDataEntity.setArcId(item.getId());
                    arcDataEntity.setArcValue(value);
                    arcDataEntity.setCode(item.getCode());
                    arcDataEntity.setCreateTime(new Date());
                    arcDataDao.delete(new LambdaQueryWrapperX<ArcDataEntity>()
                            .eq(ArcDataEntity::getArcId, arcDataEntity.getArcId())
                            .eq(ArcDataEntity::getArcTime, arcDataEntity.getArcId())
                    );
                    insert(arcDataEntity);
                    log.debug("归档完成，point："+item.getPoint());
                });
@@ -155,6 +171,12 @@
                    arcDataEntity.setArcTime(arcTime);
                    arcDataEntity.setArcId(item.getId());
                    arcDataEntity.setArcValue(value);
                    arcDataEntity.setCode(item.getCode());
                    arcDataEntity.setCreateTime(new Date());
                    arcDataDao.delete(new LambdaQueryWrapperX<ArcDataEntity>()
                            .eq(ArcDataEntity::getArcId, arcDataEntity.getArcId())
                            .eq(ArcDataEntity::getArcTime, arcDataEntity.getArcId())
                    );
                    insert(arcDataEntity);
                    log.debug("归档完成，point："+item.getPoint());
                });
@@ -185,6 +207,12 @@
                    arcDataEntity.setArcTime(arcTime);
                    arcDataEntity.setArcId(item.getId());
                    arcDataEntity.setArcValue(value);
                    arcDataEntity.setCode(item.getCode());
                    arcDataEntity.setCreateTime(new Date());
                    arcDataDao.delete(new LambdaQueryWrapperX<ArcDataEntity>()
                            .eq(ArcDataEntity::getArcId, arcDataEntity.getArcId())
                            .eq(ArcDataEntity::getArcTime, arcDataEntity.getArcId())
                    );
                    insert(arcDataEntity);
                    log.debug("归档完成，point："+item.getPoint());
                });
@@ -218,7 +246,9 @@
                BigDecimal prev = BigDecimal.valueOf(valueList.get(0).getV());
                for (int i = 1; i < valueList.size(); i++) {
                    BigDecimal curr = BigDecimal.valueOf(valueList.get(i).getV());
                    value = value.add(curr.subtract(prev));
                    if(curr.compareTo(prev) > 0) {
                        value = value.add(curr.subtract(prev));
                    }
                    prev = curr;
                }
                break;