Merge remote-tracking branch 'origin/master'

jinpengyong

2020-11-23 8bb914874ef1ebcda2a9c606224bf3e3db2f46f8

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
package com.moral.service.impl; 
 
import java.util.List; 
import java.util.Map; 
 
import com.moral.entity.Device; 
import org.apache.log4j.Logger; 
import org.springframework.beans.factory.annotation.Autowired; 
import org.springframework.stereotype.Service; 
 
import com.moral.mapper.DeviceMapper; 
import com.moral.mapper.HistoryMapper; 
import com.moral.service.DeviceService; 
 
@Service 
public class DeviceServiceImpl implements DeviceService { 
 
    public static Logger log = Logger.getLogger(DeviceServiceImpl.class); 
 
    @Autowired 
    DeviceMapper deviceMapper; 
 
    @Autowired 
    HistoryMapper historyMapper; 
 
    @Override 
    public List<Map<String, Object>> getSensorData(Map<String, Object> parameters) { 
        return historyMapper.getSensorData(parameters); 
    } 
 
    @Override 
    public List<Map<String, Object>> getSensorDataOnce(Map<String, Object> parameters) { 
        return historyMapper.getSensorDataOnce(parameters); 
    } 
 
    @Override 
    public List<Map<String, Object>> getSensorDataByMac(Map<String, Object> parameters) { 
        return historyMapper.getSensorDataByMac(parameters); 
    } 
 
    @Override 
    public List<Map<String, Object>> getSensorDataByMacOnce(Map<String, Object> parameters) { 
        return historyMapper.getSensorDataByMacOnce(parameters); 
    } 
 
    @Override 
    public List<String> getMacs() { 
        return deviceMapper.getMacs(); 
    } 
 
    @Override 
    public List<String> getMacByOrganizationid(List<Object> organizationIdList) { 
        return deviceMapper.getMacByOrganizationid(organizationIdList); 
    } 
 
    @Override 
    public List<Map<String, Object>> macAndOrganizationIdMap(List<String> macs) { 
        return deviceMapper.macAndOrganizationIdMap(macs); 
    } 
 
    @Override 
    public List<Map<String, Object>> getAllByMacList(List<String> macList) { 
        return deviceMapper.getAllByMacList(macList); 
    } 
 
    @Override 
    public Device getDeviceByID(int id) { 
        Device result = deviceMapper.selectByPrimaryKey(id); 
        return result; 
    } 
}