From e95773cc4e824e616874f879f93db78b17455257 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 13 Jun 2022 16:40:44 +0800
Subject: [PATCH] 1、任务轨迹查询增加

---
 src/main/java/org/springblade/modules/trar/controller/TrarController.java |   41 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/trar/controller/TrarController.java b/src/main/java/org/springblade/modules/trar/controller/TrarController.java
index 95d6231..af90601 100644
--- a/src/main/java/org/springblade/modules/trar/controller/TrarController.java
+++ b/src/main/java/org/springblade/modules/trar/controller/TrarController.java
@@ -32,11 +32,14 @@
 import org.springblade.modules.trar.vo.TrarVO;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 控制器
- * 轨迹记录
+ * 人员轨迹记录
  *
  * @author BladeX
  * @since 2022-01-06
@@ -109,6 +112,7 @@
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入trar")
 	public R submit(@Valid @RequestBody Trar trar) {
+		trar.setStarttime(new Date());
 		return R.status(trarService.saveOrUpdate(trar));
 	}
 
@@ -125,13 +129,44 @@
 
 	/**
 	 * 轨迹路线查询
+	 *
 	 * @param rid
 	 * @param uid
 	 * @return
 	 */
 	@PostMapping("/selectList")
-	public R selectList(String rid,String uid) {
-		return R.data(trarService.selectList(rid,uid));
+	public R selectList(String rid, String uid) {
+		return R.data(trarService.selectList(rid, uid));
+	}
+
+	/**
+	 * 轨迹路线查询
+	 *
+	 * @param rid
+	 * @param uid
+	 * @return
+	 */
+	@GetMapping("/selectLists")
+	public String selectLists(String rid, String uid, HttpServletResponse response) {
+		//设置响应头
+		response.setHeader("Access-Control-Allow-Origin", "*");
+		String begin="LINESTRING(";
+		String end=")";
+		String url ="";
+		List<Trar> list = trarService.selectList(rid, uid);
+		for (int i=0;i<list.size();i++){
+			String jd = list.get(i).getJd();
+			String wd = list.get(i).getWd();
+			url+=jd+" "+wd+",";
+		}
+
+		String s = "";
+		if (url.length() > 0){
+			String substring = url.substring(0, url.length() - 1);
+			s = begin + substring + end;
+		}
+		System.out.println(s);
+		return s;
 	}
 
 

--
Gitblit v1.9.3