添加风场历史小时数据显示

jinpengyong

2023-04-12 fc8fe626f222e024c1c4b45759ef0102174e5b9c

添加风场历史小时数据显示

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

@@ -6,15 +6,21 @@
import com.moral.api.service.HistoryFiveMinutelyService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.WebUtils;

import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;
import java.util.Map;

import javax.servlet.http.HttpServletRequest;

/**
 * @ClassName HistoryFiveMinutely
@@ -65,8 +71,13 @@
            * @Date: 2022/3/10
            */
    @GetMapping("queryPopDataByMac")
    public ResultMessage queryPopDataByMac(String mac){
        return  ResultMessage.ok(historyFiveMinutelyService.getPopDataByMac(mac));
    public ResultMessage queryPopDataByMac(HttpServletRequest request){
        Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
        Map<String, Object> popDataByMac = historyFiveMinutelyService.getPopDataByMac(params);
        if (popDataByMac==null){
            return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
        }
        return  ResultMessage.ok(popDataByMac);
    }
}


 screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.entity.HistoryHourly;
import com.moral.api.pojo.dto.Wind.WindData;

import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -21,4 +23,18 @@

    List<Map<String,Object>> selectDataByMacsAndTime(@Param("timeUnits") String timeUnits, @Param("list")List list, @Param("time")String time);


    String queryLastHourlyMac(String mac,String time,String timeUnits);


    List<WindData> getArea(Map<String, Object> params);

//    //获取TVOC浓度
//    String getTVOCByMac(@Param("mac") String mac, @Param("time") String time, @Param("sensor") String sensor,@Param("yearAndMonth") String yearAndMonth);
//
//    //获取压强大小
//    String getPressureByMac(@Param("mac") String mac,@Param("time") String time,@Param("yearAndMonth") String yearAndMonth);
//
//
//    Map<String,Object> getDataByMac(@Param("mac") String mac,@Param("time") String time,@Param("yearAndMonth") String yearAndMonth);
}

 screen-api/src/main/java/com/moral/api/pojo/form/historyFiveMinutely/QueryDeviceAndFiveMinuteDataForm.java

