Merge remote-tracking branch 'origin/master'

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/IndItemCollector.java

@@ -97,12 +97,12 @@
                    Object dataValue = e.getDataValue();
                    if (dataValue != null && dataValue instanceof Number) {
                        BigDecimal value = new BigDecimal(dataValue.toString());
                        if (indItem.getPrecision() != null) {
                            value = new BigDecimal(dataValue.toString()).setScale(indItem.getPrecision(), BigDecimal.ROUND_HALF_UP);
                        }
                        if (StringUtils.isNotBlank(indItem.getCoefficient())) {
                            value = value.multiply(new BigDecimal(indItem.getCoefficient()));
                        }
                        if (indItem.getPrecision() != null) {
                            value = value.setScale(indItem.getPrecision(), BigDecimal.ROUND_HALF_UP);
                        }
                        e.setDataValue(value.doubleValue());
                    }
                }

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestOperationRecordServiceImpl.java

@@ -62,6 +62,7 @@
        }
        confDetList.forEach(confDet -> {
            StSuggestSnapshotRecordSaveReqVO snapshotRecordSaveReqVO = new StSuggestSnapshotRecordSaveReqVO();
            snapshotRecordSaveReqVO.setSuggestId(reqVo.getSuggestId());
            snapshotRecordSaveReqVO.setModelId(entity.getModelId());
            snapshotRecordSaveReqVO.setOperationId(entity.getId());
            snapshotRecordSaveReqVO.setDataNo(confDet.getDataNo());
@@ -69,11 +70,11 @@
            snapshotRecordSaveReqVO.setDataName(confDet.getDataName());
            snapshotRecordSaveReqVO.setScheduleTime(entity.getScheduleTime());
            //计算开始时间,开始时间为当前调度时间减去快照配置表配置的左侧时间长度
            LocalDateTime localStartDateTime =  entity.getScheduleTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().minusMinutes(confDet.getLeftLength());
            LocalDateTime localStartDateTime =  entity.getScheduleTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().minusMinutes(confDet.getLeftLength() ==  null ? 60 : confDet.getLeftLength());
            Date startTime = Date.from(localStartDateTime.atZone(ZoneId.systemDefault()).toInstant());
            snapshotRecordSaveReqVO.setStartTime(startTime);
            //计算结束时间,结束时间为当前调度时间加上快照配置表配置的右侧时间长度
            LocalDateTime localEndDateTime =  entity.getScheduleTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().plusMinutes(confDet.getRightLength());
            LocalDateTime localEndDateTime =  entity.getScheduleTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().plusMinutes(confDet.getRightLength() ==  null ? 60 : confDet.getLeftLength());
            Date endTime = Date.from(localEndDateTime.atZone(ZoneId.systemDefault()).toInstant());
            snapshotRecordSaveReqVO.setEndTime(endTime);
            stSuggestSnapshotRecordService.create(snapshotRecordSaveReqVO);