多个指标/测点历史数据

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

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

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.module.ansteel.api.dto.*;
import com.iailab.module.ansteel.api.service.DataService;
@@ -10,6 +13,7 @@
import com.iailab.module.model.api.mcs.dto.StAlarmAndSuggestReqVO;
import io.swagger.v3.oas.annotations.Operation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -77,6 +81,27 @@
        return success(dataService.getHistoryValue(params));
    }

    @PostMapping("/datas/history-value")
    @Operation(summary = "多个指标/测点历史数据")
    public CommonResult<Map<String,List<Object[]>>> getDatasHistoryValue(@RequestBody Map<String, Object> params) {
        Map<String,List<Object[]>> result = new HashMap<>();
        if (!params.containsKey("datas") || StringUtils.isBlank(params.get("datas").toString())) {
            return success(result);
        }
        JSONArray jsonArray = JSON.parseArray(params.get("datas").toString());
        for (Object data : jsonArray) {
            Map<String, Object> param = new HashMap<>();
            JSONObject jsonObject = JSON.parseObject(data.toString());
            param.put("dataType",jsonObject.get("dataType"));
            param.put("dataNo",jsonObject.get("dataNo"));
            param.put("startTime",params.get("startTime"));
            param.put("endTime",params.get("endTime"));
            List<Object[]> historyValue = dataService.getHistoryValue(params);
            result.put(jsonObject.get("dataNo").toString(),historyValue);
        }
        return success(result);
    }

    @PostMapping("/write-point-value")
    @Operation(summary = "写入测点值")
    public CommonResult writePointRealValue(@RequestBody ApiPointValueWriteDTO writeDTO) {

 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunDayScheduleModuleTask.java

@@ -36,17 +36,29 @@
    public void run(String params) {
        logger.info("runDayScheduleModuleTask定时任务正在执行，参数为：{}", params);
        try {
            String[] split = params.split(",");
            String code;
            String day = "0";
            if (split.length > 1) {
                code = split[0];
                day = split[1];
            }else {
                code = split[0];
            }


            Calendar calendar = Calendar.getInstance();
            calendar.set(Calendar.SECOND, 0);
            calendar.set(Calendar.MILLISECOND, 0);
            calendar.set(Calendar.MINUTE,0);
            calendar.set(Calendar.HOUR_OF_DAY,0);
            calendar.add(Calendar.DAY_OF_YEAR,Integer.parseInt(day));

            MdkScheduleReqDTO dto = new MdkScheduleReqDTO();
            dto.setScheduleTime(calendar.getTime());
            dto.setScheduleCode(params);
            dto.setScheduleCode(code);
            MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(dto);
            logger.info(params + "调度方案执行完成，" + mdkScheduleRespDTO);
            logger.info(code + "调度方案执行完成，" + mdkScheduleRespDTO);
            logger.info("调度方案结果开始下发");
            if (mdkApi.scheduleModelOut(mdkScheduleRespDTO)) {
                logger.info("调度方案结果下发成功");
@@ -55,7 +67,7 @@
            }

            //焦化备煤建议保存
            if (AnStellCOAL.equals(params)) {
            if (AnStellCOAL.equals(code)) {
                Object equipOperationInfo =  mdkScheduleRespDTO.getResult().get("EquipOperationInfo");
                if(equipOperationInfo != null && StringUtils.isNotBlank(equipOperationInfo.toString())) {
                    JSONArray jsonArray = JSON.parseArray(equipOperationInfo.toString());