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
50052165
Commit
50052165
authored
May 16, 2022
by
yangyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
任务结果获取、结果分类提交
parent
d026fbbe
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
228 additions
and
5 deletions
+228
-5
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkRegionalsResultAll.java
+36
-0
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkRegionalsResultFl.java
+19
-0
common/common_utils/src/main/java/com/founder/commonutils/model/vo/param/SkRegionalsTaskResultParamAll.java
+28
-0
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsResultController.java
+34
-5
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/SkRegionalsResultMapper.java
+12
-0
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsResultMapper.xml
+66
-0
service/publicapi/src/main/java/com/founder/publicapi/service/SkRegionalsResultService.java
+11
-0
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkRegionalsResultServiceImpl.java
+22
-0
No files found.
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkRegionalsResultAll.java
0 → 100644
View file @
50052165
package
com
.
founder
.
commonutils
.
model
.
newPublicEntity
;
import
io.swagger.annotations.ApiModel
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* 任务----结果
*/
@ApiModel
@Data
public
class
SkRegionalsResultAll
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
private
String
xxzjbh
;
// 主键编号
private
String
taskId
;
// 任务id
private
String
objectValue
;
// 车牌号
private
String
x
;
// 经度
private
String
y
;
// 纬度
private
String
time
;
// 过车时间
private
String
deviceId
;
// 设备编号
private
String
deviceName
;
// 设备名称
private
String
xm
;
// 车主姓名
private
String
mz
;
// 民族
private
String
xb
;
// 性别
private
String
sfzhm
;
// 身份证号
private
String
csdzmc
;
// 出生地址名称
private
String
xzzdzmc
;
// 现住地址名称
private
String
phone
;
// 电话
private
String
hjdqhdz
;
// 户籍地
private
String
csrq
;
// 出生日期
private
byte
[]
img
;
// 本人照片二进制
private
byte
[]
imgResult
;
// 本人照片二进制
}
\ No newline at end of file
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkRegionalsResultFl.java
0 → 100644
View file @
50052165
package
com
.
founder
.
commonutils
.
model
.
newPublicEntity
;
import
io.swagger.annotations.ApiModel
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* 任务----结果分类
*/
@ApiModel
@Data
public
class
SkRegionalsResultFl
implements
Serializable
{
private
String
flbz
;
// 分类标志
private
String
lable
;
// 分类名称
private
String
count
;
// 数量
}
\ No newline at end of file
common/common_utils/src/main/java/com/founder/commonutils/model/vo/param/SkRegionalsTaskResultParamAll.java
0 → 100644
View file @
50052165
package
com
.
founder
.
commonutils
.
model
.
vo
.
param
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
/**
* 任务表传参
* @author yangyang
* @date 2022/05/16/
*/
@Data
public
class
SkRegionalsTaskResultParamAll
{
@ApiModelProperty
(
value
=
"任务id"
)
private
String
taskId
;
@ApiModelProperty
(
value
=
"手机号码(归属地)"
)
private
String
attribution
;
@ApiModelProperty
(
value
=
"手机号码(运营商)"
)
private
String
serviceProvider
;
@ApiModelProperty
(
value
=
"当前页"
)
private
Integer
page
;
@ApiModelProperty
(
value
=
"每页大小"
)
private
Integer
pageSize
;
}
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsResultController.java
View file @
50052165
...
...
@@ -10,6 +10,7 @@ import com.founder.commonutils.model.newPublicEntity.*;
import
com.founder.commonutils.model.vo.param.SkRegionalsResultAllParam
;
import
com.founder.commonutils.model.vo.param.SkRegionalsResultParam
;
import
com.founder.commonutils.model.vo.param.SkRegionalsResultSaveParam
;
import
com.founder.commonutils.model.vo.param.SkRegionalsTaskResultParamAll
;
import
com.founder.commonutils.util.*
;
import
com.founder.publicapi.mapper.mysqlMapper.TbStAsjMapper
;
import
com.founder.publicapi.service.SkRegionalsDetailService
;
...
...
@@ -28,11 +29,15 @@ import org.springframework.web.multipart.MultipartFile;
import
javax.annotation.Resource
;
import
java.io.IOException
;
import
java.io.UnsupportedEncodingException
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.concurrent.CompletableFuture
;
import
java.util.concurrent.ExecutorService
;
import
java.util.concurrent.Executors
;
import
java.util.stream.Collectors
;
/**
* 结果表(SkRegionalsResult)表控制层
...
...
@@ -248,12 +253,28 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
}
@PostMapping
(
"queryResultFl"
)
@ApiOperation
(
value
=
"获取任务结果数据"
)
@PostMapping
(
"/queryRegionalsTasksResults"
)
//@OperLog(message = "获取任务结果数据", operation = OperationType.QUERY)
public
MapRestResult
selecteRegionalsTasksResults
(
@RequestBody
SkRegionalsTaskResultParamAll
skRegionalsTaskResultParamAll
)
{
skRegionalsTaskResultParamAll
.
setPage
((
skRegionalsTaskResultParamAll
.
getPage
()
-
1
)
*
skRegionalsTaskResultParamAll
.
getPageSize
());
List
<
SkRegionalsResultAll
>
listResult
=
skRegionalsResultService
.
selecteRegionalsTasksResults
(
skRegionalsTaskResultParamAll
);
Integer
total
=
0
;
if
(
listResult
.
size
()>
0
){
total
=
skRegionalsResultService
.
selecteRegionalsTasksResultsCount
(
skRegionalsTaskResultParamAll
);
}
return
MapRestResult
.
build
(
200
,
"获取任务结果数据成功"
,
total
,
listResult
);
}
@PostMapping
(
"queryRegionalsTasksResultsFl"
)
@ApiOperation
(
value
=
"查询结果列表信息分类"
)
//@OperLog(message = "查询结果列表信息分类", operation = OperationType.QUERY)
public
MapRestResult
queryResultFl
(
@RequestBody
String
taskId
)
{
public
MapRestResult
queryResultFl
(
@RequestBody
SkRegionalsTaskResultParamAll
skRegionalsTaskResultParamAll
)
{
List
<
Map
<
String
,
Object
>>
listResultAllNew
=
new
ArrayList
<>();
List
<
SkRegionalsResultFl
>
listResult
=
new
ArrayList
<>();
Map
<
String
,
List
<
SkRegionalsResultFl
>>
mapResult
=
new
HashMap
<>();
QueryWrapper
queryWrapper
=
new
QueryWrapper
();
queryWrapper
.
eq
(
"taskid"
,
taskId
);
queryWrapper
.
eq
(
"taskid"
,
skRegionalsTaskResultParamAll
.
getTaskId
()
);
queryWrapper
.
eq
(
"isDeleted"
,
"0"
);
List
<
SkRegionalsTask
>
taskList
=
skRegionalsTaskService
.
list
(
queryWrapper
);
if
(
taskList
.
size
()>
0
)
{
...
...
@@ -266,11 +287,19 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
break
;
//车辆回溯
case
"skhs_people"
:
// 获取任务结果分类 运营商分类 归属地分类
listResult
=
skRegionalsResultService
.
selecteRegionalsTasksResultsFl
(
skRegionalsTaskResultParamAll
.
getTaskId
());
mapResult
=
listResult
.
stream
().
collect
(
Collectors
.
groupingBy
(
SkRegionalsResultFl:
:
getFlbz
));
break
;
//基站回溯
}
// 转为前端对应格式
mapResult
.
forEach
((
key
,
value
)->{
Map
<
String
,
Object
>
maps
=
new
HashMap
<>();
maps
.
put
(
"lable"
,
key
);
maps
.
put
(
"list"
,
JSONArray
.
toJSON
(
value
));
listResultAllNew
.
add
(
maps
);
});
}
return
new
MapRestResult
(
200
,
"OK"
,
"1"
,
"1"
);
return
new
MapRestResult
(
200
,
"OK"
,
listResultAllNew
.
size
(),
listResultAllNew
);
}
@Override
...
...
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/SkRegionalsResultMapper.java
View file @
50052165
package
com
.
founder
.
publicapi
.
mapper
.
mysqlMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.founder.commonutils.model.newPublicEntity.SkRegionalsResultAll
;
import
com.founder.commonutils.model.newPublicEntity.SkRegionalsResult
;
import
com.founder.commonutils.model.newPublicEntity.SkRegionalsResultFl
;
import
com.founder.commonutils.model.vo.param.SkRegionalsTaskResultParamAll
;
import
org.apache.ibatis.annotations.Param
;
import
org.springframework.stereotype.Component
;
import
java.util.List
;
/**
* 结果表(SkRegionalsResult)表数据库访问层
...
...
@@ -9,7 +17,11 @@ import com.founder.commonutils.model.newPublicEntity.SkRegionalsResult;
* @author jlt
* @since 2022-03-09 10:11:06
*/
@Component
public
interface
SkRegionalsResultMapper
extends
BaseMapper
<
SkRegionalsResult
>
{
List
<
SkRegionalsResultAll
>
selecteRegionalsTasksResults
(
SkRegionalsTaskResultParamAll
skRegionalsTaskResultParamAll
);
int
selecteRegionalsTasksResultsCount
(
SkRegionalsTaskResultParamAll
skRegionalsTaskResultParamAll
);
List
<
SkRegionalsResultFl
>
selecteRegionalsTasksResultsFl
(
@Param
(
value
=
"taskId"
)
String
taskId
);
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsResultMapper.xml
0 → 100644
View file @
50052165
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.founder.publicapi.mapper.mysqlMapper.SkRegionalsResultMapper"
>
<!--获取任务结果-->
<select
id=
"selecteRegionalsTasksResults"
parameterType=
"com.founder.commonutils.model.vo.param.SkRegionalsTaskResultParamAll"
resultType=
"com.founder.commonutils.model.newPublicEntity.SkRegionalsResultAll"
>
SELECT
r.xxzjbh as xxzjbh,
r.taskid as taskId,
r.objectvalue as objectValue,
DATE_FORMAT(r.djsj,'%Y-%m-%d %H:%i:%S') as djsj,
r.x AS X,
r.y AS Y,
r.img as imgResult,
DATE_FORMAT(r.djsj,'%Y-%m-%d %H:%i:%S') as time,
r.deviceid as deviceId,
(select point.deviceName from sk_pointlocation point where point.deviceid = r.deviceid) as deviceName,
p.xm as xm,
p.mz as mz,
p.img as img,
p.xb as xb,
p.sfzhm as sfzhm,
p.xzzdzmc as xzzdzmc,
p.phone as phone,
p.hjdqhdz as hjdqhdz,
p.csrq as csrq,
p.csdzmc as csdzmc
FROM sk_regionals_result r
left join sk_regionals_detail d on r.xxzjbh = d.resultid
left join sk_regionals_person p on d.sfzhm = p.sfzhm
where
<if
test=
"taskId != null and taskId != ''"
>
r.taskId = #{ taskId , jdbcType=VARCHAR }
</if>
<if
test=
"attribution != null and attribution != ''"
>
and d .attribution = #{ attribution , jdbcType=VARCHAR }
</if>
<if
test=
"serviceProvider != null and serviceProvider != ''"
>
and d .serviceProvider = #{ serviceProvider , jdbcType=VARCHAR }
</if>
limit #{page},#{pageSize}
</select>
<!--获取任务结果数量-->
<select
id=
"selecteRegionalsTasksResultsCount"
parameterType=
"com.founder.commonutils.model.vo.param.SkRegionalsTaskResultParamAll"
resultType=
"Integer"
>
SELECT
count(*)
FROM sk_regionals_result r
left join sk_regionals_detail d on r.xxzjbh = d.resultid
left join sk_regionals_person p on d.sfzhm = p.sfzhm
where
<if
test=
"taskId != null and taskId != ''"
>
r.taskId = #{ taskId , jdbcType=VARCHAR }
</if>
<if
test=
"attribution != null and attribution != ''"
>
and d .attribution = #{ attribution , jdbcType=VARCHAR }
</if>
<if
test=
"serviceProvider != null and serviceProvider != ''"
>
and d .serviceProvider = #{ serviceProvider , jdbcType=VARCHAR }
</if>
</select>
<!--获取任务结果分类基站回溯-->
<select
id=
"selecteRegionalsTasksResultsFl"
parameterType=
"java.lang.String"
resultType=
"com.founder.commonutils.model.newPublicEntity.SkRegionalsResultFl"
>
SELECT
attribution as lable ,count(*) as count
FROM sk_regionals_result r
left join sk_regionals_detail d on r.xxzjbh = d.resultid where
<if
test=
"taskId != null and taskId != ''"
>
r.taskId = #{ taskId , jdbcType=VARCHAR }
</if>
GROUP BY d.attribution
UNION ALL
SELECT
serviceProvider as lable,count(*) as count
FROM sk_regionals_result r
left join sk_regionals_detail d on r.xxzjbh = d.resultid where
<if
test=
"taskId != null and taskId != ''"
>
r.taskId = #{ taskId , jdbcType=VARCHAR }
</if>
GROUP BY d.serviceProvider
</select>
</mapper>
service/publicapi/src/main/java/com/founder/publicapi/service/SkRegionalsResultService.java
View file @
50052165
package
com
.
founder
.
publicapi
.
service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.founder.commonutils.model.newPublicEntity.SkRegionalsResultAll
;
import
com.founder.commonutils.model.newPublicEntity.SkRegionalsResult
;
import
com.founder.commonutils.model.newPublicEntity.SkRegionalsResultFl
;
import
com.founder.commonutils.model.vo.param.SkRegionalsTaskResultParamAll
;
import
io.lettuce.core.dynamic.annotation.Param
;
import
java.util.List
;
/**
* 结果表(SkRegionalsResult)表服务接口
...
...
@@ -11,5 +17,10 @@ import com.founder.commonutils.model.newPublicEntity.SkRegionalsResult;
*/
public
interface
SkRegionalsResultService
extends
IService
<
SkRegionalsResult
>
{
List
<
SkRegionalsResultAll
>
selecteRegionalsTasksResults
(
SkRegionalsTaskResultParamAll
skRegionalsTaskResultParamAll
);
Integer
selecteRegionalsTasksResultsCount
(
SkRegionalsTaskResultParamAll
skRegionalsTaskResultParamAll
);
List
<
SkRegionalsResultFl
>
selecteRegionalsTasksResultsFl
(
@Param
(
"taskId"
)
String
taskId
);
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkRegionalsResultServiceImpl.java
View file @
50052165
...
...
@@ -2,10 +2,16 @@ package com.founder.publicapi.service.serviceimpl;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.founder.commonutils.model.newPublicEntity.SkRegionalsResult
;
import
com.founder.commonutils.model.newPublicEntity.SkRegionalsResultAll
;
import
com.founder.commonutils.model.newPublicEntity.SkRegionalsResultFl
;
import
com.founder.commonutils.model.vo.param.SkRegionalsTaskResultParamAll
;
import
com.founder.publicapi.mapper.mysqlMapper.SkRegionalsResultMapper
;
import
com.founder.publicapi.service.SkRegionalsResultService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
/**
* 结果表(SkRegionalsResult)表服务实现类
*
...
...
@@ -15,5 +21,21 @@ import org.springframework.stereotype.Service;
@Service
(
"skRegionalsResultService"
)
public
class
SkRegionalsResultServiceImpl
extends
ServiceImpl
<
SkRegionalsResultMapper
,
SkRegionalsResult
>
implements
SkRegionalsResultService
{
@Autowired
private
SkRegionalsResultMapper
skRegionalsResultMapper
;
@Override
public
List
<
SkRegionalsResultAll
>
selecteRegionalsTasksResults
(
SkRegionalsTaskResultParamAll
skRegionalsTaskResultParamAll
)
{
return
skRegionalsResultMapper
.
selecteRegionalsTasksResults
(
skRegionalsTaskResultParamAll
);
}
@Override
public
Integer
selecteRegionalsTasksResultsCount
(
SkRegionalsTaskResultParamAll
skRegionalsTaskResultParamAll
)
{
return
skRegionalsResultMapper
.
selecteRegionalsTasksResultsCount
(
skRegionalsTaskResultParamAll
);
}
@Override
public
List
<
SkRegionalsResultFl
>
selecteRegionalsTasksResultsFl
(
String
taskId
)
{
return
skRegionalsResultMapper
.
selecteRegionalsTasksResultsFl
(
taskId
);
}
}
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