From 72bfd6cfe47b48a183ea3795054dabdcffb543d7 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 13 Aug 2020 09:22:23 +0800
Subject: [PATCH] 风场图update
---
src/main/resources/mapper/DeviceMapper.xml | 1 -
src/main/java/com/moral/mapper/DeviceMapper.java | 2 +-
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 5 ++++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index 81a33bf..e396c9a 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -65,7 +65,7 @@
DeviceAndWind getDeviceAndWindByMac(@Param("mac") String mac,@Param("time") String time,
@Param("table") String table);
- List<DeviceAndWind> byMonitorIdGetDeviceAndWind(@Param("id") String id,@Param("time") String time,
+ List<DeviceAndWind> byMonitorIdGetDeviceAndWind(@Param("id") int id,@Param("time") String time,
@Param("table") String table);
List<Device> getDeviceListByMonitorPointIds(List<Integer> list);
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 216fcbe..53e3cc1 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -720,11 +720,14 @@
@Override
public List byMonitorIdGetDeviceAndWind(String id,String time,String tab) {
- List<DeviceAndWind> deviceAndWinds=deviceMapper.byMonitorIdGetDeviceAndWind(id,time,tab);
+ List<DeviceAndWind> deviceAndWinds=deviceMapper.byMonitorIdGetDeviceAndWind(Integer.parseInt(id),time,tab);
List loList=new ArrayList();
List laList=new ArrayList();
Double U=0.0;
Double V=0.0;
+ log.info("id="+id);
+ log.info("time="+time);
+ log.info("tab="+tab);
log.info("deviceAndWinds="+deviceAndWinds);
for (DeviceAndWind andWind : deviceAndWinds) {
Double lo=andWind.getLongitude();
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 196e7ee..f95d41f 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -390,7 +390,6 @@
and d.mac in (select d.mac from device , monitor_point as m where d.monitor_point_id=m.id and m.id=#{id})
</select>
-
<select id="getDevicesStateByRegion" resultType="map">
SELECT
d.id deviceId,d.mac,d.state,d.name deviceName,
--
Gitblit v1.8.0