float 改 double

laser/pom.xml

@@ -194,6 +194,7 @@
 				</configuration>
 			</plugin>
 		</plugins>
+		<finalName>indoor</finalName>
 	</build>
 
 </project>

laser/src/main/java/com/fdkankan/indoor/base/convert/GetRoute_1.java

@@ -70,13 +70,22 @@ public class GetRoute_1
 //	public static String inputFilePath = "F:\\2021\\navvis\\���Ի���\\test3(v2.7.3)\\map.txt";
 	private static String inputFilePath = "F:\\test\\project\\age_laser\\routeMap.txt";
 	
-	private static float startX = 5.358192084229412f;
-	private static float startY = -7.905951689748807f;
-	private static float startZ = -1.3145928255248511f;
-	
-	private static float endX = -2.143694831230416f;
-	private static float endY = -3.3754012098200965f;
-	private static float endZ = -1.1803865408990568f;
+//	private static float startX = 5.358192084229412f;
+//	private static float startY = -7.905951689748807f;
+//	private static float startZ = -1.3145928255248511f;
+//
+//	private static float endX = -2.143694831230416f;
+//	private static float endY = -3.3754012098200965f;
+//	private static float endZ = -1.1803865408990568f;
+
+	private static Double startX = 5.358192084229412;
+	private static Double startY = -7.905951689748807;
+	private static Double startZ = -1.3145928255248511;
+
+	private static Double endX = -2.143694831230416;
+	private static Double endY = -3.3754012098200965;
+	private static Double endZ = -1.1803865408990568;
+
 	private static int minStartId = -1;
 	private static int minEndId = -1;
 	
@@ -88,20 +97,20 @@ public class GetRoute_1
 //		List<String> list = FileUtil.readFileByLines2(inputFilePath);
 		JSONArray maps = new JSONArray();
 
-		float startX = dto.getSource_longitude();
-		float startY = dto.getSource_latitude();
-		float startZ = dto.getSource_z();
+		Double startX = dto.getSource_longitude();
+		Double startY = dto.getSource_latitude();
+		Double startZ = dto.getSource_z();
 
-		float endX = dto.getDestination_longitude();
-		float endY = dto.getDestination_latitude();
-		float endZ = dto.getDestination_z();
+		Double endX = dto.getDestination_longitude();
+		Double endY = dto.getDestination_latitude();
+		Double endZ = dto.getDestination_z();
 
 
 		Coord _start = new Coord(startX,startY,startZ);
 		Coord _end = new Coord(endX,endY,endZ);
 
-		float startDistance=1000f;
-		float endDistance = 1000f;
+		Double startDistance=1000.0;
+		Double endDistance = 1000.0;
 
 		for(int i=0;i<list.size();++i) {
 			String str = list.get(i);
@@ -123,13 +132,13 @@ public class GetRoute_1
 			item.put("linkedIds", linkedIds.substring(0, linkedIds.length()-1));
 			maps.add(item);
 
-			Coord coord = new Coord(Float.valueOf(strArray[0]),Float.valueOf(strArray[1]),Float.valueOf(strArray[2]));
-			float _startDistance = g_AStar.calcH(_start, coord);
+			Coord coord = new Coord(Double.valueOf(strArray[0]),Double.valueOf(strArray[1]),Double.valueOf(strArray[2]));
+			Double _startDistance = g_AStar.calcH(_start, coord);
 			if(_startDistance<startDistance) {
 				minStartId = i;
 				startDistance = _startDistance;
 			}
-			float _endDistance = g_AStar.calcH(_end, coord);
+			Double _endDistance = g_AStar.calcH(_end, coord);
 			if(_endDistance<endDistance) {
 				minEndId = i;
 				endDistance = _endDistance;
@@ -138,12 +147,12 @@ public class GetRoute_1
 
 		JSONObject virtualStart = maps.getJSONObject(minStartId);
 		JSONObject virtualEnd = maps.getJSONObject(minEndId);
-		Coord startVirtualCoord = new Coord((float)virtualStart.getDouble("x"), (float)virtualStart.getDouble("y"),(float)virtualStart.getDouble("z"));
-		Coord endVirtualCoord = new Coord((float)virtualEnd.getDouble("x"), (float)virtualEnd.getDouble("y"),(float)virtualEnd.getDouble("z"));
-		float startH = g_AStar.calcH(startVirtualCoord, endVirtualCoord);
+		Coord startVirtualCoord = new Coord(virtualStart.getDouble("x"), virtualStart.getDouble("y"),virtualStart.getDouble("z"));
+		Coord endVirtualCoord = new Coord(virtualEnd.getDouble("x"), virtualEnd.getDouble("y"),virtualEnd.getDouble("z"));
+		Double startH = g_AStar.calcH(startVirtualCoord, endVirtualCoord);
 
-		start = new Node(minStartId,0,startVirtualCoord, null, 0, startH);
-		end = new Node(minEndId,0,endVirtualCoord, null, 0, 0);
+		start = new Node(minStartId,0.0,startVirtualCoord, null, 0.0, startH);
+		end = new Node(minEndId,0.0,endVirtualCoord, null, 0.0, 0.0);
 
 		return maps;
 	}
@@ -154,14 +163,14 @@ public class GetRoute_1
 		}
 
 		// 起始点
