风场图update

于紫祥_1901

2020-08-31 c3e1f9b9af29647bd157f2ea268bc56b2d3b9df1

 src/main/java/com/moral/service/impl/DeviceServiceImpl.java

@@ -876,10 +876,10 @@


    @Override

    public List byMonitorIdGetDeviceAndWindSpecial(String id, String time, String tab) {



        MonitorPoint monitorPoint=monitorPointMapper.byIdGetMonitorPoint(Integer.parseInt(id));

        Integer areaCode=monitorPoint.getAreaCode();

        String townCode= monitorPoint.getTownCode()+"";

        int monitorPointId=monitorPoint.getId();

        Map<String, Object> parm=new HashMap<>();

        List<DeviceAndWind> deviceAndWinds=new ArrayList<>();

        Double  loma= 0.0;

@@ -913,6 +913,14 @@
            }

            length=2000;

            perdlen=280;

        }else if(monitorPointId==35){

         DeviceAndWind deviceAndWind=deviceMapper.getDeviceAndWindByMac("898607b0101730392253",time,tab);

         DeviceAndWind deviceAndWind1=deviceMapper.getDeviceAndWindByMac("p5dnd7a0392083",time,tab);

         deviceAndWinds.add(deviceAndWind);

         deviceAndWinds.add(deviceAndWind1);

            length=2000;

            perdlen=50;



        }else {

            deviceAndWinds=deviceMapper.byMonitorIdGetDeviceAndWind(Integer.parseInt(id),time,tab);

            length=2000;

@@ -1069,8 +1077,4 @@
        return list;

    }



    @Override

    public DeviceAndWind getDeviceAndWindByMac(String mac,String time,String table) {

        return deviceMapper.getDeviceAndWindByMac(mac,time,table);

    }

}