Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
map-parent
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
map-parent
Commits
f4dd7214
Commit
f4dd7214
authored
Mar 22, 2021
by
chentian
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
f5c162e9
feeea077
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
162 additions
and
4 deletions
+162
-4
serviceapi/imageapi/src/main/java/com/founder/ytlf/ImageApiApplication.java
+1
-1
serviceapi/imageapi/src/main/java/com/founder/ytlf/controller/YtlfController.java
+48
-0
serviceapi/pom.xml
+113
-3
No files found.
serviceapi/imageapi/src/main/java/com/founder/ImageApiApplication.java
→
serviceapi/imageapi/src/main/java/com/founder/
ytlf/
ImageApiApplication.java
View file @
f4dd7214
package
com
.
founder
;
package
com
.
founder
.
ytlf
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
...
...
serviceapi/imageapi/src/main/java/com/founder/ytlf/controller/YtlfController.java
View file @
f4dd7214
...
...
@@ -112,5 +112,53 @@ public class YtlfController {
}
return
MapRestResult
.
build
(
500
,
"请求失败"
,
null
);
}
@OperLog
(
message
=
"根据小图获取大图信息,返回人脸小图在大图中的位置"
,
operation
=
OperationType
.
QUERY
)
@ApiOperation
(
value
=
"根据小图获取大图信息,返回人脸小图在大图中的位置"
)
@GetMapping
(
"/getImageAndLocationByFaceId/{FaceId}"
)
public
MapRestResult
getImageAndLocationByFaceId
(
@PathVariable
Long
FaceId
){
try
{
String
accessToken
=
TokenUtils
.
getYtgsToken
();
String
url
=
"http://26.3.12.56:8083/api/intellif/image/face/json/"
+
FaceId
;
String
Authorization
=
"Bearer "
+
accessToken
;
Map
header
=
new
HashMap
<
String
,
String
>();
header
.
put
(
"Authorization"
,
Authorization
);
String
result
=
null
;
try
{
result
=
HttpClient
.
doGet
(
url
,
header
,
null
);
}
catch
(
Exception
e
){
e
.
printStackTrace
();
}
JSONObject
jsonObject
=
JSONArray
.
parseObject
(
result
);
return
MapRestResult
.
build
(
200
,
"成功根据小图获取大图信息,返回人脸小图在大图中的位置"
,
jsonObject
);
}
catch
(
Exception
e
){
e
.
printStackTrace
();
}
return
MapRestResult
.
build
(
500
,
"请求失败"
,
null
);
}
@OperLog
(
message
=
"根据大图id获取所有小图信息,这里的id来自上传图片接口返回的id"
,
operation
=
OperationType
.
QUERY
)
@ApiOperation
(
value
=
"根据大图id获取所有小图信息,这里的id来自上传图片接口返回的id"
)
@GetMapping
(
"/getImageByBigImageId/{BigImageId}"
)
public
MapRestResult
getImageByBigImageId
(
@PathVariable
Long
BigImageId
){
try
{
String
accessToken
=
TokenUtils
.
getYtgsToken
();
String
url
=
"http://26.3.12.56:8083/api/intellif/face/image/"
+
BigImageId
;
String
Authorization
=
"Bearer "
+
accessToken
;
Map
header
=
new
HashMap
<
String
,
String
>();
header
.
put
(
"Authorization"
,
Authorization
);
String
result
=
null
;
try
{
result
=
HttpClient
.
doGet
(
url
,
header
,
null
);
}
catch
(
Exception
e
){
e
.
printStackTrace
();
}
JSONObject
jsonObject
=
JSONArray
.
parseObject
(
result
);
return
MapRestResult
.
build
(
200
,
"成功根据大图id获取所有小图信息,这里的id来自上传图片接口返回的id"
,
jsonObject
);
}
catch
(
Exception
e
){
e
.
printStackTrace
();
}
return
MapRestResult
.
build
(
500
,
"请求失败"
,
null
);
}
}
serviceapi/pom.xml
View file @
f4dd7214
...
...
@@ -14,16 +14,82 @@
</modules>
<artifactId>
serviceapi
</artifactId>
<dependencies>
<dependency>
<groupId>
com.founder
</groupId>
<artifactId>
service_base
</artifactId>
<version>
0.0.1-SNAPSHOT
</version>
</dependency>
<!--<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
</dependency>-->
<!--hystrix依赖,主要是用 @HystrixCommand -->
<!--<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
</dependency>-->
<!--服务注册-->
<!-- <dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>-->
<!--服务调用-->
<!-- <dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>-->
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-web
</artifactId>
</dependency>
<!--mybatis-plus-->
<dependency>
<groupId>
com.baomidou
</groupId>
<artifactId>
mybatis-plus-boot-starter
</artifactId>
</dependency>
<dependency>
<groupId>
org.dom4j
</groupId>
<artifactId>
dom4j
</artifactId>
<version>
2.0.0
</version>
</dependency>
<!--mysql-->
<dependency>
<groupId>
mysql
</groupId>
<artifactId>
mysql-connector-java
</artifactId>
</dependency>
<!--ojdbc-->
<!-- <dependency>
<groupId>org.oracle</groupId>
<artifactId>ojdbc6-10</artifactId>
<version>10</version>
<scope>system</scope>
<systemPath>${project.basedir}/../lib/ojdbc6-10.jar</systemPath>
</dependency>-->
<dependency>
<groupId>
org.oracle
</groupId>
<artifactId>
ojdbc6
</artifactId>
</dependency>
<!-- velocity 模板引擎, Mybatis Plus 代码生成器需要 -->
<dependency>
<groupId>
org.apache.velocity
</groupId>
<artifactId>
velocity-engine-core
</artifactId>
</dependency>
<!-- 引入spring-data-elasticsearch-->
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-data-elasticsearch
</artifactId>
</dependency>
<!--spring切面aop依赖-->
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-aop
</artifactId>
</dependency>
<!--swagger-->
<dependency>
<groupId>
io.springfox
</groupId>
...
...
@@ -33,10 +99,53 @@
<groupId>
io.springfox
</groupId>
<artifactId>
springfox-swagger-ui
</artifactId>
</dependency>
<!--lombok用来简化实体类:需要安装lombok插件-->
<dependency>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
</dependency>
<!--xls-->
<dependency>
<groupId>
org.oracle
</groupId>
<artifactId>
ojdbc6
</artifactId>
<groupId>
org.apache.poi
</groupId>
<artifactId>
poi
</artifactId>
</dependency>
<dependency>
<groupId>
org.apache.poi
</groupId>
<artifactId>
poi-ooxml
</artifactId>
</dependency>
<dependency>
<groupId>
commons-fileupload
</groupId>
<artifactId>
commons-fileupload
</artifactId>
</dependency>
</dependencies>
<!--httpclient-->
<dependency>
<groupId>
org.apache.httpcomponents
</groupId>
<artifactId>
httpclient
</artifactId>
</dependency>
<!--commons-io-->
<dependency>
<groupId>
commons-io
</groupId>
<artifactId>
commons-io
</artifactId>
</dependency>
<!--gson-->
<dependency>
<groupId>
com.google.code.gson
</groupId>
<artifactId>
gson
</artifactId>
</dependency>
<dependency>
<groupId>
com.alibaba
</groupId>
<artifactId>
fastjson
</artifactId>
<version>
1.2.35
</version>
</dependency>
<dependency>
<groupId>
junit
</groupId>
<artifactId>
junit
</artifactId>
<version>
4.12
</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment