blame | history | patch | commit | commitdiff | ignore whitespace
cjl
2023-08-26 c38942417e15141f9a03d11bb518195ecca44b42 
 screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java


@@ -1,5 +1,6 @@


package com.moral.api.controller;




import com.moral.api.dto.MonitoringStationDTO;


import com.moral.api.entity.MonitorPoint;


import com.moral.api.pojo.form.device.MonitorPointQueryForm;


import com.moral.api.pojo.vo.monitorPoint.MonitorPointsVO;


@@ -11,20 +12,13 @@


import com.moral.constant.ResultMessage;


import com.moral.util.WebUtils;




import io.swagger.annotations.Api;


import io.swagger.annotations.ApiImplicitParam;


import io.swagger.annotations.ApiImplicitParams;


import io.swagger.annotations.ApiOperation;


import io.swagger.annotations.*;


import lombok.extern.slf4j.Slf4j;


import org.apache.commons.collections4.CollectionUtils;


import org.apache.commons.lang3.StringUtils;


import org.apache.poi.ss.formula.functions.T;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.web.bind.annotation.CrossOrigin;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;


import org.springframework.web.bind.annotation.*;




import java.util.*;


import java.util.stream.Collectors;


@@ -113,10 +107,15 @@


        if (!params.containsKey("monitorPointIds")) {


            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());


        }


        String[] monitorPointIds = params.remove("monitorPointIds").toString().split(",");


        String monitorPoint = params.remove("monitorPointIds").toString();


        /*if(monitorPoint.contains("")){




        }*/


        String[] monitorPointIds = monitorPoint.split(",");


        if (monitorPointIds.length > 3) {


            return ResultMessage.ok();


        }




        params.put("monitorPointIds", monitorPointIds);


        List<Object> response = historyFiveMinutelyService.getAreaWindData(params);


        return ResultMessage.ok(response);


@@ -204,4 +203,14 @@


        }




    }


    @PostMapping("listMonitoring")


    public ResultMessage listMonitoring(@RequestBody Map<String, Object> params) {




        /*@RequestParam @ApiParam(value = "mac",name = "mac号") List<String> mac,


        @RequestParam @ApiParam(value = "startTime",name = "开始时间") String startTime,


        @RequestParam @ApiParam(value = "reportType",name = "type") int reportType,


        @RequestParam @ApiParam(value = "endTime",name = "结束时间") String endTime*/


        List<MonitoringStationDTO> resList = monitorPointService.listMonitoringStationDTO(params,Integer.parseInt(params.get("reportType").toString()),params.get("startTime").toString(),params.get("endTime").toString());


        return ResultMessage.ok(resList);


    }


}