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

@@ -35,31 +35,30 @@

    //根据归档类型进行归档
    @Override
    public void archiving(String type) {
    public void archiving(String type, Calendar calendar) {
        Map<String, Object> params = new HashMap<String, Object>();
        params.put("type", type);
        switch (ArcTypeEnum.getEumByCode(type)) {
            case HOUR:
                //查询对应类型的归档设置列表
                List<ArcSettingEntity> arcHourList = arcPointSettingService.list(params);
                Date endTime1 = calendar.getTime();
                calendar.add(Calendar.HOUR_OF_DAY, -1);
                Date startTime1 = calendar.getTime();
                //遍历列表
                arcHourList.forEach(item -> {
                    log.debug("开始归档，point："+item.getPoint());
                    //获取开始时间
                    Calendar calendar = Calendar.getInstance();
                    calendar.add(Calendar.HOUR_OF_DAY, -1);
                    Date startTime = calendar.getTime();
                    //通过point编号查询数据
                    ApiPointValueQueryDTO queryDto = new ApiPointValueQueryDTO();
                    queryDto.setPointNo(item.getPoint());
                    queryDto.setStart(startTime);
                    queryDto.setEnd(new Date());
                    queryDto.setStart(startTime1);
                    queryDto.setEnd(endTime1);
                    List<ApiPointValueDTO> valueList = dataPointApi.queryPointHistoryValue(queryDto);
                    //判断根据计算类型计算
                    BigDecimal value = calculate(item.getCalculate(), valueList);
                    //归档
                    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH");
                    String arcTime = dateFormat.format(startTime);
                    String arcTime = dateFormat.format(startTime1);
                    ArcDataEntity arcDataEntity = new ArcDataEntity();
                    arcDataEntity.setId(String.valueOf(new Date().getTime()));
                    arcDataEntity.setArcTime(arcTime);
@@ -72,24 +71,23 @@
            case SHIFT:
                //查询对应类型的归档设置列表
                List<ArcSettingEntity> arcShiftList = arcPointSettingService.list(params);
                Date endTime2 = calendar.getTime();
                calendar.add(Calendar.HOUR_OF_DAY, -1);
                Date startTime2 = calendar.getTime();
                //遍历列表
                arcShiftList.forEach(item -> {
                    log.debug("开始归档，point："+item.getPoint());
                    //获取开始时间
                    Calendar calendar = Calendar.getInstance();
                    calendar.add(Calendar.HOUR_OF_DAY, -12);
                    Date startTime = calendar.getTime();
                    //通过point编号查询数据
                    ApiPointValueQueryDTO queryDto = new ApiPointValueQueryDTO();
                    queryDto.setPointNo(item.getPoint());
                    queryDto.setStart(startTime);
                    queryDto.setEnd(new Date());
                    queryDto.setStart(startTime2);
                    queryDto.setEnd(endTime2);
                    List<ApiPointValueDTO> valueList = dataPointApi.queryPointHistoryValue(queryDto);
                    //判断根据计算类型计算
                    BigDecimal value = calculate(item.getCalculate(), valueList);
                    //归档
                    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH");
                    String arcTime = dateFormat.format(startTime);
                    String arcTime = dateFormat.format(startTime2);
                    ArcDataEntity arcDataEntity = new ArcDataEntity();
                    arcDataEntity.setId(String.valueOf(new Date().getTime()));
                    arcDataEntity.setArcTime(arcTime);
@@ -102,29 +100,30 @@
            case DAY:
                //查询对应类型的归档设置列表
                List<ArcSettingEntity> arcDayList = arcPointSettingService.list(params);
                Date endTime3 = calendar.getTime();
                calendar.add(Calendar.DAY_OF_YEAR, -1);
                Date startTime3 = calendar.getTime();
                //遍历列表
                arcDayList.forEach(item -> {
                    log.debug("开始归档，point："+item.getPoint());
                    //获取开始时间
                    Calendar calendar = Calendar.getInstance();
                    calendar.add(Calendar.DAY_OF_MONTH, -1);
                    Date startTime = calendar.getTime();
                    //通过point编号查询数据
                    ApiPointValueQueryDTO queryDto = new ApiPointValueQueryDTO();
                    queryDto.setPointNo(item.getPoint());
                    queryDto.setStart(startTime);
                    queryDto.setEnd(new Date());
                    queryDto.setStart(startTime3);
                    queryDto.setEnd(endTime3);
                    List<ApiPointValueDTO> valueList = dataPointApi.queryPointHistoryValue(queryDto);
                    //判断根据计算类型计算
                    BigDecimal value = calculate(item.getCalculate(), valueList);
                    //归档
                    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
                    String arcTime = dateFormat.format(startTime);
                    String arcTime = dateFormat.format(startTime3);
                    ArcDataEntity arcDataEntity = new ArcDataEntity();
                    arcDataEntity.setId(String.valueOf(new Date().getTime()));
                    arcDataEntity.setArcTime(arcTime);
                    arcDataEntity.setArcId(item.getId());
                    arcDataEntity.setArcValue(value);
                    arcDataEntity.setCode(item.getCode());
                    arcDataEntity.setCreateTime(new Date());
                    insert(arcDataEntity);
                    log.debug("归档完成，point："+item.getPoint());
                });
@@ -136,7 +135,6 @@
                arcMonthList.forEach(item -> {
                    log.debug("开始归档，point："+item.getPoint());
                    //获取开始时间
                    Calendar calendar = Calendar.getInstance();
                    calendar.add(Calendar.MONTH, -1);
                    Date startTime = calendar.getTime();
                    //通过point编号查询数据
@@ -155,6 +153,8 @@
                    arcDataEntity.setArcTime(arcTime);
                    arcDataEntity.setArcId(item.getId());
                    arcDataEntity.setArcValue(value);
                    arcDataEntity.setCode(item.getCode());
                    arcDataEntity.setCreateTime(new Date());
                    insert(arcDataEntity);
                    log.debug("归档完成，point："+item.getPoint());
                });
@@ -166,7 +166,7 @@
                arcYearList.forEach(item -> {
                    log.debug("开始归档，point："+item.getPoint());
                    //获取开始时间
                    Calendar calendar = Calendar.getInstance();
                    //Calendar calendar = Calendar.getInstance();
                    calendar.add(Calendar.YEAR, -1);
                    Date startTime = calendar.getTime();
                    //通过point编号查询数据
@@ -185,6 +185,8 @@
                    arcDataEntity.setArcTime(arcTime);
                    arcDataEntity.setArcId(item.getId());
                    arcDataEntity.setArcValue(value);
                    arcDataEntity.setCode(item.getCode());
                    arcDataEntity.setCreateTime(new Date());
                    insert(arcDataEntity);
                    log.debug("归档完成，point："+item.getPoint());
                });