From 3516f02277035cdc7ff137422709b16efe97ca4a Mon Sep 17 00:00:00 2001
From: 15832144755 <67030627+15832144755@users.noreply.github.com>
Date: 星期五, 27 八月 2021 11:27:21 +0800
Subject: [PATCH] 8.27
---
src/main/java/com/hxzkoa/services/ZhwService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/hxzkoa/services/ZhwService.java b/src/main/java/com/hxzkoa/services/ZhwService.java
index aa44e6f..efb30d5 100644
--- a/src/main/java/com/hxzkoa/services/ZhwService.java
+++ b/src/main/java/com/hxzkoa/services/ZhwService.java
@@ -636,7 +636,7 @@
public List<tb_gps> getGPS() {
String sql = null;
Query query = null;
- sql = "SELECT a.*,c.p_name FROM tb_gps AS a,( SELECT tagid, max(addtime) time FROM tb_gps GROUP BY tagid ) AS b, tb_person as c WHERE a.addtime = b.time AND a.tagid = b.tagid AND c.p_tagid=a.tagid";
+ sql = "SELECT a.*,c.p_name,c.p_online FROM tb_gps AS a,( SELECT tagid, max(addtime) time FROM tb_gps GROUP BY tagid ) AS b, tb_person as c WHERE a.addtime = b.time AND a.tagid = b.tagid AND c.p_tagid=a.tagid";
query = this.em.createNativeQuery(sql);
List resultList = query.getResultList();
List<tb_gps> tb_gpsList = new ArrayList<tb_gps>();
@@ -649,7 +649,7 @@
gps.setGps_NS((String) obj[3]);
gps.setGsp_jingdu((String) obj[4]);
gps.setGps_EW((String) obj[5]);
- gps.setGps_state((String) obj[6]);
+ gps.setGps_state((String) obj[23]);
gps.setGps_num((String) obj[7]);
gps.setGps_hdop((String) obj[8]);
gps.setGps_haiba_gao((String) obj[9]);
@@ -662,7 +662,7 @@
gps.setGps_power((String) obj[16]);
gps.setGps_sos((String) obj[17]);
gps.setAddtime((String) obj[18]);
- gps.setName((String) obj[19]);
+ gps.setName((String) obj[22]);
tb_gpsList.add(gps);
}
}
--
Gitblit v1.10.0