fix：测试提交

cjl

2023-11-30 fc7bf1fdc7153859644d639ffe094d75b04cb9c7

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

@@ -1,6 +1,7 @@
package com.moral.api.controller;

import com.moral.api.dto.MonitoringStationDTO;
import com.moral.api.dto.MonitoringStationDTOResult;
import com.moral.api.entity.MonitorPoint;
import com.moral.api.pojo.form.device.MonitorPointQueryForm;
import com.moral.api.pojo.vo.monitorPoint.MonitorPointsVO;
@@ -20,6 +21,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;

@@ -111,6 +113,7 @@
        /*if(monitorPoint.contains("")){

        }*/
        params.put("monitorPointList", monitorPoint);
        String[] monitorPointIds = monitorPoint.split(",");
        if (monitorPointIds.length > 3) {
            return ResultMessage.ok();
@@ -118,6 +121,28 @@

        params.put("monitorPointIds", monitorPointIds);
        List<Object> response = historyFiveMinutelyService.getAreaWindData(params);
        return ResultMessage.ok(response);
    }
    @GetMapping("getWindDataCenter")
    @ApiOperation(value = "获取风场中心数据", notes = "获取风场中心数据")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
            @ApiImplicitParam(name = "monitorPointIds", value = "站点id", required = true, paramType = "query", dataType = "String")
    })
    public ResultMessage getWindDataCenter(HttpServletRequest request) {
        Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
        if (!params.containsKey("monitorPointIds")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        String monitorPoint = params.remove("monitorPointIds").toString();
        params.put("monitorPointList", monitorPoint);
        String[] monitorPointIds = monitorPoint.split(",");
        if (monitorPointIds.length > 3) {
            return ResultMessage.ok();
        }

        params.put("monitorPointIds", monitorPointIds);
        List<Object> response = historyFiveMinutelyService.getAreaWindDataCenter(params);
        return ResultMessage.ok(response);
    }

@@ -211,6 +236,29 @@
        @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());
        /*List<MonitoringStationDTOResult> list = new ArrayList<>();
        for(MonitoringStationDTO m : resList){
            MonitoringStationDTOResult result = new MonitoringStationDTOResult();
            result.setName(m.getName());
            result.setMac(m.getMac());
            result.setPM25(m.getPM25().compareTo(BigDecimal.ZERO)==0?"-":m.getPM25().toString());
            result.setPM25Num(m.getPM25Num()==0?"-":String.valueOf(m.getPM25Num()));
            result.setO3(m.getO3().compareTo(BigDecimal.ZERO)==0?"-":m.getO3().toString());
            result.setO3Num(m.getO3Num()==0?"-":String.valueOf(m.getO3Num()));
            result.setTovc(m.getTovc().compareTo(BigDecimal.ZERO)==0?"-":m.getTovc().toString());
            result.setTOVCNum(m.getTOVCNum()==0?"-":String.valueOf(m.getTOVCNum()));
            result.setComposite(m.getComposite().compareTo(BigDecimal.ZERO)==0?"-":m.getComposite().toString());
            result.setCompositeNum(m.getCompositeNum()==0?"-":String.valueOf(m.getCompositeNum()));
            result.setSO2(m.getSO2().compareTo(BigDecimal.ZERO)==0?"-":m.getSO2().toString());
            result.setSO2Num(m.getSO2Num()==0?"-":String.valueOf(m.getSO2Num()));
            result.setNO2(m.getNO2().compareTo(BigDecimal.ZERO)==0?"-":m.getNO2().toString());
            result.setNO2Num(m.getNO2Num()==0?"-":String.valueOf(m.getNO2Num()));
            result.setPM10(m.getPM10().compareTo(BigDecimal.ZERO)==0?"-":m.getPM10().toString());
            result.setPM10Num(m.getPM10Num()==0?"-":String.valueOf(m.getPM10Num()));
            result.setCO(m.getCO().compareTo(BigDecimal.ZERO)==0?"-":m.getCO().toString());
            result.setCONum(m.getCONum()==0?"-":String.valueOf(m.getCONum()));
            list.add(result);
        }*/
        return ResultMessage.ok(resList);
    }
}