Merge remote-tracking branch 'origin/master'

COMMIT_EDITMSG

@@ -0,0 +1 @@
+首次提交123

README.md

@@ -1,3 +1,58 @@
-# age_camera_laser
-
-德国激光相机
+# 德国相机
+    demo-url:
+    api:http://indoor.popsmart.cn:8084/sxswsw/api/site_model/within?location=120.58645186143931&location=29.991567318555767&location=1.1677126884460454&type=BUILDING
+    demo:http://indoor.popsmart.cn:8084/sxswsw-sx/
+        type 返回都是相应坐标的参数
+            BUILDING: 建筑物 -> 只返回建筑物数据
+            FLOOR: 楼层 -> 只返回楼层数据 - 多边形数据为null， 把找到坐标房间信息返回给前端
+            ROOM: 房间 -> 只返回房间数据
+            type=null -> 返回相应参数的建筑物.楼层.房间数据
+            
+            
+  服务器信息
+    /阿里云-四维时代-官网测试服务器-120.25.146.52/root/user/java/jar_run/
+    
+    
+    aip: http://127.0.0.1:9294/indoor/aa/api/images/1288 
+    221.4.210.172:9294/indoor/aa/api/images/1288    
+    
+    
+#API
+    https://testlaser.4dkankan.com/indoor/test1/api/site_model/within?location=120.58629809780416&location=29.991469096442984&location=2.050019474815037&type=FLOOR    
+    https://testlaser.4dkankan.com/indoor/test1/api/site_model/within?location=120.58629809780416&location=29.991469096442984&location=2.050019474815037&type=FLOOR  
+    
+    http://127.0.0.1:9294/indoor
+    https://testlaser.4dkankan.com/indoor
+    
+    http://indoor.popsmart.cn:8084/sxswsw/api/site_model/within?location=120.58629809780416&location=29.991469096442984&location=2.050019474815037&type=FLOOR
+    
+    
+    http://test.4dkankan.com:9294/indoor/{test1}/api/images/{id} 
+    
+    
+    # 测试计算最小距离
+    http://127.0.0.1:9294/indoor/test1/api/images/filter?hidden=false&lat=29.99150810503829&limit=1&lon=120.58627208336249&z=2.050019474815037 
+    
+    # 有半径的
+    http://127.0.0.1:9294/indoor/test2/api/images/filter?hidden=false&lat=22.3668029722544&lon=113.595671720124&radius=20&site_model_entity=
+    
+    
+# 日志
+    # 2021-07-15
+    这个接口还有问题：
+    https://testlaser.4dkankan.com/indoor/test1/api/images/filter?hidden=false&lat_max=29.99143363257292&lat_min=29.991244191301476&lon_max=120.5867345486961&lon_min=120.58598839339827&site_model_entity=2&site_model_entity=&spacing=1.56
+    
+    
+    https://testlaser.4dkankan.com/indoor/test1/api/images/filter?hidden=false&lat_max=29.99143363257292&lat_min=29.991244191301476&lon_max=120.5867345486961&lon_min=120.58598839339827&site_model_entity=2&site_model_entity=&step=4&spacing=1.56
+    
+    这两个接口，一个有值，一个没有，这个不应该，都应该有值才对。估计是没有step这个参数导致的，这里要改改，step可以没有。  
+    
+    
+    # 2021-07-16
+        filte查询接口, 测试过是成功的
+          http://127.0.0.1:9294/indoor/test1/api/filter/filter?dataset=45&hidden=false&limit=100&site_model_entity=17&sort_by=asc&sort_order=file_id
+    
+    
+# mongodb
+    导入数据是，嵌套数据的id不需要改成_id
+             

config

@@ -0,0 +1,13 @@
+[core]
+	repositoryformatversion = 0
+	filemode = false
+	bare = false
+	logallrefupdates = true
+	symlinks = false
+	ignorecase = true
+[remote "origin"]
+	url = http://192.168.0.115:3000/zhujinghui/sxswsw.git
+	fetch = +refs/heads/*:refs/remotes/origin/*
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master

description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

pom.xml

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.2.2.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+	<groupId>com.fdkankan</groupId>
+	<artifactId>indoor</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+	<name>indoor</name>
+	<description>Demo project for Spring Boot</description>
+
+	<properties>
+		<java.version>1.8</java.version>
+		<fastjson.version>1.2.75</fastjson.version>
+		<knife4j.version>2.0.2</knife4j.version>
+		<hutool.version>5.3.3</hutool.version>
+		<jwt.version>3.2.0</jwt.version>
+		<jjwt.version>0.6.0</jjwt.version>
+		<spring.boot.version>2.3.4.RELEASE</spring.boot.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-tomcat</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- MONGODB -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-mongodb</artifactId>
+		</dependency>
+
+
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.6</version>
+		</dependency>
+
+
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<version>2.2.2.RELEASE</version>
+			<scope>test</scope>
+		</dependency>
+
+
+		<!-- fastjson -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>${fastjson.version}</version>
+		</dependency>
+
+
+		<!-- 对象拷贝 -->
+		<dependency>
+			<groupId>cglib</groupId>
+			<artifactId>cglib</artifactId>
+			<version>3.2.5</version>
+		</dependency>
+
+
+		<!-- knife4j aip 包-->
+		<dependency>
+			<groupId>com.github.xiaoymin</groupId>
+			<artifactId>knife4j-spring-boot-starter</artifactId>
+			<version>${knife4j.version}</version>
+		</dependency>
+
+
+		<!-- 工具类 -->
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-all</artifactId>
+			<version>${hutool.version}</version>
+		</dependency>
+
+		<!-- aop , jpa包含这个包 -->
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+			<version>1.9.6</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+
+
+		<!-- jwt -->
+		<dependency>
+			<groupId>com.auth0</groupId>
+			<artifactId>java-jwt</artifactId>
+			<version>${jwt.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt</artifactId>
+			<version>${jjwt.version}</version>
+		</dependency>
+
+
+		<!--springboot中的redis依赖-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+			<version>${spring.boot.version}</version>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.18.1</version>
+				<configuration>
+					<skipTests>true</skipTests>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>