Merge remote-tracking branch 'origin/master'

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

@@ -15,8 +15,8 @@
    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())
                .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/entity/ArcSettingEntity.java

@@ -21,6 +21,11 @@
    private String id;

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

    /**
     * 名称
     */
    private String name;
@@ -48,7 +53,7 @@
    /**
     * 是否启用
     */
    private String isEnable;
    private Integer isEnable;

    /**
     * 创建时间

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

@@ -47,7 +47,7 @@
        Arrays.asList(ids).forEach(item -> {
            ArcSettingEntity entity = new ArcSettingEntity();
            entity.setId(item);
            entity.setIsEnable(IsEnableEnum.ENABLE.getCode().toString());
            entity.setIsEnable(IsEnableEnum.ENABLE.getCode());
            entity.setUpdateTime(new Date());
            arcPointSettingDao.updateById(entity);
        });

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/ihdb/HttpCollectorForIhd.java

@@ -56,7 +56,7 @@

    private static final int GROUP_MAX_COUNT = 300;

    private static final int MAX_WAIT = 30;
    private static final int MAX_WAIT = 40;

    private static final String pattern = "yyyyMMddHHmm00";

@@ -210,7 +210,7 @@
            for (Map.Entry<Integer, List<Object[]>> measurePointsItem : measurePointsCountGroup.entrySet()) {
                HttpApiEntity httpApi = this.getHttpApi(measurePointsItem.getValue().get(0)[0].toString());
                // 并发
                Thread.sleep(1000);
                Thread.sleep(500);
                threadPool.submit(new Task(httpApi.getUrl(), httpApi.getCode(), result, measurePointsItem.getValue(),
                        collectTime, countDownLatch));
                // 顺序

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

@@ -31,7 +31,7 @@
    @Override
    public void run(String params) {
        // 0 0/1 * * * ?
        logger.debug("CollectTaskNet60定时任务正在执行，参数为：{}", params);
        logger.info("CollectTaskNet60定时任务正在执行，参数为：{}", params);
        try {
            Calendar calendar = Calendar.getInstance();
            calendar.set(Calendar.MILLISECOND, 0);

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java

@@ -555,7 +555,7 @@
        valueDTOS.forEach(item -> {
            Object[] values = new Object[2];
            values[0] = DateUtils.format(item.getT(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
            values[1] = new BigDecimal(item.getV()).setScale(2, BigDecimal.ROUND_HALF_UP);
            values[1] = new BigDecimal(item.getV()).setScale(3, BigDecimal.ROUND_HALF_UP);
            result.add(values);
        });
        return result;

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultLastPointServiceImpl.java

@@ -34,7 +34,7 @@
        influxModelResultVOS.forEach(item -> {
            Object[] dataItem = new Object[2];
            dataItem[0] = DateUtils.format(Date.from(item.getTimestamp()), timeFormat);
            dataItem[1] = BigDecimal.valueOf(Double.valueOf(item.getValue().toString())).setScale(2, BigDecimal.ROUND_HALF_UP);
            dataItem[1] = BigDecimal.valueOf(Double.valueOf(item.getValue().toString())).setScale(3, BigDecimal.ROUND_HALF_UP);
            result.add(dataItem);
        });
        return result;

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultServiceImpl.java

@@ -112,7 +112,7 @@
        influxModelResultVOS.forEach(item -> {
            Object[] dataItem = new Object[2];
            dataItem[0] = DateUtils.format(Date.from(item.getTimestamp()), timeFormat);
            dataItem[1] = BigDecimal.valueOf(Double.valueOf(item.getValue().toString())).setScale(2, BigDecimal.ROUND_HALF_UP);
            dataItem[1] = BigDecimal.valueOf(Double.valueOf(item.getValue().toString())).setScale(3, BigDecimal.ROUND_HALF_UP);
            result.add(dataItem);
        });
        return result;