Merge remote-tracking branch 'origin/master'

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/ArcPointSettingService.java

@@ -6,9 +6,10 @@
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;

@Service
public interface ArcPointSettingService extends BaseService<ArcPointSettingEntity> {

    List<ArcPointSettingEntity> getListByType(String code);
    List<ArcPointSettingEntity> list(Map<String, Object> params);
}

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/ArcPointDataServiceImpl.java

@@ -16,10 +16,7 @@

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
@@ -34,10 +31,12 @@
    //根据归档类型进行归档
    @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 +66,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 +96,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 +126,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 +156,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());

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/ArcPointSettingServiceImpl.java

@@ -1,5 +1,27 @@
package com.iailab.module.data.point.service.impl;

public class ArcPointSettingServiceImpl {
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iailab.framework.common.service.impl.BaseServiceImpl;
import com.iailab.module.data.point.dao.ArcPointSettingDao;
import com.iailab.module.data.point.entity.ArcPointSettingEntity;
import com.iailab.module.data.point.service.ArcPointSettingService;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.*;

@Service
public class ArcPointSettingServiceImpl extends BaseServiceImpl<ArcPointSettingDao, ArcPointSettingEntity> implements ArcPointSettingService {

    @Autowired
    private ArcPointSettingDao arcPointSettingDao;

    @Override
    public List<ArcPointSettingEntity> list(Map<String, Object> params) {
        Object type = params.get("type");
        QueryWrapper<ArcPointSettingEntity> queryWrapper = new QueryWrapper();
        queryWrapper.eq(!ObjectUtils.isEmpty(type), "type", type);
        return arcPointSettingDao.selectList(queryWrapper);
    }
}