剔除沧州地图页面非本公司设备图标，vue页面城市地理特征更新

jinpengyong

2020-11-12 824762785fb717317550127684efb4f7b792cc8b

剔除沧州地图页面非本公司设备图标，vue页面城市地理特征更新

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

@@ -29,6 +29,7 @@
import com.moral.mapper.OrganizationMapper;

import com.moral.service.AccountService;

import com.moral.service.DeviceService;

import com.moral.service.MonitorPointService;

import com.moral.util.LatLngTransformation;

import com.moral.util.TkMybatisUtils;



@@ -39,6 +40,7 @@
import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.springframework.util.ObjectUtils;



import tk.mybatis.mapper.entity.Example;



@Service

@@ -78,6 +80,8 @@
    OrganizationMapper organizationMapper;

    @Resource

    DictionaryDataMapper dictionaryDataMapper;

    @Resource

    private MonitorPointService monitorPointService ;



    @Override

    public Map<String, Object> getDeviceStatesByAccount(Map<String, Object> parameters) {

@@ -207,13 +211,39 @@
    public List<Device> query(Map<String, Object> params) {

        List<Integer> dv = deviceMapper.getHasWindDirAndWindSpeedDeviceVersion();

        Object orgIdObj = params.get("orgId");

        String regionCode = params.get("regionCode").toString();

        List<Device> deviceList = null;

        if (orgIdObj != null) {

            Integer orgId = Integer.parseInt(orgIdObj.toString());

            List<Integer> orgIds = orgMapper.selectLowerOrgIds(orgId);

            params.put("orgIds", orgIds);

            System.out.println(params);

            //剔除沧州地图页面非公司设备图标

            if (regionCode.startsWith("1309")) {

                orgIds = new ArrayList<>();

                Collections.addAll(orgIds, 60, 65, 159, 165, 166);

            deviceList = deviceMapper.selectByMap(params);

                Iterator<Device> iter = deviceList.iterator();

                while (iter.hasNext()) {

                    Device device = iter.next();

                    Integer mpId = device.getMonitorPointId();

                    Integer oid = monitorPointService.byIdGetMonitorPoint(mpId).getOrganizationId();

                    if (!orgIds.contains(oid)) {

                        iter.remove();

                    } else {

                        if (orgId == 60) {

                            if (mpId != 56) {

                                iter.remove();

                            }

                        } else if (orgId == 65) {

                            if (mpId != 83 && mpId != 84) {

                                iter.remove();

                            }

                        }

                    }

                }

            }else {

                params.put("orgIds", orgIds);

                deviceList = deviceMapper.selectByMap(params);

            }

            // loadDeviceState(deviceList);

        }

        Example deviceExample = new Example(Device.class);//实例化


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

@@ -827,11 +827,16 @@


        //地理特征

        Map<String, Object> geographyMap = shAreaMapper.getGeography(name);

        if (geographyMap != null) {

        for (Map<String, Object> map : resultList) {

                if (geographyMap.get("lng") != null) {

            double longitude = Double.valueOf(geographyMap.get("lng").toString());

            double latitude = Double.valueOf(geographyMap.get("lat").toString());

            map.put("longitude", df.format(longitude));

                }

                if (geographyMap.get("lat") != null) {

                    double latitude = Double.valueOf(geographyMap.get("lat").toString());

            map.put("latitude", df.format(latitude));

                }

            if (geographyMap.get("altitude") != null) {

                map.put("altitude", geographyMap.get("altitude").toString());

            }

@@ -842,6 +847,8 @@
                map.put("river", geographyMap.get("river").toString());

            }

        }

        }



        for (int i = 0; i < resultList.size(); i = i + 2) {

            Map<String, Object> foreMap = resultList.get(i);

            Map<String, Object> realMap = resultList.get(i + 1);