From bb77c5e3089fc3e9ccb520625b7798d81c99bfa2 Mon Sep 17 00:00:00 2001 From: 于紫祥_1901 <email@yuzixiang_1910> Date: Fri, 06 Nov 2020 13:55:15 +0800 Subject: [PATCH] update --- src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java index f31a2d0..8d30c75 100644 --- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java @@ -212,6 +212,7 @@ Integer orgId = Integer.parseInt(orgIdObj.toString()); List<Integer> orgIds = orgMapper.selectLowerOrgIds(orgId); params.put("orgIds", orgIds); + System.out.println(params); deviceList = deviceMapper.selectByMap(params); // loadDeviceState(deviceList); } @@ -718,8 +719,8 @@ } @Override - public List byMonitorIdGetDeviceAndWind(String id,String time,String tab) { - List<DeviceAndWind> deviceAndWinds=deviceMapper.byMonitorIdGetDeviceAndWind(Integer.parseInt(id),time,tab); + public List byMonitorIdGetDeviceAndWind(String id,String tab) { + List<DeviceAndWind> deviceAndWinds=deviceMapper.byMonitorIdGetDeviceAndWind(Integer.parseInt(id),tab); List loList=new ArrayList(); List laList=new ArrayList(); Double U=0.0; @@ -875,7 +876,7 @@ } @Override - public List byMonitorIdGetDeviceAndWindSpecial(String id, String time, String tab) { + public List byMonitorIdGetDeviceAndWindSpecial(String id, String tab) { MonitorPoint monitorPoint=monitorPointMapper.byIdGetMonitorPoint(Integer.parseInt(id)); Integer areaCode=monitorPoint.getAreaCode(); String townCode= monitorPoint.getTownCode()+""; @@ -894,7 +895,7 @@ List<Device> deviceList=deviceMapper.getDeviceByCode(parm); for (Device d : deviceList) { String mac=d.getMac(); - DeviceAndWind deviceAndWind = deviceMapper.byMacGetDeviceAndWind(mac,time,tab); + DeviceAndWind deviceAndWind = deviceMapper.byMacGetDeviceAndWind(mac,tab); if (deviceAndWind!=null){ deviceAndWinds.add(deviceAndWind); } @@ -906,7 +907,7 @@ List<Device> deviceList=deviceMapper.getDeviceByCode(parm); for (Device d : deviceList) { String mac=d.getMac(); - DeviceAndWind deviceAndWind = deviceMapper.byMacGetDeviceAndWind(mac,time,tab); + DeviceAndWind deviceAndWind = deviceMapper.byMacGetDeviceAndWind(mac,tab); if (deviceAndWind!=null){ deviceAndWinds.add(deviceAndWind); } @@ -914,15 +915,15 @@ length=2000; perdlen=280; }else if(monitorPointId==35){ - DeviceAndWind deviceAndWind=deviceMapper.getDeviceAndWindByMac("898607b0101730392253",time,tab); - DeviceAndWind deviceAndWind1=deviceMapper.getDeviceAndWindByMac("p5dnd7a0392083",time,tab); + DeviceAndWind deviceAndWind=deviceMapper.getDeviceAndWindByMac("898607b0101730392253",tab); + DeviceAndWind deviceAndWind1=deviceMapper.getDeviceAndWindByMac("p5dnd7a0392083",tab); deviceAndWinds.add(deviceAndWind); deviceAndWinds.add(deviceAndWind1); length=2000; perdlen=50; }else { - deviceAndWinds=deviceMapper.byMonitorIdGetDeviceAndWind(Integer.parseInt(id),time,tab); + deviceAndWinds=deviceMapper.byMonitorIdGetDeviceAndWind(Integer.parseInt(id),tab); length=2000; perdlen=80; } @@ -1077,4 +1078,19 @@ return list; } + @Override + public List<Device> getDeviceByCodeAndId(String code, String id) { + return deviceMapper.getDeviceByCodeAndId(code,id); + } + + @Override + public String byMacGetOrgId(String mac) { + return deviceMapper.byMacGetOrgId(mac); + } + + @Override + public List<Device> getDevice(String macOrName) { + return deviceMapper.getDevice(macOrName); + } + } -- Gitblit v1.8.0