iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleDataConstructor.java

@@ -39,7 +39,8 @@
     * @param endTime
     * @return
     */
    public List<DataValueVO> completionData(int length, List<DataValueVO> dataEntityList, Date startTime, Date endTime, String paramId,String paramType) {
    public List<DataValueVO> completionData(int length, List<DataValueVO> dataEntityList, Date startTime, Date endTime,
                                            String paramId, String paramType) {
        if (CollectionUtils.isEmpty(dataEntityList) || length == dataEntityList.size()) {
            return dataEntityList;
        }else if (length < dataEntityList.size()){
@@ -72,7 +73,6 @@
                endTime = calendar.getTime();
                end = endTime.getTime();


                oneMin = 24 * 60 * 60 * 1000;
                mins = ((end - start) / oneMin);
                break;
@@ -80,12 +80,9 @@
                // 测点值
                ApiPointDTO dataPoint = dataPointApi.getInfoById(paramId);
                oneMin = 1000L * DataPointFreqEnum.getEumByCode(dataPoint.getMinfreqid()).getValue();

                // 设置时间偏移量
                start = start - (start % oneMin) + oneMin;
                end = end - (end % oneMin) + oneMin;


                mins = ((end - start) / oneMin);
                break;
            case IND:
@@ -103,8 +100,6 @@
                calendar2.set(Calendar.MINUTE,0);
                calendar2.set(Calendar.SECOND,0);
                end = calendar2.getTime().getTime();


                mins = ((end - start) / oneMin);
                break;
            default: