screen-aqi 更改监测站点DTO参数

kaiyu

2021-09-27 c2c52844bac20aeda08c9e25c8b525bc556ef586

screen-aqi
           更改监测站点DTO参数

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

@@ -54,19 +54,37 @@
        dto1.setOrganizationName("模拟组织2");
        dto2.setOrganizationName("模拟组织3");

        Map<String,Object> valueMap = new HashMap<>();
        valueMap.put("a21026",1);
        valueMap.put("a21004",1);
        valueMap.put("a34002",1);
        valueMap.put("a34004",1);
        valueMap.put("a21005",1);
        valueMap.put("a05024",1);
        valueMap.put("a99054",1);
        valueMap.put("AQI",1);
        dto.setA05024(1);
        dto1.setA05024(1);
        dto2.setA05024(1);

        dto.setValues(valueMap);
        dto1.setValues(valueMap);
        dto2.setValues(valueMap);
        dto.setA21005(1d);
        dto1.setA21005(1d);
        dto2.setA21005(1d);

        dto.setA21004(1);
        dto1.setA21004(1);
        dto2.setA21004(1);

        dto.setA21026(1);
        dto1.setA21026(1);
        dto2.setA21026(1);

        dto.setA34002(1);
        dto1.setA34002(1);
        dto2.setA34002(1);

        dto.setA34004(1);
        dto1.setA34004(1);
        dto2.setA34004(1);

        dto.setA99054(1d);
        dto1.setA99054(1d);
        dto2.setA99054(1d);

        dto.setAQI(1);
        dto1.setAQI(1);
        dto2.setAQI(1);

        List<MonitorPointDataDisplayDTO> list = new ArrayList<>();
        list.add(dto);

 screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/MonitorPointDataDisplayDTO.java

@@ -20,6 +20,25 @@

    private String time;

    private Map<String,Object> values;
    private Double a21005;

    private int a21026;

    private int a21004;

    private int AQI;

    private int a34002;

    private Double a99054;

    private int a34004;

    private int a05024;

    /*
    * 综合指数
    * */
    private Double comIndex;

}

 screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java

@@ -57,6 +57,8 @@
            endTimeStr+=" 23:59:59";
            endTime = DateUtils.getDate(endTimeStr,"yyyy-MM-dd HH:mm:ss");
        } else {
            if(startTime!=null&&endTime!=null)
                return false;
            if (reportType.equals(Constants.HOURYLYREPORT)) {
                //时报选项默认为上个小时的数据
                Date previousHour = DateUtils.getDateOfMin(new Date(), -60);

 screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java

@@ -74,7 +74,7 @@
            //获取设备名称
            String deviceName = deviceMap.get(key).getName();
            //获取组织名称
            organizationService.getOrganizationById(deviceMap.get(key).getOrganizationId());
            String orgName = organizationService.getOrganizationById(deviceMap.get(key).getOrganizationId()).getName();
            //拼接时间
            String startTime = DateUtils.dateToDateString(startDate, "yyyy-MM-dd");
            String endTime = DateUtils.dateToDateString(endDate, "yyyy-MM-dd");
@@ -165,6 +165,10 @@
            double TVOCAvg = AmendUtils.sciCal(TVOCSum / TVOCNum,2);


            dto.setDeviceName(deviceName);
            dto.setTime(time);
            dto.setOrganizationName(orgName);

        });
    }