风场图update

于紫祥_1901

2020-08-13 0d3583b86f33b7839a4a7d0917a70ab0eb9f1eb2

 src/main/java/com/moral/controller/ScreenController.java

@@ -91,6 +91,7 @@

import static com.moral.common.util.ResourceUtil.getValue;
import static com.moral.common.util.WebUtils.getParametersStartingWith;
import static java.util.Calendar.*;

/**
 * The Class ScreenController.大屏接口
@@ -1975,62 +1976,22 @@

    @GetMapping("/windAndDeviceData")
    @ResponseBody
    public Map<String, List> windAndDeviceData() {
        /*String monitorPointId="539";
        Calendar c = Calendar.getInstance();//可以对每个时间域单独修改   对时间进行加减操作等
        int year = c.get(Calendar.YEAR);
        int month = c.get(Calendar.MONTH);
        String mon="";
        if (month+1<10){
            mon="0"+(month+1);
    public List windAndDeviceData(String monitorPointId) {
        Calendar calendar = Calendar.getInstance();
        calendar.set(Calendar.MINUTE, (calendar.get(Calendar.MINUTE) - 2));
        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
        String time = df.format(calendar.getTime())+":00";
        int year = calendar.get(Calendar.YEAR);
        int month = calendar.get(Calendar.MONTH) + 1;
        String mon;
        if (month<10){
            mon="0"+month;
        }else {
            mon=(month+1)+"";
            mon=""+month;
        }
        int date = c.get(Calendar.DATE);
        String dt="";
        if(date<10){
            dt="0"+date;
        }else {
            dt=""+date;
        }
        int hour = c.get(Calendar.HOUR_OF_DAY);
        String hu="";
        if (hour<10){
            hu="0"+hour;
        }else {
            hu=""+hour;
        }
        int minute = c.get(Calendar.MINUTE);
        String mu="";
        if (minute<10){
            mu="0"+minute;
        }else {
            mu=""+minute;
        }
        String time=year + "-" + mon + "-" + dt + " " +hu + ":" +mu + ":" + "00";
        String table="history_minutely_"+year+mon;
        List list=deviceService.byMonitorIdGetDeviceAndWind(monitorPointId,time,table);
        return list;*/
        List<String> macList=deviceService.getAllMac();
        Map<String,List> latlngMap=new HashMap<String,List>();
        Map devMap=null;
        List list=new ArrayList();
        for (String mac : macList) {
            devMap=new HashMap();
            if (mac!=null){
                Device device=deviceService.byMacGetDevice(mac);
                List list1= LatLngTransformation.Convert_BD09_To_GCJ02(device.getLatitude(),device.getLongitude());
                devMap.put("lat",list1.get(1));
                devMap.put("lng",list1.get(0));
                devMap.put("monitorPointId",device.getMonitorPointId());
                //System.out.println(device);
                list.add(devMap);
            }else {
                continue;
            }
        }
        latlngMap.put("latlng",list);
        return latlngMap;
        return list;
    }
    @GetMapping("forecastO3")
    @ApiOperation(value = "预测和实际臭氧对比", notes = "预测和实际臭氧对比")
@@ -2072,7 +2033,7 @@
        String startTime = parameters.get("startTime").toString();
        String endTime = parameters.get("endTime").toString();
        //对时间进行操作的接口
        Calendar calendar = Calendar.getInstance();
        Calendar calendar = getInstance();
        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
        List<Map<String, Object>> list = new ArrayList();
        Map device = deviceService.getAllFieldByMac(parameters);