Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-15 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b

 src/main/java/com/moral/service/DeviceService.java

@@ -80,8 +80,17 @@


   Device byMacGetDevice(String mac);



   List<DeviceAndWind> byMonitorIdGetDeviceAndWind(String id,String time,String tab);

   List<DeviceAndWind> byMonitorIdGetDeviceAndWindSpecial(String id,String time,String tab);

   List<DeviceAndWind> byMonitorIdGetDeviceAndWind(String id,String tab);

   List<DeviceAndWind> byMonitorIdGetDeviceAndWindSpecial(String id,String tab);



   List<Device> getDeviceByCodeAndId(String code,String id);



   String byMacGetOrgId(String mac);

   //通过mac号或者设备名进行查询设备

   List<Device> getDevice(String macOrName);



   List<Device> getDeviceByCode();



   List<Device> getDevicesByAccountId(String id);



}