-		float startX = dto.getSource_longitude();
-		float startY = dto.getSource_latitude();
-		float startZ = dto.getSource_z();
+		Double startX = dto.getSource_longitude();
+		Double startY = dto.getSource_latitude();
+		Double startZ = dto.getSource_z();
 
 		// 终点
-		float endX = dto.getDestination_longitude();
-		float endY = dto.getDestination_latitude();
-		float endZ = dto.getDestination_z();
+		Double endX = dto.getDestination_longitude();
+		Double endY = dto.getDestination_latitude();
+		Double endZ = dto.getDestination_z();
 
 
 		List<Node> path = new ArrayList<Node>();
@@ -182,12 +191,12 @@ public class GetRoute_1
 		start.put("longitude", startPosition[0]);
 		start.put("latitude", startPosition[1]);
 		start.put("z", startZ);
-		float[] location = new float[3];
+		Double[] location = new Double[3];
 //		location[0] = startX;
 //		location[1] = startY;
 
-		location[0] = (float)startPosition[0];
-		location[1] = (float)startPosition[1];
+		location[0] = startPosition[0];
+		location[1] = startPosition[1];
 		location[2] = startZ;
 
 		start.put("location", location);
@@ -196,7 +205,7 @@ public class GetRoute_1
 		start.put("instruction", null);
 		route.add(start);
 
