From bc131131c5c96f8cb3bed679d4a359820c22e335 Mon Sep 17 00:00:00 2001
From: 15832144755 <67030627+15832144755@users.noreply.github.com>
Date: 星期四, 17 三月 2022 09:38:47 +0800
Subject: [PATCH] 3.17

---
 src/main/java/com/hxzkoa/services/ZhwService.java |   63 ++++++++++++++++++++++++++++---
 1 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/hxzkoa/services/ZhwService.java b/src/main/java/com/hxzkoa/services/ZhwService.java
index 5f3358d..61929db 100644
--- a/src/main/java/com/hxzkoa/services/ZhwService.java
+++ b/src/main/java/com/hxzkoa/services/ZhwService.java
@@ -93,6 +93,47 @@
 		return tb_mapList;
 	}
 	
+	public List<tb_person> getpersonid(String tagid) {
+		String sql = null;
+		Query query = null;
+		sql = "SELECT p_x,p_y,p_tagid FROM tb_person WHERE p_tagid="+tagid;
+		query = this.em.createNativeQuery(sql);
+		List resultList = query.getResultList();
+		List<tb_person> tb_mapList = new ArrayList<tb_person>();
+		if (resultList.size() > 0) {
+			for (int i = 0; i < resultList.size(); i++) {
+				tb_person map = new tb_person();
+				Object[] obj = (Object[]) resultList.get(i);
+				map.setP_x((String) obj[0]);
+				map.setP_y((String) obj[1]);
+				map.setP_tagid((String) obj[2]);
+				tb_mapList.add(map);
+			}
+		}
+		return tb_mapList;
+	}
+	
+	public List<tb_gps> getgpsid(String tagid) {
+		String sql = null;
+		Query query = null;
+		sql = "SELECT gps_weidu,gsp_jingdu,tagid,gps_haiba_gao FROM tb_gps WHERE tagid="+tagid;
+		query = this.em.createNativeQuery(sql);
+		List resultList = query.getResultList();
+		List<tb_gps> tb_mapList = new ArrayList<tb_gps>();
+		if (resultList.size() > 0) {
+			for (int i = 0; i < resultList.size(); i++) {
+				tb_gps map = new tb_gps();
+				Object[] obj = (Object[]) resultList.get(i);
+				map.setGps_weidu((String) obj[0]);
+				map.setGsp_jingdu((String) obj[1]);
+				map.setTagid((String) obj[2]);
+				map.setGps_haiba_gao((String) obj[3]);
+				tb_mapList.add(map);
+			}
+		}
+		return tb_mapList;
+	}
+	
 	public List<tb_map> getMap_all() {
 		String sql = null;
 		Query query = null;
@@ -337,7 +378,7 @@
 //		//System.out.print(tag_id);
 //		//System.out.print(floor);
 		
-		sql = "SELECT tagid,x,y,z,layer,time FROM tb_track_"+now2+" WHERE layer= '"+floor+"' AND tagid= '"+tag_id+"' AND time>= '"+begin_time+"' AND time<= '"+end_time+"' ORDER BY time";
+		sql = "SELECT tagid,x,y,z,layer,time,baoliu1,baoliu2,baoliu3,baoliu4 FROM tb_track_"+now2+" WHERE layer= '"+floor+"' AND tagid= '"+tag_id+"' AND time>= '"+begin_time+"' AND time<= '"+end_time+"' ORDER BY time";
 //		sql = "SELECT tagid,x,y,z,layer,time FROM tb_track WHERE layer= '"+floor+"' AND tagid= '"+tag_id+"' AND time>= '"+begin_time+"' AND time<= '"+end_time+"'";
 		
 		//System.out.print(sql);
@@ -354,6 +395,10 @@
 				map.setZ((String) obj[3]);
 				map.setLayer((String) obj[4]);
 				map.setTime((String) obj[5]);
+				map.setFangkeid((String) obj[6]);
+				map.setJingdu((String) obj[7]);
+				map.setWeidu((String) obj[8]);
+				map.setGaocheng((String) obj[9]);
 				tb_trackList.add(map);
 			}
 		}
@@ -554,6 +599,10 @@
 				realocation.setP_addtiem((String) obj[23]);
 				realocation.setP_sousuo((String) obj[25]);
 				realocation.setP_shipin((String) obj[26]);
+				realocation.setP_fangkeid((String) obj[28]);
+				realocation.setP_jingdu((String) obj[29]);
+				realocation.setP_weidu((String) obj[30]);
+				realocation.setP_gaocheng((String) obj[31]);
 				tb_realocationList.add(realocation);
 			}
 		}
@@ -709,7 +758,7 @@
 				gps.setGps_NS((String) obj[3]);
 				gps.setGsp_jingdu((String) obj[4]);
 				gps.setGps_EW((String) obj[5]);
-				gps.setGps_state((String) obj[35]);
+				gps.setGps_state((String) obj[36]);
 				gps.setGps_num((String) obj[7]);
 				gps.setGps_hdop((String) obj[8]);
 				gps.setGps_haiba_gao((String) obj[9]);
@@ -722,11 +771,11 @@
 				gps.setGps_power((String) obj[16]);
 				gps.setGps_sos((String) obj[17]);
 				gps.setAddtime((String) obj[18]);
-				gps.setName((String) obj[34]);
-				gps.setSex((String) obj[36]);
-				gps.setMinzu((String) obj[37]);
-				gps.setDianhua((String) obj[38]);
-				gps.setBumen((String) obj[39]);
+				gps.setName((String) obj[35]);
+				gps.setSex((String) obj[37]);
+				gps.setMinzu((String) obj[38]);
+				gps.setDianhua((String) obj[39]);
+				gps.setBumen((String) obj[40]);
 				tb_gpsList.add(gps);
 			}
 		}

--
Gitblit v1.10.0