净化率，收集率，无组织排放

于紫祥_1901

2020-06-23 235a2be052544e41cef217920d4e55fee730995e

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

@@ -1,5 +1,16 @@
package com.moral.service.impl;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.Date;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.stream.Collectors;



import javax.annotation.Resource;

import javax.validation.constraints.NotNull;



import com.alibaba.fastjson.TypeReference;

import com.github.pagehelper.Page;

import com.github.pagehelper.PageHelper;

@@ -29,19 +40,7 @@
import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.springframework.util.ObjectUtils;



import tk.mybatis.mapper.entity.Example;



import javax.annotation.Resource;

import javax.validation.constraints.NotNull;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.Date;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.stream.Collectors;



@Service

public class DeviceServiceImpl implements DeviceService {

@@ -214,7 +213,7 @@
            List<Integer> orgIds = orgMapper.selectLowerOrgIds(orgId);

            params.put("orgIds", orgIds);

            deviceList = deviceMapper.selectByMap(params);

            loadDeviceState(deviceList);

            // loadDeviceState(deviceList);

        }

        return deviceList;

    }

@@ -631,4 +630,24 @@
        }

        return null;

    }



    @Override

    public List<String> getMacsByOrganizationId(List<Object> organizationIdList) {

        return deviceMapper.getMacsByOrganizationId(organizationIdList);

    }



    @Override

    public List<Device> getDeviceById1(int id) {

        return deviceMapper.getDeviceById1(id);

    }



    @Override

    public List<Device> getDeviceById2(int id) {

        return deviceMapper.getDeviceById2(id);

    }



    @Override

    public List<Device> getDeviceById3(int id) {

        return deviceMapper.getDeviceById3(id);

    }

}