-		float[] virtualEndPosition = new float[3];
+		Double[] virtualEndPosition = new Double[3];
 		for(int i=0;i<path.size();++i) {
 			Node node = path.get(i);
 			JSONObject item = new JSONObject();
@@ -210,12 +219,12 @@ public class GetRoute_1
 //			item.put("longitude", node.coord.x);
 //			item.put("latitude", node.coord.y);
 			item.put("z", node.coord.z);
-			location = new float[3];
+			location = new Double[3];
 //			location[0] = node.coord.x;
 //			location[1] = node.coord.y;
 
-			location[0] = (float)position[0];
-			location[1] = (float)position[1];
+			location[0] = position[0];
+			location[1] = position[1];
 
 			location[2] = node.coord.z;
 			item.put("location", location);
@@ -235,9 +244,9 @@ public class GetRoute_1
 			else {
 				Node prenode = path.get(i-1);
 				JSONObject preitem = route.getJSONObject(i);
-				float distance_to_previous = g_AStar.calcH(node.coord,prenode.coord);
+				Double distance_to_previous = g_AStar.calcH(node.coord,prenode.coord);
 				item.put("distance_to_previous", distance_to_previous);
-				float distance = (float)preitem.getDouble("distance")+distance_to_previous;
+				Double distance = preitem.getDouble("distance")+distance_to_previous;
 				item.put("distance", distance);
 				if(i == path.size()-1) {
 					instruction = new JSONObject();
@@ -266,12 +275,12 @@ public class GetRoute_1
 		end.put("longitude", endPosition[0]);
 		end.put("latitude", endPosition[1]);
 		end.put("z", endZ);
-		location = new float[3];
-		location[0] = (float)endPosition[0];
-		location[1] = (float)endPosition[1];
+		location = new Double[3];
+		location[0] = endPosition[0];
+		location[1] = endPosition[1];
 		location[2] = endZ;
 		end.put("location", location);
-		float enddistance = g_AStar.calcH(new Coord(virtualEndPosition[0],virtualEndPosition[1],virtualEndPosition[2]),new Coord(endX,endY,endZ));
+		Double enddistance = g_AStar.calcH(new Coord(virtualEndPosition[0],virtualEndPosition[1],virtualEndPosition[2]),new Coord(endX,endY,endZ));
 		end.put("distance", enddistance+(float)endItem.getDouble("distance"));
 		end.put("distance_to_previous", enddistance);
 		end.put("instruction", null);
@@ -287,9 +296,9 @@ public class GetRoute_1
 		
 		Coord _start = new Coord(startX,startY,startZ);
 		Coord _end = new Coord(endX,endY,endZ);
-		
-		float startDistance=1000f;
-		float endDistance = 1000f;
+
+		Double startDistance=1000.0;
+		Double endDistance = 1000.0;
 		
 		for(int i=0;i<list.size();++i) {
 			String str = list.get(i);
@@ -311,13 +320,13 @@ public class GetRoute_1
 			item.put("linkedIds", linkedIds.substring(0, linkedIds.length()-1));
 			maps.add(item);
 			
-			Coord coord = new Coord(Float.valueOf(strArray[0]),Float.valueOf(strArray[1]),Float.valueOf(strArray[2]));
-			float _startDistance = g_AStar.calcH(_start, coord);
+			Coord coord = new Coord(Double.valueOf(strArray[0]),Double.valueOf(strArray[1]),Double.valueOf(strArray[2]));
+			Double _startDistance = g_AStar.calcH(_start, coord);
 			if(_startDistance<startDistance) {
 				minStartId = i;
 				startDistance = _startDistance;
 			}
-			float _endDistance = g_AStar.calcH(_end, coord);
+			Double _endDistance = g_AStar.calcH(_end, coord);
 			if(_endDistance<endDistance) {
 				minEndId = i;
 				endDistance = _endDistance;
@@ -326,12 +335,12 @@ public class GetRoute_1
 		
 		JSONObject virtualStart = maps.getJSONObject(minStartId);
 		JSONObject virtualEnd = maps.getJSONObject(minEndId);
-		Coord startVirtualCoord = new Coord((float)virtualStart.getDouble("x"), (float)virtualStart.getDouble("y"),(float)virtualStart.getDouble("z"));
-		Coord endVirtualCoord = new Coord((float)virtualEnd.getDouble("x"), (float)virtualEnd.getDouble("y"),(float)virtualEnd.getDouble("z"));
-		float startH = g_AStar.calcH(startVirtualCoord, endVirtualCoord);		
+		Coord startVirtualCoord = new Coord(virtualStart.getDouble("x"), virtualStart.getDouble("y"),virtualStart.getDouble("z"));
+		Coord endVirtualCoord = new Coord(virtualEnd.getDouble("x"), virtualEnd.getDouble("y"),virtualEnd.getDouble("z"));
+		Double startH = g_AStar.calcH(startVirtualCoord, endVirtualCoord);
 		
-		start = new Node(minStartId,0,startVirtualCoord, null, 0, startH);
-		end = new Node(minEndId,0,endVirtualCoord, null, 0, 0);
+		start = new Node(minStartId,0.0,startVirtualCoord, null, 0.0, startH);
+		end = new Node(minEndId,0.0,endVirtualCoord, null, 0.0, 0.0);
 		
 		return maps;
 	}
@@ -354,7 +363,7 @@ public class GetRoute_1
 		start.put("longitude", startX);
 		start.put("latitude", startY);
 		start.put("z", startZ);
-		float[] location = new float[3];
+		Double[] location = new Double[3];
 		location[0] = startX;
 		location[1] = startY;
 		location[2] = startZ;
@@ -370,7 +379,7 @@ public class GetRoute_1
 			item.put("longitude", node.coord.x);
 			item.put("latitude", node.coord.y);
 			item.put("z", node.coord.z);
-			location = new float[3];
+			location = new Double[3];
 			location[0] = node.coord.x;
 			location[1] = node.coord.y;
 			location[2] = node.coord.z;
@@ -391,9 +400,9 @@ public class GetRoute_1
 			else {
 				Node prenode = path.get(i-1);
 				JSONObject preitem = route.getJSONObject(i);
-				float distance_to_previous = g_AStar.calcH(node.coord,prenode.coord);
+				Double distance_to_previous = g_AStar.calcH(node.coord,prenode.coord);
 				item.put("distance_to_previous", distance_to_previous);
-				float distance = (float)preitem.getDouble("distance")+distance_to_previous;
+				Double distance = preitem.getDouble("distance")+distance_to_previous;
 				item.put("distance", distance);
 				if(i == path.size()-1) {
 					instruction = new JSONObject();
@@ -414,13 +423,13 @@ public class GetRoute_1
 		end.put("longitude", endX);
 		end.put("latitude", endY);
 		end.put("z", endZ);
-		location = new float[3];
+		location = new Double[3];
 		location[0] = endX;
 		location[1] = endY;
 		location[2] = endZ;
 		end.put("location", location);
-		float enddistance = g_AStar.calcH(new Coord((float)endItem.getDouble("longitude"),(float)endItem.getDouble("latitude"),(float)endItem.getDouble("z")),new Coord(endX,endY,endZ));
-		end.put("distance", enddistance+(float)endItem.getDouble("distance_to_previous"));
+		Double enddistance = g_AStar.calcH(new Coord(endItem.getDouble("longitude"),endItem.getDouble("latitude"),endItem.getDouble("z")),new Coord(endX,endY,endZ));
+		end.put("distance", enddistance+endItem.getDouble("distance_to_previous"));
 		end.put("distance_to_previous", enddistance);
 		end.put("instruction", null);
 		route.add(end);

laser/src/main/java/com/fdkankan/indoor/base/convert/ModifyDataSets.java

@@ -17,31 +17,7 @@ public class ModifyDataSets {
 	public static String type = "4dage";
 	public static String name = "chunk1";
 	
-	/*
-	 * [{
-		"security": {
-			"group_read": 0,
-			"group_write": 1,
-			"can_write": false
-		},
-		"id": 1,
-		"bundle_id": 3,
-		"type": "4dage",
-		"name": "chunk1",
-		"title": "chunk1",
-		"color": "pink",
-		"visible": false,
-		"location": [113.595659855988,22.3666646417028,0],
-		"orientation": 0,
-		"site_model_entity_ids": [10,11,12],
-		"point_cloud_type": "POTREE",
-		"bounding_box_min": [-9.270299911499023,-17.399999618530273,-2.5648499727249146],
-		"bounding_box_max": [15.35949993133545,16.259200096130371,3.762256],
-		"has_depth_images": true,
-		"has_images": true
-	}]
-
-    */
+
 	
 	public static JSONObject createDataSet(Double[] location) {
 		JSONObject dataset = new JSONObject();
@@ -121,43 +97,7 @@ public class ModifyDataSets {
 		return po;
 	}
 
-//		public static DataSetPo createDataSetPo(Double[] location){
-//			DataSetPo po = new DataSetPo();
-//
-//			SecurityDto securityDto = new SecurityDto();
-//
-//			securityDto.setGroup_read(0);
-//			securityDto.setGroup_write(1);
-//			// 默认true
-//			securityDto.setCan_write(true);
-//			// 默认true
-//			po.setSecurity(securityDto);
-//
-//			po.setId(0);
-//			po.setBundle_id(1);
-//			po.setType("4dage");
-//			po.setName("chunk1");
-//			po.setTitle("chunk1");
-//			po.setColor("pink");
-//			po.setVisible(false);
-//
-//			//double[] location = {0,0,0};
-//			//location = TransformGPS.convert(location);
-//			//原点 ,获取特征点的原点
-//			po.setLocation(location);
-//			po.setOrientation(0.0);
-//			Integer[] site_model_entity_ids = {10,11,12};
-//			po.setSite_model_entity_ids(site_model_entity_ids);
-//			po.setPoint_cloud_type("POTREE");
-//
-//			//添加boundingbox，从modifyCloud里的convertFromBoundingBox获取
-//			//dataset.put("bounding_box_min", "");
-//			//dataset.put("bounding_box_max", "");
-//
-//			po.setHas_depth_images(true);
-//			po.setHas_images(true);
-//			return po;
-//		}
+
 	
 	public static JSONArray readSiteModel() throws IOException { 
 		String str = FileUtil.readStringFile(inputFilePath);

laser/src/main/java/com/fdkankan/indoor/base/convert/TransformGPS.java

@@ -72,11 +72,7 @@ public class TransformGPS {
 	}
 
 
-//	public static double[] convert(double[] position) {
-//    	GisCoordinateUtil.calculateVariable (controlCoordinate1[0],controlCoordinate1[1],controlLocation1[0],controlLocation1[1],controlCoordinate2[0],controlCoordinate2[1],controlLocation2[0],controlLocation2[1]);
-//        double[] d = GisCoordinateUtil.transformLocationToBL(position[0], position[1]);
-//        return d;
-//	}
+
 
 
 	public static double[] convert(double[] position) {

laser/src/main/java/com/fdkankan/indoor/base/convert/kesar/AStar.java

@@ -90,11 +90,11 @@ public class AStar
 			{
 				Node end=mapInfo.end;
 				//Coord coord = new Coord(x, y);
-				float G = current.G + current.weight; // 计算邻结点的G值
+				Double G = current.G + current.weight; // 计算邻结点的G值
 				Node child = findNodeInOpen(linkedId);
 				if (child == null)
 				{
-					float H=calcH(end.coord,current.coord); // 璁＄畻H鍊�
+					Double H=calcH(end.coord,current.coord); // 璁＄畻H鍊�
 					if(isEndNode(end.id,linkedId))
 					{
 						child=end;
@@ -104,7 +104,8 @@ public class AStar
 					else
 					{
 						JSONObject neighItem = mapInfo.maps.getJSONObject(linkedId);
-						child = new Node(linkedId,(float)neighItem.getDouble("weight"),new Coord((float)neighItem.getDouble("x"), (float)neighItem.getDouble("y"),(float)neighItem.getDouble("z")), null, G, H);
+						child = new Node(linkedId, neighItem.getDouble("weight"),
+								new Coord(neighItem.getDouble("x"), neighItem.getDouble("y"),neighItem.getDouble("z")), null, G, H);
 					}
 					child.parent=current;
 					openList.add(child);
@@ -117,65 +118,9 @@ public class AStar
 				}
 			}
 		}
-		/*
-		int x = current.coord.x;
-		int y = current.coord.y;
-		// 宸�
-		addNeighborNodeInOpen(mapInfo,current, x - 1, y, DIRECT_VALUE);
-		// 涓�
-		addNeighborNodeInOpen(mapInfo,current, x, y - 1, DIRECT_VALUE);
-		// 鍙�
-		addNeighborNodeInOpen(mapInfo,current, x + 1, y, DIRECT_VALUE);
-		// 涓�
-		addNeighborNodeInOpen(mapInfo,current, x, y + 1, DIRECT_VALUE);
-		// 宸︿笂
-		addNeighborNodeInOpen(mapInfo,current, x - 1, y - 1, OBLIQUE_VALUE);
-		// 鍙充笂
-		addNeighborNodeInOpen(mapInfo,current, x + 1, y - 1, OBLIQUE_VALUE);
-		// 鍙充笅
-		addNeighborNodeInOpen(mapInfo,current, x + 1, y + 1, OBLIQUE_VALUE);
-		// 宸︿笅
-		addNeighborNodeInOpen(mapInfo,current, x - 1, y + 1, OBLIQUE_VALUE);
-		*/
-	}
 
-	/**
-	 * 娣诲姞涓�涓偦缁撶偣鍒皁pen琛�
-	 */
-	/*
-	private void addNeighborNodeInOpen(MapInfo mapInfo,Node current, int x, int y, int value)
-	{
-		if (canAddNodeToOpen(mapInfo,x, y))
-		{
-			Node end=mapInfo.end;
-			Coord coord = new Coord(x, y);
-			int G = current.G + value; // 璁＄畻閭荤粨鐐圭殑G鍊�
-			Node child = findNodeInOpen(coord);
-			if (child == null)
-			{
-				int H=calcH(end.coord,coord); // 璁＄畻H鍊�
-				if(isEndNode(end.coord,coord))
-				{
-					child=end;
-					child.parent=current;
-					child.G=G;
-					child.H=H;
-				}
-				else
-				{
-					child = new Node(coord, current, G, H);
-				}
-				openList.add(child);
-			}
-			else if (child.G > G)
-			{
-				child.G = G;
-				child.parent = current;
-				openList.add(child);
-			}
-		}
 	}
-*/
+
 	/**
 	 * 浠嶰pen鍒楄〃涓煡鎵剧粨鐐�
 	 */
@@ -196,9 +141,9 @@ public class AStar
 	/**
 	 * 璁＄畻H鐨勪及鍊硷細鈥滄浖鍝堥】鈥濇硶锛屽潗鏍囧垎鍒彇宸�肩浉鍔�
 	 */
-	public float calcH(Coord end,Coord coord)
+	public Double calcH(Coord end,Coord coord)
 	{
-		return (float)Math.sqrt(Math.pow(end.x - coord.x,2)+ Math.pow(end.y - coord.y,2)+ Math.pow(end.z - coord.z,2));
+		return Math.sqrt(Math.pow(end.x - coord.x,2)+ Math.pow(end.y - coord.y,2)+ Math.pow(end.z - coord.z,2));
 	}
 	
 	/**

laser/src/main/java/com/fdkankan/indoor/base/convert/kesar/Coord.java

@@ -9,11 +9,11 @@ package com.fdkankan.indoor.base.convert.kesar;
 public class Coord
 {
 
-	public float x;
-	public float y;
-	public float z;
+	public Double x;
+	public Double y;
+	public Double z;
 
-	public Coord(float x, float y,float z)
+	public Coord(Double x, Double y,Double z)
 	{
 		this.x = x;
 		this.y = y;

laser/src/main/java/com/fdkankan/indoor/base/convert/kesar/Node.java

@@ -9,13 +9,13 @@ package com.fdkankan.indoor.base.convert.kesar;
 public class Node implements Comparable<Node>
 {
 	public int id;
-	public float weight;
+	public Double weight;
 	public Coord coord; // 鍧愭爣
 	public Node parent; // 鐖剁粨鐐�
-	public float G; // G锛氭槸涓噯纭殑鍊硷紝鏄捣鐐瑰埌褰撳墠缁撶偣鐨勪唬浠�
-	public float H; // H锛氭槸涓及鍊硷紝褰撳墠缁撶偣鍒扮洰鐨勭粨鐐圭殑浼拌浠ｄ环
+	public Double G; // G锛氭槸涓噯纭殑鍊硷紝鏄捣鐐瑰埌褰撳墠缁撶偣鐨勪唬浠�
+	public Double H; // H锛氭槸涓及鍊硷紝褰撳墠缁撶偣鍒扮洰鐨勭粨鐐圭殑浼拌浠ｄ环
 
-	public Node(int id ,float weight,Coord coord, Node parent, float g, float h)
+	public Node(int id ,Double weight,Coord coord, Node parent, Double g, Double h)
 	{
 		this.id = id;
 		this.weight = weight;
@@ -29,8 +29,8 @@ public class Node implements Comparable<Node>
 	{
 		this.coord = coord;
 		this.parent = parent;
-		G = g;
-		H = h;
+		G = (double) g;
+		H = (double) h;
 	}
 
 	@Override

laser/src/main/java/com/fdkankan/indoor/core/controller/ConfigController.java

@@ -0,0 +1,28 @@
+package com.fdkankan.indoor.core.controller;
+
+import com.fdkankan.indoor.base.util.Result;
+import com.fdkankan.indoor.core.service.ConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by owen on 2021/8/5 0005 20:56
+ */
+@Api(tags = "Config管理")
+@RestController
+public class ConfigController {
+
+    @Autowired
+    ConfigService entityService;
+
+    @ApiOperation(value = "configs", notes = "数据目前是写死的")
+    @GetMapping("indoor/{sceneCode}/api/configs")
+    public Object configs(@PathVariable String sceneCode){
+        Result result = entityService.getById(sceneCode);
+        return result.getData();
+    }
+}

laser/src/main/java/com/fdkankan/indoor/core/controller/LoginController.java

@@ -63,12 +63,12 @@ public class LoginController {
         return result.getData();
     }
 
-    @ApiOperation(value = "configs", notes = "数据目前是写死的")
-    @GetMapping("indoor/{sceneCode}/api/configs")
-    public Object configs(@PathVariable String sceneCode){
-        Result result = loginService.configs(sceneCode);
-        return result.getData();
-    }
+//    @ApiOperation(value = "configs", notes = "数据目前是写死的")
+//    @GetMapping("indoor/{sceneCode}/api/configs")
+//    public Object configs(@PathVariable String sceneCode){
+//        Result result = loginService.configs(sceneCode);
+//        return result.getData();
+//    }
 
 
 }

laser/src/main/java/com/fdkankan/indoor/core/entity/SiteEntity.java

@@ -1,22 +0,0 @@
-//package com.fdkankan.indoor.core.entity;
-//
-//import com.fdkankan.indoor.core.entity.dto.SiteDto;
-//import lombok.Data;
-//import org.springframework.data.mongodb.core.mapping.Document;
-//
-//import java.util.List;
-//
-///**
-// * Created by owen on 2021/7/27 0027 10:42
-// * 这个要改回siteModel
-// */
-////@Document(collection = "t_site_model")
-////@Data
-////public class SiteEntity extends BaseEntity {
-////
-//////    private String sceneCode;
-////
-////    private List<SiteDto> data;
-////
-////
-////}

laser/src/main/java/com/fdkankan/indoor/core/entity/dto/QueryJsonDataBase.java

@@ -1,16 +0,0 @@
-package com.fdkankan.indoor.core.entity.dto;
-
-import lombok.Data;
-
-/**
- * @author Admin
- */
-@Data
-public class QueryJsonDataBase {
-
-    private String sceneNum;
-    private Integer limit;
-    private Double z;
-    private Long siteModelEntity;
-    private Integer step;
-}

laser/src/main/java/com/fdkankan/indoor/core/entity/dto/QueryJsonDataOne.java

@@ -1,18 +0,0 @@
-package com.fdkankan.indoor.core.entity.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author Admin
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryJsonDataOne extends QueryJsonDataBase {
-
-    private Double radius;
-    private Double lat;
-    private Double lon;
-}

laser/src/main/java/com/fdkankan/indoor/core/entity/dto/QueryJsonDataTwo.java

@@ -1,20 +0,0 @@
-package com.fdkankan.indoor.core.entity.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author Admin
- * ddd
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryJsonDataTwo extends QueryJsonDataBase {
-
-    private Double lat_max;
-    private Double lat_min;
-    private Double lon_max;
-    private Double lon_min;
-}

laser/src/main/java/com/fdkankan/indoor/core/entity/dto/RouteInputDto.java

@@ -11,12 +11,12 @@ public class RouteInputDto {
 
 
     // 起始点
-    private float source_latitude;
-    private float source_longitude;
-    private float source_z;
+    private Double source_latitude;
+    private Double source_longitude;
+    private Double source_z;
 
     // 终点
-    private float destination_latitude;
-    private float destination_longitude;
-    private float destination_z;
+    private Double destination_latitude;
+    private Double destination_longitude;
+    private Double destination_z;
 }

laser/src/main/java/com/fdkankan/indoor/core/entity/dto/SiteModelLatestDto.java

@@ -1,21 +0,0 @@
-//package com.fdkankan.indoor.core.entity.dto;
-//
-//import io.swagger.annotations.ApiModelProperty;
-//import lombok.Data;
-//
-///**
-// * Created by owen on 2021/7/16 0015 11:53
-// * 找最近的点位
-// */
-//@Data
-//public class SiteModelLatestDto {
-//
-//    @ApiModelProperty(value = "返回数量")
-//    private Integer size;
-//
-//    @ApiModelProperty(value = "模糊查询参数")
-//    private String query;
-//
-//
-//
-//}

laser/src/main/java/com/fdkankan/indoor/core/entity/jsonData/FilterEntity1.java

@@ -1,27 +0,0 @@
-package com.fdkankan.indoor.core.entity.jsonData;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.data.mongodb.core.mapping.Document;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * Created by owen on 2021/7/14 0014 14:22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@Document(collection = "t_filter")
-public class FilterEntity1 implements Serializable {
-
-    private static final long serialVersionUID = 2974313673840996620L;
-    private String id;
-
-    private String sceneCode;
-
-    // mongodb实体映射，存入数据库的id -> _id
-    private List<JsonData> data;
-}

laser/src/main/java/com/fdkankan/indoor/core/entity/jsonData/JsonData.java

@@ -1,35 +0,0 @@
-package com.fdkankan.indoor.core.entity.jsonData;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.data.mongodb.core.mapping.Document;
-
-import java.io.Serializable;
-
-/**
- * @author Admin
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@Document(collection = "json_data")
-public class JsonData implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Integer id;
-    private Double[] location;
-    private Double[] floor_location;
-    private Double[] orientation;
-    private Integer dataset_id;
-    private Double[] dataset_location;
-    private Double[] dataset_floor_location;
-    private Double[] dataset_orientation;
-    private Integer camera_head_id;
-    private String file_path;
-    private String file_id;
-    private Boolean hidden;
-    private Integer site_model_entity_id;
-
-}

laser/src/main/java/com/fdkankan/indoor/core/entity/poi/PoiBaseEntity.java

@@ -1,26 +0,0 @@
-package com.fdkankan.indoor.core.entity.poi;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.data.mongodb.core.mapping.Document;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * Created by owen on 2021/7/14 0014 14:22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@Document(collection = "t_poi")
-public class PoiBaseEntity implements Serializable {
-    private static final long serialVersionUID = 8758157456020769056L;
-
-    private Long id;
-
-    private String sceneCode;
-
-    private List data;
-}

laser/src/main/java/com/fdkankan/indoor/core/entity/siteModel/Polygon.java

@@ -1,22 +0,0 @@
-//package com.fdkankan.indoor.core.entity.siteModel;
-//
-//import lombok.Data;
-//import lombok.EqualsAndHashCode;
-//import lombok.experimental.Accessors;
-//
-//import java.io.Serializable;
-//import java.util.List;
-//
-///**
-// * @author Admin
-// */
-//@Data
-//@EqualsAndHashCode(callSuper = false)
-//@Accessors(chain = true)
-//public class Polygon implements Serializable {
-//
-//    private static final long serialVersionUID = 1L;
-//
-//    private String type;
-//    private List<List<List<Double>>> coordinates;
-//}

laser/src/main/java/com/fdkankan/indoor/core/entity/siteModel/SiteModel.java

@@ -1,46 +0,0 @@
-//package com.fdkankan.indoor.core.entity.siteModel;
-//
-//import com.fasterxml.jackson.annotation.JsonIgnore;
-//import lombok.Data;
-//import lombok.EqualsAndHashCode;
-//import lombok.experimental.Accessors;
-//import org.springframework.data.annotation.Transient;
-//import org.springframework.data.mongodb.core.mapping.Document;
-//
-//import java.io.Serializable;
-//import java.util.ArrayList;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * @author Admin
-// */
-//@Data
-//@EqualsAndHashCode(callSuper = false)
-//@Accessors(chain = true)
-//@Document(collection = "site_model")
-//public class SiteModel implements Serializable {
-//
-//    private static final long serialVersionUID = 1L;
-//
-//    private Integer id;
-//    private String type;
-//    private String name;
-//    private Polygon polygon;
-//    private Double z_min;
-//    private Double z_max;
-//    private List<Double> center;
-//    private Map<String, Object> attributes = new HashMap<>();
-//    private Double area;
-//    private Double volume;
-//    private Long geometry_hash;
-////    private List<SiteModel> children ;
-//    private List<SiteModel> children = new ArrayList<>();
-//
-//    // 父级id, 后端需要，前端不用
-//    @Transient
-//    @JsonIgnore
-//    private Integer parentId;
-//
-//}

laser/src/main/java/com/fdkankan/indoor/core/service/ConfigService.java

@@ -1,5 +1,6 @@
 package com.fdkankan.indoor.core.service;
 
+import com.fdkankan.indoor.base.util.Result;
 import com.fdkankan.indoor.core.entity.ConfigEntity;
 import com.fdkankan.indoor.core.entity.DataSetEntity;
 
@@ -10,4 +11,6 @@ public interface ConfigService {
     void save(ConfigEntity entity);
 
     void remove(String sceneCode);
+
+    Result getById(String sceneCode);
 }

laser/src/main/java/com/fdkankan/indoor/core/service/LoginService.java

@@ -15,7 +15,7 @@ public interface LoginService {
 
     Result health(String sceneCode);
 
-    Result configs(String sceneCode);
+//    Result configs(String sceneCode);
 
     Result user(String sceneCode);
 

laser/src/main/java/com/fdkankan/indoor/core/service/SiteModelService.java

@@ -1,31 +0,0 @@
-//package com.fdkankan.indoor.core.service;
-//
-//import com.alibaba.fastjson.JSONObject;
-//import com.fdkankan.indoor.base.util.Result;
-//import com.fdkankan.indoor.core.entity.dto.SiteModelSearchDto;
-//import com.fdkankan.indoor.core.entity.SiteModelEntity;
-//import com.fdkankan.indoor.core.entity.siteModel.SiteModel;
-//
-///**
-// * @author Admin
-// */
-//public interface SiteModelService {
-//
-//
-//
-//    Result withinType(String code, Double[] location, String type);
-//
-//    SiteModel findById(Long id, String code);
-//
-//    Result getData(JSONObject param, String code);
-//
-//    Result search(String sceneCode, SiteModelSearchDto searchDto);
-//
-//    Result latest(String sceneCode, Double[] location, Double radius);
-//
-//    Result testData(String sceneCode);
-//
-//    Result withinType_5(String code, Double[] location, String type);
-//
-//    void save(SiteModelEntity entity);
-//}

laser/src/main/java/com/fdkankan/indoor/core/service/impl/ConfigServiceImpl.java

@@ -1,18 +1,24 @@
 package com.fdkankan.indoor.core.service.impl;
 
+import com.fdkankan.indoor.base.util.Result;
 import com.fdkankan.indoor.core.entity.ConfigEntity;
+import com.fdkankan.indoor.core.entity.dto.ConfigDto;
 import com.fdkankan.indoor.core.mapper.ConfigMapper;
 import com.fdkankan.indoor.core.service.ConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
 /**
  * Created by owen on 2021/7/28 0028 20:05
  */
 @Service
 @Slf4j
-public class ConfigServiceImpl implements ConfigService {
+public class ConfigServiceImpl extends IBaseServiceImpl implements ConfigService {
 
     @Autowired
     ConfigMapper entityMapper;
@@ -26,4 +32,28 @@ public class ConfigServiceImpl implements ConfigService {
     public void remove(String sceneCode) {
         entityMapper.deleteById(sceneCode);
     }
+
+    @Override
+    public Result getById(String sceneCode) {
+        ConfigEntity entity = findById(sceneCode);
+        List<ConfigDto> data = entity.getData();
+
+        List<ConfigDto> result = new ArrayList<>();
+        if (!isLogin()) {
+            for (ConfigDto dto : data) {
+                dto.setSecurity(changeSecurityUnLogin());
+                result.add(dto);
+            }
+        } else {
+            result = data;
+        }
+
+        return Result.success(result);
+    }
+
+    private ConfigEntity findById(String sceneCode){
+        Optional<ConfigEntity> optional = entityMapper.findById(sceneCode);
+        return optional.orElse(null);
+
+    }
 }

laser/src/main/java/com/fdkankan/indoor/core/service/impl/IBaseServiceImpl.java

@@ -20,20 +20,7 @@ public class IBaseServiceImpl {
     ConfigConstant configConstant;
 
 
-    /**
-     * 已登录，有权限  true
-     * 没登录 false
-     * @param dto
-     * @return
-     */
-//    public SecurityDto isLogin(SecurityDto dto){
-//        if(checkToken()) {
-//            dto.setCan_write(true);
-//        } else {
-//            dto.setCan_write(false);
-//        }
-//        return dto;
-//    }
+
 
 
     /**

laser/src/main/java/com/fdkankan/indoor/core/service/impl/LoginServiceImpl.java

@@ -104,24 +104,24 @@ public class LoginServiceImpl  extends IBaseServiceImpl implements LoginService
 
 
 
-    @Override
-    public Result configs(String sceneCode) {
-        Query query = new Query();
-        query.addCriteria(Criteria.where("sceneCode").is(sceneCode));
-        ConfigEntity configs = mongoTemplate.findOne(query, ConfigEntity.class, "t_configs");
-        List<ConfigDto> data = configs.getData();
-        List<ConfigDto> result = new ArrayList<>();
-        if (!checkToken()) {
-            for (ConfigDto dto : data) {
-                dto.setSecurity(changeSecurity(dto.getSecurity()));
-                result.add(dto);
-            }
-        } else {
-            result = data;
-        }
-
-        return Result.success(result);
-    }
+//    @Override
+//    public Result configs(String sceneCode) {
+//        Query query = new Query();
+//        query.addCriteria(Criteria.where("sceneCode").is(sceneCode));
+//        ConfigEntity configs = mongoTemplate.findOne(query, ConfigEntity.class, "t_configs");
+//        List<ConfigDto> data = configs.getData();
+//        List<ConfigDto> result = new ArrayList<>();
+//        if (!checkToken()) {
+//            for (ConfigDto dto : data) {
+//                dto.setSecurity(changeSecurity(dto.getSecurity()));
+//                result.add(dto);
+//            }
+//        } else {
+//            result = data;
+//        }
+//
+//        return Result.success(result);
+//    }
 
     @Override
     public Result user(String sceneCode) {

laser/src/main/resources/sh/shutdown.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+RESOURCE_NAME=indoor.jar
+   Pid=`awk '{print $1}' tpid`
+
+if [ ${Pid} ]; then
+kill -9 $Pid
+echo 'Kill Process!'
+else
+echo 'Stop failed!'
+fi
+

laser/src/main/resources/sh/startup.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+RESOURCE_NAME=indoor.jar
+rm -f tpid
+nohup java -jar ./$RESOURCE_NAME --spring.profiles.active=sit &
+echo $! > tpid
+echo Start Success!
+echo
+
+#tpid=`ps -ef|grep $RESOURCE_NAME|grep -v grep|grep -v kill|awk '{print $2}'`
+
+
+
+