Merge remote-tracking branch 'origin/master'

 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java

@@ -1,8 +1,16 @@
package com.iailab.module.ansteel.api.controller.admin;

import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.module.ansteel.api.dto.*;
import com.iailab.module.ansteel.api.service.DataService;
import com.iailab.module.ansteel.coking.dto.CokingTraceChartDTO;
import com.iailab.module.ansteel.coking.dto.CokingTraceDataDTO;
import com.iailab.module.ansteel.common.enums.ProcessConfDataTypeEnum;
import com.iailab.module.data.api.ind.dto.ApiIndItemQueryDTO;
import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
import com.iailab.module.data.api.point.dto.ApiPointValueDTO;
import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
import com.iailab.module.model.api.mcs.dto.PreDataSingleChartReqVO;
import com.iailab.module.model.api.mcs.dto.StAlarmAndSuggestReqVO;
import io.swagger.v3.oas.annotations.Operation;
@@ -10,6 +18,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.math.BigDecimal;
import java.util.*;

import static com.iailab.framework.common.pojo.CommonResult.success;
@@ -59,5 +68,11 @@
        return success(dataService.ignoreSuggest(ReqVO));
    }

    @GetMapping("/data/history-value")
    @Operation(summary = "指标/测点历史数据")
    public CommonResult<List<Object[]>> getHistoryValue(@RequestParam Map<String, Object> params) {
        return success(dataService.getHistoryValue(params));
    }


}

 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/DataService.java

@@ -33,4 +33,6 @@
    List<PowerControlMainDTO> getPowerControlMainList();

    List<PowerControlDetDTO> getPowerControlDetList(Map<String, Object> params);

    List<Object[]> getHistoryValue(Map<String, Object> params);
}

 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java

@@ -5,6 +5,7 @@
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.module.ansteel.api.dao.*;
import com.iailab.module.ansteel.api.dto.*;
import com.iailab.module.ansteel.common.enums.ProcessConfDataTypeEnum;
import com.iailab.module.ansteel.power.dao.*;
import com.iailab.module.ansteel.power.entity.PowerCapacitorStatusEntity;
import com.iailab.module.ansteel.power.entity.PowerControlDetEntity;
@@ -12,6 +13,9 @@
import com.iailab.module.ansteel.power.entity.PowerNetFactorEntity;
import com.iailab.module.ansteel.api.service.DataService;
import com.iailab.module.ansteel.common.constant.CommonConstant;
import com.iailab.module.data.api.ind.IndItemApi;
import com.iailab.module.data.api.ind.dto.ApiIndItemQueryDTO;
import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
import com.iailab.module.data.api.plan.PlanItemApi;
import com.iailab.module.data.api.plan.dto.ApiPlanDataDTO;
import com.iailab.module.data.api.point.DataPointApi;
@@ -30,12 +34,16 @@
import java.util.*;
import java.util.stream.Collectors;

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

@Slf4j
@Service
public class DataServiceImpl implements DataService {

    @Autowired
    private DataPointApi dataPointApi;
    @Autowired
    private IndItemApi indItemApi;

    @Autowired
    private McsApi mcsApi;
@@ -370,4 +378,64 @@
        wrapper.orderByAsc("sort");
        return ConvertUtils.sourceToTarget(powerControlDetDao.selectList(wrapper), PowerControlDetDTO.class);
    }

    @Override
    public List<Object[]> getHistoryValue(Map<String, Object> params) {
        List<Object[]> dataList = new ArrayList<>();

        if (!params.containsKey("dataType") || !params.containsKey("dataNo")) {
            return dataList;
        }
        String dataType = params.get("dataType").toString();
        String dataNo = params.get("dataNo").toString();

        Date startTime = null;
        Date endTime = null;
        Calendar calendar = Calendar.getInstance();
        calendar.set(Calendar.MILLISECOND, 0);
        if (params.containsKey("endTime")) {
            endTime = DateUtils.parse(params.get("endTime").toString(),DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
        }else {
            endTime = calendar.getTime();
        }
        if (params.containsKey("startTime")) {
            startTime = DateUtils.parse(params.get("startTime").toString(),DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
        }else {
            calendar.add(Calendar.DAY_OF_YEAR, -1);
            startTime = calendar.getTime();
        }

        switch (ProcessConfDataTypeEnum.getEumByCode(dataType)) {
            case DATAPOINT:
                ApiPointValueQueryDTO queryParams1 = new ApiPointValueQueryDTO();
                queryParams1.setPointNo(dataNo);
                queryParams1.setStart(startTime);
                queryParams1.setEnd(endTime);
                List<com.iailab.module.data.api.point.dto.ApiPointValueDTO> pointHisValue = dataPointApi.queryPointHistoryValue(queryParams1);
                pointHisValue.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(3, BigDecimal.ROUND_HALF_UP);
                    dataList.add(values);
                });
                break;
            case IND:
                log.info("IND");
                ApiIndItemQueryDTO queryParams2 = new ApiIndItemQueryDTO();
                queryParams2.setItemNo(dataNo);
                queryParams2.setStart(startTime);
                queryParams2.setEnd(endTime);
                List<ApiIndItemValueDTO> indValues = indItemApi.queryIndItemHistoryValue(queryParams2);
                indValues.forEach(item -> {
                    Object[] values = new Object[2];
                    values[0] = item.getDataTime();
                    values[1] = item.getDataValue();
                    dataList.add(values);
                });
                break;
            default:
                break;
        }
        return dataList;
    }
}

 doc/鞍钢数据接口文档_master.doc

Binary files differ