fix:盐城热力图补充提交

jinpengyong

2024-03-27 5bb2f06ca9e24079aaad74ccb29d94874832dd6b

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

@@ -439,12 +439,12 @@
        ArrayList<Integer> list = new ArrayList<>();
        list.add(id);
        ArrayList<HeatMapDTO> rsHeatMap = new ArrayList<>();
        ArrayList<String> list1 = new ArrayList<>();
/*        ArrayList<String> list1 = new ArrayList<>();
        list1.add("腾鳌镇政府");
        list1.add("西四镇政府");
        list1.add("孤山镇政府");
        list1.add("英落镇政府");
        list1.add("马风镇朱红村");
        list1.add("马风镇朱红村");*/

        if (form.equals("hour")){ //小时
//            String[] split = startTime.split("-");
@@ -508,43 +508,84 @@
            getHeatMap(heatMap,type);
            rsHeatMap.addAll(heatMap);
        }
        for (int i = 0; i <6; i++) {
            HeatMapDTO heatMapDTO = new HeatMapDTO();
            heatMapDTO.setCount(0.0);
            if (i==0){
                heatMapDTO.setLat(40.590436);
                heatMapDTO.setLng(122.861935);
                heatMapDTO.setMac("1111");
                heatMapDTO.setName("1111");
            }else if (i==1){
                heatMapDTO.setLat(40.636617);
                heatMapDTO.setLng(123.101544);
                heatMapDTO.setMac("2222");
                heatMapDTO.setName("2222");
            }else if (i==2){
                heatMapDTO.setLat(40.890881);
                heatMapDTO.setLng(122.910687);
                heatMapDTO.setMac("3333");
                heatMapDTO.setName("3333");
            }else if (i==3){
                heatMapDTO.setLat(40.682129);
                heatMapDTO.setLng(123.105836);
                heatMapDTO.setMac("4444");
                heatMapDTO.setName("4444");
            }else if (i==4){
                heatMapDTO.setLat(40.890037);
                heatMapDTO.setLng(123.021151);
                heatMapDTO.setMac("5555");
                heatMapDTO.setName("5555");
            }else {
                heatMapDTO.setLat(41.051333);
                heatMapDTO.setLng(122.505864);
                heatMapDTO.setMac("6666");
                heatMapDTO.setName("6666");
        if (id==71){
            for (int i = 0; i <6; i++) {
                HeatMapDTO heatMapDTO = new HeatMapDTO();
                heatMapDTO.setCount(0.0);
                if (i==0){
                    heatMapDTO.setLat(40.590436);
                    heatMapDTO.setLng(122.861935);
                    heatMapDTO.setMac("1111");
                    heatMapDTO.setName("1111");
                }else if (i==1){
                    heatMapDTO.setLat(40.636617);
                    heatMapDTO.setLng(123.101544);
                    heatMapDTO.setMac("2222");
                    heatMapDTO.setName("2222");
                }else if (i==2){
                    heatMapDTO.setLat(40.890881);
                    heatMapDTO.setLng(122.910687);
                    heatMapDTO.setMac("3333");
                    heatMapDTO.setName("3333");
                }else if (i==3){
                    heatMapDTO.setLat(40.682129);
                    heatMapDTO.setLng(123.105836);
                    heatMapDTO.setMac("4444");
                    heatMapDTO.setName("4444");
                }else if (i==4){
                    heatMapDTO.setLat(40.890037);
                    heatMapDTO.setLng(123.021151);
                    heatMapDTO.setMac("5555");
                    heatMapDTO.setName("5555");
                }else {
                    heatMapDTO.setLat(41.051333);
                    heatMapDTO.setLng(122.505864);
                    heatMapDTO.setMac("6666");
                    heatMapDTO.setName("6666");
                }
                rsHeatMap.add(heatMapDTO);
            }
            rsHeatMap.add(heatMapDTO);
        }

       if (id==73){
           //亭湖区
           double lat =33.414538;
           double lng =120.066616;
           for (int i = 0; i <11 ; i++) {
               for (int j = 0; j < 20; j++) {
                   HeatMapDTO heatMapDTO = new HeatMapDTO();
                   heatMapDTO.setCount(0.0);
                   heatMapDTO.setLat(lat);
                   heatMapDTO.setLng(lng);
                   heatMapDTO.setName("1");
                   heatMapDTO.setMac(i+"1"+j);
                   rsHeatMap.add(heatMapDTO);
                   lng=lng+0.01;
                   if (j==19){
                       lng=120.066616;
                   }
               }
               lat =lat-0.01;
           }
           //大丰区
           double lat1 =33.214555;
           double lng1 =120.416805;
           for (int i = 0; i < 11 ; i++) {
               for (int j = 0; j < 10; j++) {
                   HeatMapDTO heatMapDTO = new HeatMapDTO();
                   heatMapDTO.setCount(0.0);
                   heatMapDTO.setLat(lat1);
                   heatMapDTO.setLng(lng1);
                   heatMapDTO.setName("2");
                   heatMapDTO.setMac(i+"2"+j);
                   rsHeatMap.add(heatMapDTO);
                   lng1=lng1+0.004;
                   if (j==9){
                       lng1=120.416805;
                   }
               }
               lat1 =lat1-0.0022;
           }
       }
        return distrinList(rsHeatMap);
    }