修改获取五分钟数据无站点相关BUG

kaiyu

2020-12-02 84b79096372143c9f9ed5d91156a966f7d119c2b

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

@@ -42,6 +42,7 @@


import org.apache.commons.collections.CollectionUtils;

import org.springframework.stereotype.Service;

import org.springframework.util.ObjectUtils;

import tk.mybatis.mapper.entity.Example;

import tk.mybatis.mapper.entity.Example.Criteria;



@@ -275,6 +276,11 @@
    }



    @Override

    public List<MonitorPoint> getMonitorPointsByOrganizationIds(Set<Integer> orgIds) {

        return monitorPointMapper.getMonitorPointsByOrganizationIds(orgIds);

    }



    @Override

    public List<MonitorPoint> getMonitorPointsByRegion(Map<String, Object> parameters) {

        Example example = new Example(MonitorPoint.class);

        Criteria criteria = example.createCriteria();

@@ -370,6 +376,33 @@
        }

        return monitorPoints;

    }



    @Override

    public List<MonitorPoint> getMonitorPointsByRegionAndOrgId(Map<String, Object> parameters) {

        //校验参数

        Object organizationId = parameters.remove("organizationId");

        //判断参数是否为null，如果为null则抛出自定义异常，msgKey为异常信息

        ValidateUtil.notNull(organizationId, "param.is.null");

        ValidateUtil.notNull(parameters.get("regionCode"), "param.is.null");



        //组装查询条件

        ParameterUtils.getRegionType4RegionCode(parameters);



        //查询对应code的站点数据

        Example example = new Example(MonitorPoint.class);

        Criteria criteria = example.createCriteria();

        criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE);



        //判断是否为本公司开发人员，如果不是则添加orgid限制用户查看权限

        if (Constants.isNotSpecialOrgId(Integer.valueOf(organizationId.toString()))) {

            Set<Integer> organizationIds = organizationService.getChildOrganizationIds(Integer.valueOf(organizationId.toString()));

            criteria.andIn("organizationId", organizationIds);

        }

        criteria.andEqualTo(parameters.get("regionType") + "Code", parameters.remove("regionCode"));

        List<MonitorPoint> monitorPoints = monitorPointMapper.selectByExample(example);

        return monitorPoints;

    }





    @SuppressWarnings("unchecked")

    @Override

@@ -806,11 +839,11 @@
        //获取厂界所有设备

        List<Device> deviceList = deviceService.getDeviceById2(monitPointId);



        params.put("longitudeCompany",monitorPoint.getLongitude());

        params.put("latitudeCompany",monitorPoint.getLatitude());

        params.put("latitudeCompany",monitorPoint.getLatitude());

        params.put("monitPointId",monitPointId);

        params.put("deviceList",deviceList);

        params.put("longitudeCompany", monitorPoint.getLongitude());

        params.put("latitudeCompany", monitorPoint.getLatitude());

        params.put("latitudeCompany", monitorPoint.getLatitude());

        params.put("monitPointId", monitPointId);

        params.put("deviceList", deviceList);

        return params;

    }