部分提交

chen_xi

2023-06-28 95a6e4392acc0f559b78c7300fdb3e5155e89795

 screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java

@@ -22,6 +22,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -96,8 +97,10 @@
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        String[] monitorPointIds = params.remove("monitorPointIds").toString().split(",");
        List<String> collect = Arrays.stream(monitorPointIds).filter(o -> !o.equals("60")).collect(Collectors.toList());
        params.put("monitorPointIds", collect);
        if (monitorPointIds.length >3){
            return ResultMessage.ok();
        }
        params.put("monitorPointIds", monitorPointIds);
        List<Object> response = historyFiveMinutelyService.getAreaWindData(params);
        return ResultMessage.ok(response);
    }
@@ -127,12 +130,11 @@
     */
    @PostMapping("getHourlyDataExcel")
    public ResultMessage getHourlyDataExcel(@RequestBody Map<String, Object> params) {
        if (!params.containsKey("macs") || !params.containsKey("sensors") || !params.containsKey("startTime") || !params.containsKey("endTime")) {
        if (!params.containsKey("macs") || !params.containsKey("sensors") || !params.containsKey("times") || !params.containsKey("type")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        List<Map<String, Object>> resList = monitorPointService.getHourlyDataDataV3(params);
        return ResultMessage.ok(resList);
    }


}