数据归档

 iailab-module-data/iailab-module-data-biz/db/mysql/tenant.sql

@@ -418,22 +418,26 @@
    MODIFY COLUMN `data_time` datetime NULL DEFAULT NULL COMMENT '数据时间' AFTER `item_no`;

CREATE TABLE `t_arc_data` (
                              `id` varchar(255) NOT NULL COMMENT 'id',
                              `arc_id` varchar(255) DEFAULT NULL COMMENT '归档id',
                              `arc_time` varchar(255) DEFAULT NULL COMMENT '归档时间',
                              `value` varchar(255) DEFAULT NULL COMMENT '归档时间',
                              `id` varchar(36) NOT NULL COMMENT 'id',
                              `arc_id` varchar(36) DEFAULT NULL COMMENT '归档id',
                              `code` varchar(30) DEFAULT NULL COMMENT '编码',
                              `arc_time` varchar(30) DEFAULT NULL COMMENT '归档时间',
                              `arc_value` DECIMAL(18,6) DEFAULT NULL COMMENT '归档值',
                              `create_time` datetime DEFAULT NULL COMMENT '创建时间',
                              PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='归档数据表';

CREATE TABLE `t_arc_setting` (
                                 `id` varchar(255) NOT NULL COMMENT 'id',
                                 `name` varchar(255) DEFAULT NULL COMMENT '名称',
                                 `type` varchar(255) DEFAULT NULL COMMENT '归档周期(shift、day、month、year)',
                                 `point` varchar(255) DEFAULT NULL COMMENT '归档点位',
                                 `calculate` varchar(255) DEFAULT NULL COMMENT '计算方法（none、sum、diff、avg）',
                                 `is_enable` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '是否启用',
                                 `id` varchar(36) NOT NULL COMMENT 'id',
                                 `code` varchar(30) DEFAULT NULL COMMENT '编码',
                                 `name` varchar(30) DEFAULT NULL COMMENT '名称',
                                 `type` varchar(10) DEFAULT NULL COMMENT '归档周期(shift、day、month、year)',
                                 `point` varchar(36) DEFAULT NULL COMMENT '归档点位',
                                 `calculate` varchar(10) DEFAULT NULL COMMENT '计算方法（none、sum、diff、avg）',
                                 `sort` int   COMMENT '排序',
                                 `is_enable` tinyint(1) DEFAULT 1 COMMENT '是否启用',
                                 `create_time` datetime DEFAULT NULL COMMENT '创建时间',
                                 `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
                                 PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='定时归档设置表';
                                 PRIMARY KEY (`id`),
                                 UNIQUE KEY `uk_code` (`code`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='定时归档设置表';

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/controller/ArcController.java

对比新文件
@@ -0,0 +1,94 @@
package com.iailab.module.data.arc.controller;

import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.framework.common.pojo.PageResult;
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.arc.service.ArcSettingService;
import com.iailab.module.data.arc.vo.ArcDataPageReqVO;
import com.iailab.module.data.arc.vo.ArcSettingPageReqVO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.util.List;
import java.util.Map;
import java.util.UUID;

import static com.iailab.framework.common.pojo.CommonResult.success;

@Tag(name = "数据归档，测点")
@RestController
@RequestMapping("/data/arc")
@Validated
public class ArcController {

    @Autowired
    private ArcSettingService arcSettingService;

    @Autowired
    private ArcDataService arcDataService;


    @PostMapping("archiving")
    public CommonResult<Boolean> archiving(@RequestBody String type) {
        arcDataService.archiving(type);
        return success(true);
    }

    @GetMapping("page")
    public CommonResult<PageResult<ArcSettingEntity>> page(@Valid ArcSettingPageReqVO reqVO) {
        PageResult<ArcSettingEntity> page = arcSettingService.queryPage(reqVO);
        return success(page);
    }

    @GetMapping("dataPage")
    public CommonResult<PageResult<ArcDataEntity>> dataPage(@Valid ArcDataPageReqVO reqVO) {
        PageResult<ArcDataEntity> page = arcDataService.queryPage(reqVO);
        return success(page);
    }

    @GetMapping("/list")
    @Operation(summary = "列表")
    public CommonResult<List<ArcSettingEntity>> list(@Valid @RequestParam Map<String, Object> params) {
        List<ArcSettingEntity> list = arcSettingService.list(params);
        return success(list);
    }

    @GetMapping("/info/{id}")
    public CommonResult<ArcSettingEntity> info(@PathVariable("id") String id) {
        ArcSettingEntity info = arcSettingService.info(id);
        return success(info);
    }

    @PostMapping("create")
    public CommonResult<Boolean> create(@RequestBody ArcSettingEntity arcSettingEntity) {
        String id = UUID.randomUUID().toString();
        arcSettingEntity.setId(id);
        arcSettingService.add(arcSettingEntity);
        return success(true);
    }

    @PutMapping("/update")
    public CommonResult<Boolean> update(@RequestBody ArcSettingEntity arcSettingEntity) {
        arcSettingService.update(arcSettingEntity);
        return success(true);
    }
    
    @DeleteMapping("/delete")
    public CommonResult<Boolean> delete(String id) {
        arcSettingService.delete(id);
        return success(true);
    }
    
    @PutMapping("/enable")
    @Operation(summary = "启用")
    public CommonResult<Boolean> enable(@RequestBody String[] ids) {
        arcSettingService.enableByIds(ids);
        return success(true);
    }
}

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/dao/ArcDataDao.java

对比新文件
@@ -0,0 +1,22 @@
package com.iailab.module.data.arc.dao;

import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.mybatis.core.mapper.BaseMapperX;
import com.iailab.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.iailab.framework.tenant.core.db.dynamic.TenantDS;
import com.iailab.module.data.arc.entity.ArcDataEntity;
import com.iailab.module.data.arc.vo.ArcDataPageReqVO;
import org.apache.ibatis.annotations.Mapper;

@TenantDS
@Mapper
public interface ArcDataDao extends BaseMapperX<ArcDataEntity> {

    default PageResult<ArcDataEntity> selectPage(ArcDataPageReqVO reqVO) {
        return selectPage(reqVO, new LambdaQueryWrapperX<ArcDataEntity>()
                .eq(ArcDataEntity::getArcId, reqVO.getArcId())
                .ge(reqVO.getStartTime()!=null, ArcDataEntity::getCreateTime, reqVO.getStartTime())
                .le(reqVO.getEndTime()!=null, ArcDataEntity::getCreateTime, reqVO.getEndTime())
                .orderByDesc(ArcDataEntity::getCreateTime));
    }
}

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/dao/ArcSettingDao.java

对比新文件
@@ -0,0 +1,21 @@
package com.iailab.module.data.arc.dao;

import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.mybatis.core.mapper.BaseMapperX;
import com.iailab.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.iailab.framework.tenant.core.db.dynamic.TenantDS;
import com.iailab.module.data.arc.entity.ArcSettingEntity;
import com.iailab.module.data.arc.vo.ArcSettingPageReqVO;
import org.apache.ibatis.annotations.Mapper;

@TenantDS
@Mapper
public interface ArcSettingDao extends BaseMapperX<ArcSettingEntity> {

    default PageResult<ArcSettingEntity> selectPage(ArcSettingPageReqVO reqVO) {
        return selectPage(reqVO, new LambdaQueryWrapperX<ArcSettingEntity>()
                .likeIfPresent(ArcSettingEntity::getName, reqVO.getName())
                .likeIfPresent(ArcSettingEntity::getType, reqVO.getType())
                .orderByDesc(ArcSettingEntity::getCreateTime));
    }
}

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/entity/ArcDataEntity.java

文件名从 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/entity/ArcPointDataEntity.java 修改
@@ -1,4 +1,4 @@
package com.iailab.module.data.point.entity;
package com.iailab.module.data.arc.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -6,10 +6,11 @@
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;

@Data
@TableName("t_arc_data")
public class ArcPointDataEntity implements Serializable {
public class ArcDataEntity implements Serializable {

    private static final long serialVersionUID = 1L;

@@ -25,9 +26,14 @@
    private String arcId;

    /**
     * 编码
     */
    private String code;

    /**
     * 值
     */
    private String value;
    private BigDecimal arcValue;

    /**
     * 归档时间

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/entity/ArcSettingEntity.java

文件名从 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/entity/ArcPointSettingEntity.java 修改
@@ -1,17 +1,16 @@
package com.iailab.module.data.point.entity;
package com.iailab.module.data.arc.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.joda.time.DateTime;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("t_arc_setting")
public class ArcPointSettingEntity implements Serializable {
public class ArcSettingEntity implements Serializable {

    private static final long serialVersionUID = 1L;

@@ -42,6 +41,11 @@
    private String calculate;

    /**
     * 排序
     */
    private Integer sort;

    /**
     * 是否启用
     */
    private String isEnable;

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/package-info.java

对比新文件
@@ -0,0 +1 @@
package com.iailab.module.data.arc;

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

对比新文件
@@ -0,0 +1,13 @@
package com.iailab.module.data.arc.service;

import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.service.BaseService;
import com.iailab.module.data.arc.entity.ArcDataEntity;
import com.iailab.module.data.arc.vo.ArcDataPageReqVO;

public interface ArcDataService extends BaseService<ArcDataEntity> {
    //根据归档类型进行归档
    void archiving(String type);

    PageResult<ArcDataEntity> queryPage(ArcDataPageReqVO reqVO);
}

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

对比新文件
@@ -0,0 +1,28 @@
package com.iailab.module.data.arc.service;

import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.service.BaseService;
import com.iailab.module.data.arc.entity.ArcSettingEntity;
import com.iailab.module.data.arc.vo.ArcSettingPageReqVO;
import org.springframework.stereotype.Service;

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

@Service
public interface ArcSettingService extends BaseService<ArcSettingEntity> {

    List<ArcSettingEntity> list(Map<String, Object> params);

    void update(ArcSettingEntity arcSettingEntity);

    void delete(String id);

    void enableByIds(String[] ids);

    void add(ArcSettingEntity arcSettingEntity);

    ArcSettingEntity info(String id);

    PageResult<ArcSettingEntity> queryPage(ArcSettingPageReqVO reqVO);
}

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

文件名从 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/ArcPointDataServiceImpl.java 修改
@@ -1,4 +1,4 @@
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;
@@ -6,14 +6,13 @@
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.point.vo.ArcPointDataPageReqVO;
import com.iailab.module.data.point.vo.ArcPointSettingPageReqVO;
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;

@@ -23,16 +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 ArcPointDataDao arcPointDataDao;
    private ArcDataDao arcDataDao;

    //根据归档类型进行归档
    @Override
@@ -42,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());
@@ -61,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());
@@ -91,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());
@@ -121,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());
@@ -151,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());
@@ -181,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;
@@ -236,7 +235,7 @@
    }

    @Override
    public PageResult<ArcPointDataEntity> queryPage(ArcPointDataPageReqVO reqVO) {
        return arcPointDataDao.selectPage(reqVO);
    public PageResult<ArcDataEntity> queryPage(ArcDataPageReqVO reqVO) {
        return arcDataDao.selectPage(reqVO);
    }
}

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

对比新文件
@@ -0,0 +1,70 @@
package com.iailab.module.data.arc.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.service.impl.BaseServiceImpl;
import com.iailab.module.data.common.enums.IsEnableEnum;
import com.iailab.module.data.arc.dao.ArcSettingDao;
import com.iailab.module.data.arc.entity.ArcSettingEntity;
import com.iailab.module.data.arc.service.ArcSettingService;
import com.iailab.module.data.arc.vo.ArcSettingPageReqVO;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.*;

@Service
public class ArcSettingServiceImpl extends BaseServiceImpl<ArcSettingDao, ArcSettingEntity> implements ArcSettingService {

    @Autowired
    private ArcSettingDao arcPointSettingDao;

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

    @Override
    public void update(ArcSettingEntity arcSettingEntity) {
        arcPointSettingDao.updateById(arcSettingEntity);
    }

    @Override
    public void delete(String id) {
        arcPointSettingDao.deleteById(id);
    }

    @Override
    public void enableByIds(String[] ids) {
        if (CollectionUtils.isEmpty(Arrays.asList(ids))) {
            return;
        }
        Arrays.asList(ids).forEach(item -> {
            ArcSettingEntity entity = new ArcSettingEntity();
            entity.setId(item);
            entity.setIsEnable(IsEnableEnum.ENABLE.getCode().toString());
            entity.setUpdateTime(new Date());
            arcPointSettingDao.updateById(entity);
        });
    }

    @Override
    public void add(ArcSettingEntity arcSettingEntity) {
        arcPointSettingDao.insert(arcSettingEntity);
    }

    @Override
    public ArcSettingEntity info(String id) {
        return arcPointSettingDao.selectById(id);
    }

    @Override
    public PageResult<ArcSettingEntity> queryPage(ArcSettingPageReqVO reqVO) {
        return arcPointSettingDao.selectPage(reqVO);
    }
}

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/vo/ArcDataPageReqVO.java

文件名从 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/vo/ArcPointDataPageReqVO.java 修改
@@ -1,7 +1,5 @@
package com.iailab.module.data.point.vo;
package com.iailab.module.data.arc.vo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.iailab.framework.common.pojo.PageParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -15,7 +13,7 @@
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class ArcPointDataPageReqVO extends PageParam {
public class ArcDataPageReqVO extends PageParam {

    /**
     * 归档id

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/vo/ArcSettingPageReqVO.java

文件名从 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/vo/ArcPointSettingPageReqVO.java 修改
@@ -1,14 +1,11 @@
package com.iailab.module.data.point.vo;
package com.iailab.module.data.arc.vo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.iailab.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;

import java.util.List;

/**
 * @author lirm
@@ -18,7 +15,7 @@
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class ArcPointSettingPageReqVO extends PageParam {
public class ArcSettingPageReqVO extends PageParam {

    /**
     * id

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/PointArchivingTaskNet1h.java

@@ -1,14 +1,12 @@
package com.iailab.module.data.job.task;

import com.iailab.module.data.common.enums.ArcTypeEnum;
import com.iailab.module.data.point.collection.PointCollector;
import com.iailab.module.data.point.service.ArcPointDataService;
import com.iailab.module.data.arc.service.ArcDataService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.Calendar;

/**
 * @description: Point归档1h
@@ -21,7 +19,7 @@
    private final String NET = "1h";

    @Resource
    private ArcPointDataService arcPointDataService;
    private ArcDataService arcPointDataService;

    @Override
    public void run(String params){

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/PointArchivingTaskNetDay.java

@@ -1,7 +1,7 @@
package com.iailab.module.data.job.task;

import com.iailab.module.data.common.enums.ArcTypeEnum;
import com.iailab.module.data.point.service.ArcPointDataService;
import com.iailab.module.data.arc.service.ArcDataService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@@ -19,7 +19,7 @@
    private final String NET = "1h";

    @Resource
    private ArcPointDataService arcPointDataService;
    private ArcDataService arcPointDataService;

    @Override
    public void run(String params){

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/PointArchivingTaskNetMonth.java

@@ -1,7 +1,7 @@
package com.iailab.module.data.job.task;

import com.iailab.module.data.common.enums.ArcTypeEnum;
import com.iailab.module.data.point.service.ArcPointDataService;
import com.iailab.module.data.arc.service.ArcDataService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@@ -19,7 +19,7 @@
    private final String NET = "1h";

    @Resource
    private ArcPointDataService arcPointDataService;
    private ArcDataService arcPointDataService;

    @Override
    public void run(String params){

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/PointArchivingTaskNetShift.java

@@ -1,7 +1,7 @@
package com.iailab.module.data.job.task;

import com.iailab.module.data.common.enums.ArcTypeEnum;
import com.iailab.module.data.point.service.ArcPointDataService;
import com.iailab.module.data.arc.service.ArcDataService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@@ -19,7 +19,7 @@
    private final String NET = "1h";

    @Resource
    private ArcPointDataService arcPointDataService;
    private ArcDataService arcPointDataService;

    @Override
    public void run(String params){

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/PointArchivingTaskNetYear.java

@@ -1,7 +1,7 @@
package com.iailab.module.data.job.task;

import com.iailab.module.data.common.enums.ArcTypeEnum;
import com.iailab.module.data.point.service.ArcPointDataService;
import com.iailab.module.data.arc.service.ArcDataService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@@ -19,7 +19,7 @@
    private final String NET = "1h";

    @Resource
    private ArcPointDataService arcPointDataService;
    private ArcDataService arcPointDataService;

    @Override
    public void run(String params){

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/ArcPointController.java

文件已删除

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/ArcPointDataDao.java

文件已删除

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/ArcPointSettingDao.java

文件已删除

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

文件已删除

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

文件已删除

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

文件已删除