Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-10-16 f26786e162241b6b803ada6d19d80e1f5fb615e5

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

@@ -223,7 +223,12 @@
                data = data + " " + sensor.getShowUnit();
                result.put(sensor.getCode(), data);
            } else {
                result.put(sensor.getCode(), "-");
                if (sensor.getCode().equals("a01008") ||sensor.getCode().equals("a01007")){
                    result.put(sensor.getCode(), "-");
                }else {
                    result.put(sensor.getCode(), "0"+" "+sensor.getShowUnit());
                }

            }
        }
        //添加设备名称
@@ -384,9 +389,9 @@

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

        List<Double> uList = new ArrayList<>();
        List<Double> vList = new ArrayList<>();
        int nums = Objects.nonNull(nx*ny)?nx*ny+100:100;
        List<Double> uList = new ArrayList<>(nums);
        List<Double> vList = new ArrayList<>(nums);
        int x;
        int y;