iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java

@@ -3,7 +3,6 @@
import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.framework.excel.core.util.ExcelUtils;
import com.iailab.module.data.api.dto.DeviceValueDTO;
@@ -310,27 +309,29 @@
        List<IndItemValueVO> list = indItemCollector.queryValue(itemNo);
        List<ApiIndItemValueDTO> dtoList = new ArrayList<>();
        list.forEach(item -> {
            ApiIndItemValueDTO dto = new ApiIndItemValueDTO();
            dto.setDataTime(item.getDataTime());
            dto.setDataValue(item.getDataValue().doubleValue());
            dtoList.add(dto);
            if (item != null) {
                ApiIndItemValueDTO dto = new ApiIndItemValueDTO();
                dto.setDataTime(item.getDataTime());
                dto.setDataValue(item.getDataValue().doubleValue());
                dtoList.add(dto);
            }
        });
        return success(dtoList);
    }

    @PermitAll
    @GetMapping("/query-ind/history-value")
    @PostMapping("/query-ind/history-value")
    @Operation(summary = "查询指标历史值")
    public CommonResult<List<ApiIndItemValueDTO>> queryIndItemHistoryValue(@RequestParam ApiIndItemQueryDTO dto) {
    public CommonResult<List<ApiIndItemValueDTO>> queryIndItemHistoryValue(@RequestBody ApiIndItemQueryDTO dto) {
        List<IndItemValueVO> list = indItemCollector.queryValue(dto.getItemNo(), dto.getStart(), dto.getEnd());
        return success(ConvertUtils.sourceToTarget(list, ApiIndItemValueDTO.class));
    }

    @PermitAll
    @PostMapping("/query-points/info")
    @PostMapping("/query-math-point/current-value")
    @Operation(summary = "根据计算点编号查询测点集合")
    public CommonResult<PageResult<ApiPointDTO>> queryPageByNo(@RequestBody ApiPointPageReqVO reqVO) {
        PageResult<ApiPointDTO> data = dataPointApi.getPageByNo(reqVO);
    public CommonResult<PageResult<ApiPointDTO>> queryMathPointCurrentValue(@RequestBody ApiPointPageReqVO reqVO) {
        PageResult<ApiPointDTO> data = dataPointApi.queryMathPointCurrentValue(reqVO);
        return success(data);
    }