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
c46d9c80
Commit
c46d9c80
authored
Mar 01, 2023
by
yangyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
快手接口、车轨接口加响应超时(湖南)
parent
28ddef67
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
148 additions
and
10 deletions
+148
-10
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/TbYwDzqqKuaishouActiveInfo.java
+66
-0
service/publicapi/src/main/java/com/founder/publicapi/PublicapiApplication.java
+8
-1
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkTrailController.java
+54
-8
service/publicapi/src/main/java/com/founder/publicapi/controller/SkInterface/InterfaceAPI.java
+1
-1
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/KsTrailMapper.java
+19
-0
No files found.
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/TbYwDzqqKuaishouActiveInfo.java
0 → 100644
View file @
c46d9c80
package
com
.
founder
.
commonutils
.
model
.
newPublicEntity
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
/**
* (TbStClgj)表实体类
*
* @author yy
* @since 2023-02-21
*/
@Data
@SuppressWarnings
(
"serial"
)
@TableName
(
"tb_yw_dzqq_kuaishou_active_info"
)
public
class
TbYwDzqqKuaishouActiveInfo
{
/**
* 活动时间
*/
@ApiModelProperty
(
value
=
"活动时间"
)
private
String
activeTime
;
/**
* 活动类型
*/
@ApiModelProperty
(
value
=
"活动类型"
)
private
String
activeType
;
/**
* 活动IP
*/
@ApiModelProperty
(
value
=
"活动IP"
)
private
String
activeIp
;
/**
* 端口号
*/
@ApiModelProperty
(
value
=
"端口号"
)
private
String
activePort
;
/**
* 活动地点
*/
@ApiModelProperty
(
value
=
"活动地点"
)
private
String
activeLocation
;
/**
* 活动经纬度
*/
@ApiModelProperty
(
value
=
"活动经纬度"
)
@JsonIgnore
private
String
longitudeLatitude
;
@ApiModelProperty
(
value
=
"经度"
)
@TableField
(
exist
=
false
)
private
String
x
;
@ApiModelProperty
(
value
=
"纬度"
)
@TableField
(
exist
=
false
)
private
String
y
;
}
service/publicapi/src/main/java/com/founder/publicapi/PublicapiApplication.java
View file @
c46d9c80
...
...
@@ -9,6 +9,7 @@ import org.springframework.boot.web.client.RestTemplateBuilder;
import
org.springframework.context.ConfigurableApplicationContext
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.ComponentScan
;
import
org.springframework.http.client.SimpleClientHttpRequestFactory
;
import
org.springframework.scheduling.annotation.EnableScheduling
;
import
org.springframework.web.client.RestTemplate
;
...
...
@@ -27,5 +28,11 @@ public class PublicapiApplication {
SpringUtil
.
applicationContext
=
applicationContext
;
}
@Bean
public
RestTemplate
restTemplate
(){
return
restTemplateBuilder
.
build
();}
public
RestTemplate
restTemplate
(){
SimpleClientHttpRequestFactory
factory
=
new
SimpleClientHttpRequestFactory
();
factory
.
setConnectTimeout
(
10000
);
factory
.
setReadTimeout
(
10000
);
RestTemplate
restTemplate
=
new
RestTemplate
(
factory
);
return
restTemplate
;
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkTrailController.java
View file @
c46d9c80
package
com
.
founder
.
publicapi
.
controller
.
SkDataOperation
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.api.ApiController
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.founder.commonutils.model.newPublicEntity.MapRestResult
;
import
com.founder.commonutils.model.newPublicEntity.SkText
;
import
com.founder.commonutils.model.vo.param.SkTextParam
;
import
com.founder.commonutils.model.newPublicEntity.TbYwDzqqKuaishouActiveInfo
;
import
com.founder.commonutils.model.vo.param.SkTrailParam
;
import
com.founder.commonutils.model.vo.param.SkTrailSaveParam
;
import
com.founder.commonutils.model.vo.response.SkTrailVO
;
...
...
@@ -17,15 +14,15 @@ import com.founder.commonutils.util.*;
import
com.founder.commonutils.model.newPublicEntity.SkTrail
;
import
com.founder.publicapi.controller.SkDataUpload.FtpUtil
;
import
com.founder.publicapi.controller.SkInterface.InterfaceAPI
;
import
com.founder.publicapi.mapper.mysqlMapper.KsTrailMapper
;
import
com.founder.publicapi.service.serviceimpl.SkTextUtilServiceImpl
;
import
com.founder.servicebase.controller.ExcelControllerInterface
;
import
com.founder.servicebase.logs.OperLog
;
import
com.founder.servicebase.logs.OperationType
;
import
com.founder.publicapi.service.SkTrailService
;
import
com.founder.servicebase.mapper.mysqlMapper.SkTextMapper
;
import
com.founder.servicebase.service.SkDictionaryService
;
import
com.google.gson.JsonObject
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiOperation
;
import
org.apache.commons.lang.StringUtils
;
import
org.springframework.beans.BeanUtils
;
...
...
@@ -37,8 +34,7 @@ import org.springframework.web.multipart.MultipartFile;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.lang.reflect.Field
;
import
java.util.*
;
import
java.util.stream.Collectors
;
...
...
@@ -65,6 +61,8 @@ public class SkTrailController extends ApiController implements ExcelControllerI
private
SkDictionaryService
skDictionaryService
;
@Autowired
private
SkTextUtilServiceImpl
SkTextUtilServiceImpl
;
@Autowired
private
KsTrailMapper
ksTrailMapper
;
/**
* 新增轨迹
*/
...
...
@@ -196,6 +194,9 @@ public class SkTrailController extends ApiController implements ExcelControllerI
@OperLog
(
message
=
"公共_获取轨迹接口"
,
operation
=
OperationType
.
QUERY
)
public
MapRestResult
query
(
@RequestBody
SkTrailParam
sktrailParam
,
HttpServletRequest
request
)
{
List
<
SkTrailVO
>
list
=
new
ArrayList
<>();
try
{
// 根据标识号查看是否为演示数据 演示数据直接走数据库
if
(
SkTextUtilServiceImpl
.
queryText
(
sktrailParam
.
getLikeValue
()).
size
()>
0
){
//分页
...
...
@@ -244,6 +245,10 @@ public class SkTrailController extends ApiController implements ExcelControllerI
list
=
(
List
<
SkTrailVO
>)
map
.
get
(
"rows"
);
return
new
MapRestResult
(
200
,
"OK"
,
map
.
get
(
"total"
),
list
);
}
}
catch
(
Exception
e
){
return
new
MapRestResult
(
201
,
"error"
,
list
.
size
(),
e
);
}
return
new
MapRestResult
(
200
,
"OK"
,
list
.
size
(),
list
);
}
...
...
@@ -611,5 +616,46 @@ public class SkTrailController extends ApiController implements ExcelControllerI
return
"转化格式错误"
;
}
}
@PostMapping
(
"/findListKsByBh"
)
@ApiOperation
(
value
=
"根据人员id查找相关快手轨迹"
)
@OperLog
(
message
=
"根据人员id查找相关快手轨迹"
,
operation
=
OperationType
.
QUERY
)
public
MapRestResult
findListKsByBh
(
String
userid
)
{
Map
mapResult
=
new
HashMap
();
// 返回数据
QueryWrapper
queryWrapper
=
new
QueryWrapper
();
queryWrapper
.
eq
(
"user_id"
,
userid
);
queryWrapper
.
orderByDesc
(
"active_time"
);
List
<
TbYwDzqqKuaishouActiveInfo
>
listAll
=
ksTrailMapper
.
selectList
(
queryWrapper
);
// 经纬度处理
listAll
.
stream
().
forEach
(
p
->{
if
(
StringUtils
.
isNotBlank
(
p
.
getLongitudeLatitude
())){
String
xy
[]
=
p
.
getLongitudeLatitude
().
split
(
","
);
p
.
setX
(
xy
[
0
]);
p
.
setY
(
xy
[
1
]);
}
});
mapResult
.
put
(
"list"
,
listAll
);
// 返回字段描述
Field
[]
declaredFields
=
TbYwDzqqKuaishouActiveInfo
.
class
.
getDeclaredFields
();
List
<
Map
<
String
,
String
>>
mapsList
=
new
ArrayList
<>();
for
(
Field
field
:
declaredFields
)
{
Map
<
String
,
String
>
map
=
new
HashMap
<>();
ApiModelProperty
nameAnno
=
field
.
getAnnotation
(
ApiModelProperty
.
class
);
String
fieldName
=
field
.
getName
();
String
value
=
nameAnno
.
value
();
if
(!
fieldName
.
equals
(
"longitudeLatitude"
)){
map
.
put
(
"name"
,
fieldName
);
map
.
put
(
"value"
,
value
);
mapsList
.
add
(
map
);
}
}
mapResult
.
put
(
"column"
,
mapsList
);
return
new
MapRestResult
(
200
,
"OK"
,
listAll
.
size
(),
mapResult
);
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/SkInterface/InterfaceAPI.java
View file @
c46d9c80
...
...
@@ -814,7 +814,7 @@ public class InterfaceAPI {
System
.
out
.
println
(
"接口请求url:"
+
url
);
ResponseEntity
<
String
>
entity
=
restTemplate
.
getForEntity
(
url
.
trim
(),
String
.
class
);
Map
<
String
,
Object
>
temp
=
(
Map
)
JSONObject
.
parse
(
entity
.
getBody
());
System
.
out
.
println
(
"接口请求结果数据:"
+
entity
.
getBody
());
//
System.out.println("接口请求结果数据:" + entity.getBody());
// 数据封装与前端一致
SimpleDateFormat
sfResult
=
new
SimpleDateFormat
(
"yyyyMMddHHmmss"
);
if
(
"0"
.
equals
(
temp
.
get
(
"state"
)))
{
...
...
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/KsTrailMapper.java
0 → 100644
View file @
c46d9c80
package
com
.
founder
.
publicapi
.
mapper
.
mysqlMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.founder.commonutils.model.newPublicEntity.TbYwDzqqKuaishouActiveInfo
;
import
org.springframework.stereotype.Component
;
/**
* (TbYwDzqqKuaishouActiveInfo)表数据库访问层
*
* @author yy
* @since 2022-02-21
*/
@Component
public
interface
KsTrailMapper
extends
BaseMapper
<
TbYwDzqqKuaishouActiveInfo
>
{
}
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