@@ -19,6 +19,10 @@

    private String sensorCode;

    private String chooseTime;

    private String time;

    public boolean valid(){
        if(ObjectUtils.isEmpty(organizationId)||
                ObjectUtils.isEmpty(regionCode)||

 screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java

@@ -47,6 +47,6 @@
            * @Author: 陈凯裕
            * @Date: 2022/3/10
            */
    Map<String,Object> getPopDataByMac(String mac);
    Map<String,Object> getPopDataByMac(Map<String, Object> params);

}

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

@@ -10,6 +10,7 @@
import com.moral.api.entity.*;
import com.moral.api.mapper.HistoryFiveMinutelyMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.mapper.HistoryHourlyMapper;
import com.moral.api.pojo.dto.Wind.WindData;
import com.moral.api.pojo.dto.historyFiveMinutely.DeviceAndFiveMinuteDataDTO;
import com.moral.api.pojo.form.device.MonitorPointQueryForm;
@@ -48,6 +49,9 @@
    RedisTemplate redisTemplate;
    @Autowired
    HistoryFiveMinutelyMapper historyFiveMinutelyMapper;

    @Autowired
    HistoryHourlyMapper historyHourlyMapper;
    @Autowired
    DeviceService deviceService;

@@ -73,6 +77,26 @@
        }
        //查询所有设备对应的数据
        List<DeviceAndFiveMinuteDataDTO> dtos = new ArrayList<>();
        if (form.getChooseTime().equals("true")){
            String time = form.getTime();
            String timeUnits = DateUtils.stringToDateString(time, "yyyy-MM-dd HH:mm", DateUtils.yyyyMM_EN);
            for (Device device : devices) {
                DeviceAndFiveMinuteDataDTO dto = new DeviceAndFiveMinuteDataDTO();
                String mac = device.getMac();
                String dbDataStr = historyHourlyMapper.queryLastHourlyMac(mac, time, timeUnits);
//                String dbDataStr = historyFiveMinutelyMapper.queryLastFiveMinutely(mac, time, timeUnits);
                HashMap sensorValues = JSON.parseObject(dbDataStr, HashMap.class);
                Map<String, Object> sensorValue = new HashMap<>();
                if (sensorValues != null && sensorValues.get(sensorCode) != null)
                    sensorValue.put(sensorCode, sensorValues.get(sensorCode));
                else
                    sensorValue.put(sensorCode, null);
                dto.setDevice(device);
                dto.setSensorValue(sensorValue);
                dtos.add(dto);
            }
            return dtos;
        }
        for (Device device : devices) {
            DeviceAndFiveMinuteDataDTO dto = new DeviceAndFiveMinuteDataDTO();
            String mac = device.getMac();
@@ -117,21 +141,53 @@

    @Override
    public List<Object> getAreaWindData(Map<String, Object> params) {
//        String timeUnits = DateUtils.dateToDateString(new Date(), DateUtils.yyyyMM_EN);
//        params.put("timeUnits", timeUnits);
//        //风场数据
//        List<WindData> windData = historyFiveMinutelyMapper.getAreaWindData(params);
//        return getWindData(windData);
        String chooseTime = params.get("chooseTime").toString();
        List<WindData> windData=null;
        if (chooseTime.equals("true")){
            String time = params.get("time").toString();
            String timeUnits = DateUtils.stringToDateString(time, "yyyy-MM-dd HH:mm", DateUtils.yyyyMM_EN);
            params.put("timeUnits", timeUnits);
            windData = historyHourlyMapper.getArea(params);
        }else {
        String timeUnits = DateUtils.dateToDateString(new Date(), DateUtils.yyyyMM_EN);
        params.put("timeUnits", timeUnits);
        //风场数据
        List<WindData> windData = historyFiveMinutelyMapper.getAreaWindData(params);
            windData = historyFiveMinutelyMapper.getAreaWindData(params);
        }

        return getWindData(windData);
    }


    //获取五分钟弹窗数据
    @Override
    public Map<String, Object> getPopDataByMac(String mac) {
        Map<String, Object> datas = queryLastDataByMac(mac);
    public Map<String, Object> getPopDataByMac(Map<String, Object> params) {
//        Map<String, Object> datas = queryLastDataByMac(mac);
        String chooseTime = params.get("chooseTime").toString();
        String mac = params.get("mac").toString();
        Map<String, Object> datas=null;
        if (chooseTime.equals("true")){
            String time = params.get("time").toString();
            String timeUnits = DateUtils.stringToDateString(time, "yyyy-MM-dd HH:mm", DateUtils.yyyyMM_EN);
            String dbDataStr = historyHourlyMapper.queryLastHourlyMac(mac, time, timeUnits);
            if (dbDataStr==null){
                return null;
            }
//            String dbDataStr = historyFiveMinutelyMapper.queryLastFiveMinutely(mac, time, timeUnits);
            datas = JSON.parseObject(dbDataStr, HashMap.class);
            datas.put("dataTime",time);
        }else {
            datas = queryLastDataByMac(mac);
        }
        //构建返回对象
        Map<String, Object> result = new HashMap<>();
        //创建返回因子code集合
        List<String> sensorCodes = Arrays.asList("a34004", "a34002", "a21005", "a21004", "a21026", "a05024", "a99054");
        List<String> sensorCodes = Arrays.asList("a34004", "a34002", "a21005", "a21004", "a21026", "a05024", "a99054","a01008","a01007");
        //获取设备信息
        Device device = deviceService.getDeviceUnitAlramInforByMac(mac);
        //转换数据单位和名称
@@ -168,6 +224,8 @@
        Object NO2 = data.get("a21004");
        Object CO = data.get("a21005");
        Object O3 = data.get("a05024");
        Object a01008 = data.get("a01008");
        Object a01007 = data.get("a01007");
        Object name = data.get("name");
        Object time = data.get("dataTime");
        if(name!=null)
@@ -186,6 +244,10 @@
            result.put("臭氧（O₃）",O3);
        if(time!=null)
            result.put("时间",time);
        if (a01008!=null)
            result.put("风向",a01008);
        if (a01007!=null)
            result.put("风速",a01007);
        return result;
    }

@@ -240,7 +302,9 @@
        List<Object> list = new ArrayList<>();
        List<Map<String, Object>> mapList = new ArrayList<>();
        for (WindData data : windData) {
            //经度
            Double longitude = data.getLongitude();
            //纬度
            Double latitude = data.getLatitude();
            GeoCoordinates geoCoordinates = GeoCoordinates.create(longitude, latitude);
            points.add(geoCoordinates);
@@ -248,14 +312,18 @@
            laList.add(latitude);

            Map<String, Object> map = new HashMap<>();
            //风向
            Double windDir = data.getWindDir();
            //风速
            Double windSpeed = data.getWindSpeed();
            if (windDir == null) {
                windDir = 0d;
                windSpeed = 0d;
            }
            double dir = (360.0 - (windDir + 180.0) * Math.PI / 180.0);
            //余弦值
            U = windSpeed * Math.cos(dir);
            //三角正弦值
            V = windSpeed * Math.sin(dir);
            map.put("lo", longitude);
            map.put("la", latitude);
@@ -282,12 +350,20 @@
        laLaMap.put("minLa", lami);

        Double lo1 = lomi - length * 0.00001141;
//        Double lo1 = lomi - length * 0.000001141 * 2;
        Double lo2 = loma + length * 0.00001141;
//        Double lo2 = loma + length * 0.000001141 * 2;
//        Double la2 = lami - length * 0.000000899 * 2;
        Double la2 = lami - length * 0.00000899;
//        Double la1 = lama + length * 0.000000899 * 2;
        Double la1 = lama + length * 0.00000899;

        double dx = 0.00001141 * perdlen;
        double dy = 0.00000899 * perdlen;

//        double dx = 0.000001141 * perdlen * 2;
//        double dy = 0.000000899 * perdlen * 2;

        int nx = (int) Math.floor((lo2 - lo1) / dx);
        int ny = (int) Math.floor((la1 - la2) / dy);


 screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml

@@ -14,4 +14,43 @@
        </foreach>
        and `time` = #{time}
    </select>

    <select id="queryLastHourlyMac" resultType="java.lang.String">
        SELECT `value` FROM history_hourly_${timeUnits} WHERE mac = #{mac} AND `time` = #{time}
    </select>



    <select id="getArea" resultType="com.moral.api.pojo.dto.Wind.WindData">
        SELECT
        d.longitude AS longitude,
        d.latitude AS latitude,
        CASE WHEN
        h.value->'$.a01007' = 0 THEN 0.1 ELSE h.value->'$.a01007' END AS windSpeed,
        h.value->'$.a01008' AS windDir
        FROM history_hourly_${timeUnits} h ,
        `device` AS d
        WHERE d.mac = h.mac
        AND d.mac IN
        (SELECT mac FROM device WHERE monitor_point_id IN
        <foreach item="monitorPointId" collection="monitorPointIds" index="index" open="(" separator="," close=")">
            #{monitorPointId}
        </foreach>
        )
        AND h.time = #{time}
    </select>

    <select id="getTVOCByMac" resultType="java.lang.String">
        select `value` ->'$.${sensor}' from history_hourly_${yearAndMonth} where mac=#{mac} and time=#{time}
    </select>


    <select id="getPressureByMac" resultType="java.lang.String">
        select `value`->'$.a01006' from history_hourly_${yearAndMonth} where mac=#{mac} and time=#{time}
    </select>


    <select id="getDataByMac" resultType="java.util.Map">
        select `value`  from history_hourly_${yearAndMonth} where mac=#{mac} and time=#{time}
    </select>
</mapper>