test

jpy

2023-05-27 48cde94624bec615f9df9a481339d5b71be311e5

test

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

@@ -22,8 +22,10 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import javax.servlet.http.HttpServletRequest;

@@ -63,14 +65,14 @@
    }

    /**
    * @Description: 查询组织下所有的站点id以及name
            * @Param: [organizationId]
            * @return: com.moral.constant.ResultMessage
            * @Author: 陈凯裕
            * @Date: 2021/9/26
            */
     * @Description: 查询组织下所有的站点id以及name
     * @Param: [organizationId]
     * @return: com.moral.constant.ResultMessage
     * @Author: 陈凯裕
     * @Date: 2021/9/26
     */
    @GetMapping("queryAllMonitorPoints")
    public ResultMessage queryAllMonitorPoints(Integer organizationId){
    public ResultMessage queryAllMonitorPoints(Integer organizationId) {
        //处理查询业务
        List<MonitorPoint> monitorPoints = monitorPointService.queryAllMonitorPoints(organizationId);
        //返回数据
@@ -94,17 +96,18 @@
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        String[] monitorPointIds = params.remove("monitorPointIds").toString().split(",");
        params.put("monitorPointIds", monitorPointIds);
        List<String> collect = Arrays.stream(monitorPointIds).filter(o -> !o.equals("60")).collect(Collectors.toList());
        params.put("monitorPointIds", collect);
        List<Object> response = historyFiveMinutelyService.getAreaWindData(params);
        return ResultMessage.ok(response);
    }

    /**
      *@Description: 监测站点数据显示导出
      *@Param: [request]
      *@return: com.moral.constant.ResultMessage 
      *@Author: lizijie
      *@Date: 2022-10-10 14:00
     * @Description: 监测站点数据显示导出
     * @Param: [request]
     * @return: com.moral.constant.ResultMessage
     * @Author: lizijie
     * @Date: 2022-10-10 14:00
     **/
    @GetMapping("getHourlyDataByMonitorPoint")
    public ResultMessage getHourlyDataByMonitorPoint(HttpServletRequest request) {
@@ -118,11 +121,12 @@

    /**
     * 监测站点数据导出
     *
     * @param params
     * @return
     */
    @PostMapping("getHourlyDataExcel")
    public ResultMessage getHourlyDataExcel(@RequestBody Map<String, Object> params){
    public ResultMessage getHourlyDataExcel(@RequestBody Map<String, Object> params) {
        if (!params.containsKey("macs") || !params.containsKey("sensors") || !params.containsKey("startTime") || !params.containsKey("endTime")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }