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
c3a8d0d6
Commit
c3a8d0d6
authored
Nov 17, 2023
by
yangyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
时空相关提交(湖南)
parent
fea4dbe6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
359 additions
and
75 deletions
+359
-75
common/common_utils/src/main/java/com/founder/commonutils/model/asjEntity/TbXwJjcjxx.java
+52
-0
common/common_utils/src/main/java/com/founder/commonutils/model/asjEntity/TbXwJjcjxxDetail.java
+51
-0
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkRegionalsResultAll.java
+4
-0
common/common_utils/src/main/java/com/founder/commonutils/model/vo/param/SkRegionalsTaskParam.java
+4
-0
common/common_utils/src/main/java/com/founder/commonutils/model/vo/param/TbXwJjcjxxParm.java
+45
-0
common/common_utils/src/main/java/com/founder/commonutils/util/SysUtils.java
+24
-0
common/common_utils/src/main/java/com/founder/commonutils/util/map/LCSS.java
+5
-0
service/publicapi/src/main/java/com/founder/publicapi/controller/AsjService/AsjController.java
+16
-0
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsTaskController.java
+4
-0
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRxController.java
+15
-6
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkTrailController.java
+0
-0
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/TbStAsjMapper.java
+5
-4
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsResultMapper.xml
+2
-0
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsTaskMapper.xml
+37
-57
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/TbStAsjMapper.xml
+65
-0
service/publicapi/src/main/java/com/founder/publicapi/service/TbStAsjService.java
+6
-4
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/TbStAsjServiceImpl.java
+24
-4
No files found.
common/common_utils/src/main/java/com/founder/commonutils/model/asjEntity/TbXwJjcjxx.java
0 → 100644
View file @
c3a8d0d6
package
com
.
founder
.
commonutils
.
model
.
asjEntity
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
/**
* 接警信息
*
* @author yangyang
* @date 2023/11/17
*/
@Data
@ApiModel
(
"接警信息"
)
public
class
TbXwJjcjxx
{
@ApiModelProperty
(
value
=
"报案人-姓名"
)
private
String
barXm
;
@ApiModelProperty
(
value
=
"报案人-证件号码"
)
private
String
barCyzjZjhm
;
@ApiModelProperty
(
value
=
"报案人住址"
)
private
String
barZz
;
@ApiModelProperty
(
value
=
"警情名称"
)
private
String
jqmc
;
@ApiModelProperty
(
value
=
"报案时间"
)
private
String
basj
;
@ApiModelProperty
(
value
=
"接警单位名称"
)
private
String
jjdwGajgmc
;
@ApiModelProperty
(
value
=
"接警时间"
)
private
String
jjsj
;
@ApiModelProperty
(
value
=
"接警编号"
)
private
String
jjbh
;
@ApiModelProperty
(
value
=
"案件编号"
)
private
String
asjbh
;
@ApiModelProperty
(
value
=
"经度"
)
private
String
x
;
@ApiModelProperty
(
value
=
"纬度"
)
private
String
y
;
@ApiModelProperty
(
value
=
"地点"
)
private
String
faddDzmc
;
}
common/common_utils/src/main/java/com/founder/commonutils/model/asjEntity/TbXwJjcjxxDetail.java
0 → 100644
View file @
c3a8d0d6
package
com
.
founder
.
commonutils
.
model
.
asjEntity
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
/**
* 接警信息
*
* @author yangyang
* @date 2023/11/17
*/
@Data
@ApiModel
(
"接警信息"
)
public
class
TbXwJjcjxxDetail
{
@ApiModelProperty
(
value
=
"报案人-姓名"
)
private
String
barXm
;
@ApiModelProperty
(
value
=
"报案人-证件号码"
)
private
String
barCyzjZjhm
;
@ApiModelProperty
(
value
=
"报案人住址"
)
private
String
barZz
;
@ApiModelProperty
(
value
=
"警情名称"
)
private
String
jqmc
;
@ApiModelProperty
(
value
=
"报案时间"
)
private
String
basj
;
@ApiModelProperty
(
value
=
"接警单位名称"
)
private
String
jjdwGajgmc
;
@ApiModelProperty
(
value
=
"接警时间"
)
private
String
jjsj
;
@ApiModelProperty
(
value
=
"处警时间"
)
private
String
cjsj
;
@ApiModelProperty
(
value
=
"接警编号"
)
private
String
jjbh
;
@ApiModelProperty
(
value
=
"地点"
)
private
String
faddDzmc
;
@ApiModelProperty
(
value
=
"案情"
)
private
String
jyaq
;
@ApiModelProperty
(
value
=
"处理意见"
)
private
String
clyj
;
}
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkRegionalsResultAll.java
View file @
c3a8d0d6
package
com
.
founder
.
commonutils
.
model
.
newPublicEntity
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
...
...
@@ -42,4 +43,6 @@ public class SkRegionalsResultAll implements Serializable {
private
String
bsobjectvaluetype
;
private
String
rxpzqy
;
// 人像区域
private
String
faceid
;
// 人像id
@ApiModelProperty
(
value
=
"0非套牌 1套牌"
)
private
String
tpFlag
;
}
\ No newline at end of file
common/common_utils/src/main/java/com/founder/commonutils/model/vo/param/SkRegionalsTaskParam.java
View file @
c3a8d0d6
...
...
@@ -24,6 +24,10 @@ public class SkRegionalsTaskParam {
*/
private
List
<
String
>
tasktypeList
;
/**
* 登录者身份证
*/
private
String
fsridentity
;
/**
* 开始时间
*/
private
String
kssj
;
...
...
common/common_utils/src/main/java/com/founder/commonutils/model/vo/param/TbXwJjcjxxParm.java
0 → 100644
View file @
c3a8d0d6
package
com
.
founder
.
commonutils
.
model
.
vo
.
param
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
@Data
@ApiModel
(
value
=
"警情基本信息入参"
,
description
=
"警情基本信息入参"
)
public
class
TbXwJjcjxxParm
implements
Serializable
{
@ApiModelProperty
(
value
=
"开始经度"
)
private
String
startLng
;
@ApiModelProperty
(
value
=
"开始纬度"
)
private
String
startLat
;
@ApiModelProperty
(
value
=
"结束经度"
)
private
String
endLng
;
@ApiModelProperty
(
value
=
"结束纬度"
)
private
String
endLat
;
@ApiModelProperty
(
value
=
"接警开始时间"
)
private
String
kssj
;
@ApiModelProperty
(
value
=
"接警结束时间"
)
private
String
jssj
;
@ApiModelProperty
(
value
=
"接警编号"
)
private
String
jjbh
;
@ApiModelProperty
(
value
=
"简要案情"
)
private
String
jyaq
;
@ApiModelProperty
(
value
=
"案件类别代码"
)
private
String
ajlbdm
;
@ApiModelProperty
(
value
=
"案件名称"
)
private
int
jqmc
;
@ApiModelProperty
(
value
=
"接警单位公安机关代码"
)
private
String
jjdwGajgjgdm
;
}
common/common_utils/src/main/java/com/founder/commonutils/util/SysUtils.java
0 → 100644
View file @
c3a8d0d6
package
com
.
founder
.
commonutils
.
util
;
import
com.founder.commonutils.model.newPublicEntity.SysUser
;
import
org.springframework.web.context.request.RequestContextHolder
;
import
org.springframework.web.context.request.ServletRequestAttributes
;
import
javax.servlet.http.HttpServletRequest
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
/**
* 系统工具类
*
* @author admin
* @date 2022/03/01
*/
public
class
SysUtils
{
public
static
SysUser
getReqUser
(){
HttpServletRequest
request
=
((
ServletRequestAttributes
)
RequestContextHolder
.
getRequestAttributes
()).
getRequest
();
SysUser
user
=
(
SysUser
)
request
.
getAttribute
(
"user"
);
return
user
;
}
}
common/common_utils/src/main/java/com/founder/commonutils/util/map/LCSS.java
View file @
c3a8d0d6
package
com
.
founder
.
commonutils
.
util
.
map
;
import
org.apache.commons.lang.StringUtils
;
import
java.util.*
;
public
class
LCSS
{
...
...
@@ -48,6 +50,9 @@ public class LCSS {
//内层遍历第二条轨迹
for
(
int
j
=
0
;
j
<
len2
;
j
++)
{
// 时间范围比较 俩个点之间的时差
if
(
StringUtils
.
isBlank
(
l1
.
get
(
i
).
getTime
())||
StringUtils
.
isBlank
(
l2
.
get
(
i
).
getTime
())){
break
;
}
long
timeIterval
=
Long
.
parseLong
(
l1
.
get
(
i
).
getTime
())
-
Long
.
parseLong
(
l2
.
get
(
j
).
getTime
());
//第一条轨迹的第i个点和第二条轨迹的第j个点是否在radius范围内 && 俩个点之间的时差小于等于minutes && 俩个点之间的时差大于等于-minutes
if
(
isNearby
(
l1
.
get
(
i
),
l2
.
get
(
j
),
radius
)
&&
timeIterval
<=
timeItervalMinutes
&&
timeIterval
>=-
timeItervalMinutes
)
{
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/AsjService/AsjController.java
View file @
c3a8d0d6
...
...
@@ -74,6 +74,22 @@ public class AsjController {
return
tbStAsjService
.
selectAsjxxListEsXq
(
tbStAsjParm
);
}
@OperLog
(
message
=
"公共_警情热力查询"
,
operation
=
OperationType
.
QUERY
)
@ApiOperation
(
value
=
"态势分析_警情热力查询"
)
@PostMapping
(
"queryJq"
)
public
MapRestResult
selectJqRlt
(
@RequestBody
TbXwJjcjxxParm
tbXwJjcjxxParm
)
{
List
<
TbXwJjcjxx
>
jqList
=
tbStAsjService
.
selectJqRlt
(
tbXwJjcjxxParm
);
return
MapRestResult
.
build
(
200
,
"成功获取警情信息"
,
jqList
.
size
(),
jqList
);
}
@OperLog
(
message
=
"公共_警情热力详情查询"
,
operation
=
OperationType
.
QUERY
)
@ApiOperation
(
value
=
"态势分析_警情热力详情查询"
)
@PostMapping
(
"queryJqDetail"
)
public
MapRestResult
queryJqDetail
(
@RequestBody
TbXwJjcjxxParm
tbXwJjcjxxParm
)
{
List
<
TbXwJjcjxxDetail
>
jqList
=
tbStAsjService
.
queryJqDetail
(
tbXwJjcjxxParm
);
return
MapRestResult
.
build
(
200
,
"成功获取警情详情信息"
,
jqList
.
size
(),
jqList
);
}
@OperLog
(
message
=
"串并案件导出"
,
operation
=
OperationType
.
QUERY
)
@ApiOperation
(
value
=
"串并案件导出"
)
@PostMapping
(
"cbajExport"
)
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsTaskController.java
View file @
c3a8d0d6
...
...
@@ -10,6 +10,7 @@ import com.founder.commonutils.model.vo.param.*;
import
com.founder.commonutils.util.ExportExcelUtil
;
import
com.founder.commonutils.util.KeyUtil
;
import
com.founder.commonutils.model.newPublicEntity.SkRegionalsTask
;
import
com.founder.commonutils.util.SysUtils
;
import
com.founder.servicebase.controller.ExcelControllerInterface
;
import
com.founder.servicebase.logs.OperLog
;
import
com.founder.servicebase.logs.OperationType
;
...
...
@@ -21,6 +22,8 @@ import io.swagger.annotations.ApiOperation;
import
org.apache.commons.lang.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.context.request.RequestContextHolder
;
import
org.springframework.web.context.request.ServletRequestAttributes
;
import
javax.annotation.Resource
;
import
javax.servlet.http.HttpServletRequest
;
...
...
@@ -166,6 +169,7 @@ public class SkRegionalsTaskController extends ApiController implements ExcelCon
@ApiOperation
(
value
=
"以图研判_获取任务列表"
)
@OperLog
(
message
=
"以图研判_获取任务列表"
,
operation
=
OperationType
.
QUERY
)
public
MapRestResult
query
(
@RequestBody
SkRegionalsTaskParam
skRegionalsDetailParam
)
{
skRegionalsDetailParam
.
setFsridentity
(
SysUtils
.
getReqUser
().
getIdentitycard
());
// 分页
skRegionalsDetailParam
.
setPage
((
skRegionalsDetailParam
.
getPage
()
-
1
)
*
skRegionalsDetailParam
.
getPageSize
());
List
<
SkRegionalsTask
>
list
=
skRegionalsTaskService
.
queryTaskInfoList
(
skRegionalsDetailParam
);
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRxController.java
View file @
c3a8d0d6
...
...
@@ -18,6 +18,7 @@ import org.apache.http.HttpEntity;
import
org.apache.http.HttpStatus
;
import
org.apache.http.client.methods.CloseableHttpResponse
;
import
org.apache.http.client.methods.HttpPost
;
import
org.apache.http.entity.ContentType
;
import
org.apache.http.entity.mime.MultipartEntityBuilder
;
import
org.apache.http.impl.client.CloseableHttpClient
;
import
org.apache.http.impl.client.HttpClients
;
...
...
@@ -28,6 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
import
java.io.*
;
import
java.net.URL
;
import
java.net.URLConnection
;
import
java.nio.charset.Charset
;
import
java.util.*
;
/**
...
...
@@ -76,7 +78,10 @@ public class SkRxController extends ApiController {
file
=
Base64DecodeMultipartFile
.
base64ToMultipart
(
base64Img
);
}
File
tmpFile
=
getFile
(
file
);
taskId
=
upload
(
"http://68.174.69.109:9101/feiShi/sendFeiShiTask"
,
tmpFile
,
threshold
,
topNumber
);
List
<
String
>
listIp
=
Arrays
.
asList
(
"68.174.69.119"
,
"68.174.25.90"
,
"68.174.25.95"
);
int
index
=
(
int
)
(
Math
.
random
()*
listIp
.
size
());
String
ip
=
listIp
.
get
(
index
);
taskId
=
upload
(
"http://68.174.69.109:9101/feiShi/sendFeiShiTask"
,
tmpFile
,
threshold
,
topNumber
,
ip
);
System
.
out
.
println
(
"taskId====="
+
taskId
);
List
<
Map
<
String
,
Object
>>
list
=
new
ArrayList
<>();
String
data
=
null
;
...
...
@@ -97,7 +102,7 @@ public class SkRxController extends ApiController {
break
;
}
System
.
out
.
print
(
"times==="
+
times
);
getResult
=
sendTask
(
taskId
);
getResult
=
sendTask
(
taskId
,
ip
);
System
.
out
.
println
(
"getResult====="
+
getResult
);
if
(
getResult
!=
null
&&
!
""
.
equals
(
getResult
))
{
//解析数据
...
...
@@ -167,8 +172,8 @@ public class SkRxController extends ApiController {
return
MapRestResult
.
build
(
200
,
"成功"
,
list
.
size
(),
list
);
}
public
static
String
sendTask
(
String
taskId
)
{
String
url
=
"http://68.174.69.109:9101/feiShi/getFeiShiResult?taskId="
+
taskId
+
"&userId=150147"
;
public
static
String
sendTask
(
String
taskId
,
String
ip
)
{
String
url
=
"http://68.174.69.109:9101/feiShi/getFeiShiResult?taskId="
+
taskId
+
"&userId=150147"
+
"&userIdNumber=441900198804262777"
+
"&userName=陈建昌"
+
"&userIp="
+
ip
;
System
.
out
.
println
(
"==================="
+
url
);
String
result
=
""
;
String
urlName
=
url
;
...
...
@@ -195,11 +200,12 @@ public class SkRxController extends ApiController {
return
result
;
}
public
String
upload
(
String
url
,
File
file
,
String
threshold
,
String
topNumber
)
{
public
String
upload
(
String
url
,
File
file
,
String
threshold
,
String
topNumber
,
String
ip
)
{
String
taskId
=
""
;
try
{
CloseableHttpClient
httpclient
=
HttpClients
.
createDefault
();
HttpPost
httppost
=
new
HttpPost
(
url
);
ContentType
contentType
=
ContentType
.
create
(
"text/plain"
,
Charset
.
forName
(
"UTF-8"
));
MultipartEntityBuilder
multipartEntityBuilder
=
MultipartEntityBuilder
.
create
();
//文件流
...
...
@@ -207,7 +213,10 @@ public class SkRxController extends ApiController {
//其他参数
multipartEntityBuilder
.
addTextBody
(
"threshold"
,
threshold
);
multipartEntityBuilder
.
addTextBody
(
"topNumber"
,
topNumber
);
multipartEntityBuilder
.
addTextBody
(
"userId"
,
"150147"
);
multipartEntityBuilder
.
addTextBody
(
"userId"
,
"281851"
);
multipartEntityBuilder
.
addTextBody
(
"userIdNumber"
,
"441900198804262777"
);
multipartEntityBuilder
.
addTextBody
(
"userName"
,
"陈建昌"
,
contentType
);
multipartEntityBuilder
.
addTextBody
(
"userIp"
,
ip
);
httppost
.
setEntity
(
multipartEntityBuilder
.
build
());
CloseableHttpResponse
response
=
httpclient
.
execute
(
httppost
);
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkTrailController.java
View file @
c3a8d0d6
This diff is collapsed.
Click to expand it.
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/TbStAsjMapper.java
View file @
c3a8d0d6
package
com
.
founder
.
publicapi
.
mapper
.
mysqlMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.founder.commonutils.model.asjEntity.CbxszAndXlaj
;
import
com.founder.commonutils.model.asjEntity.TbAsjJwdInfo
;
import
com.founder.commonutils.model.asjEntity.TbStAsj
;
import
com.founder.commonutils.model.asjEntity.TbStAsjResult
;
import
com.founder.commonutils.model.asjEntity.*
;
import
com.founder.commonutils.model.newPublicEntity.RyAndAjEntity.BqXqByZjhmResult
;
import
com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoOrMediaResult
;
import
com.founder.commonutils.model.newPublicEntity.ZdcsResult
;
...
...
@@ -12,6 +9,7 @@ import com.founder.commonutils.model.newPublicEntity.ZdryResult;
import
com.founder.commonutils.model.newPublicEntity.jwdjyEntity.TbAsjJwdinfo
;
import
com.founder.commonutils.model.vo.param.SkPointlocationParams
;
import
com.founder.commonutils.model.vo.param.TbStAsjParm
;
import
com.founder.commonutils.model.vo.param.TbXwJjcjxxParm
;
import
com.founder.commonutils.model.vo.param.ZdryParams
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
...
...
@@ -65,4 +63,7 @@ public interface TbStAsjMapper extends BaseMapper<TbStAsj> {
BqXqByZjhmResult
selectbqxx
(
@Param
(
value
=
"zjhm"
)
String
zjhm
,
@Param
(
value
=
"type"
)
String
type
,
@Param
(
value
=
"bq"
)
String
bq
);
List
<
TbXwJjcjxx
>
selectJqRlt
(
TbXwJjcjxxParm
tbXwJjcjxxParm
);
List
<
TbXwJjcjxxDetail
>
queryJqDetail
(
TbXwJjcjxxParm
tbXwJjcjxxParm
);
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsResultMapper.xml
View file @
c3a8d0d6
...
...
@@ -19,6 +19,7 @@
r.address as address,
r.count as count,
r.bsobjectvaluetype as bsobjectvaluetype,
r.tpflag as tpFlag,
p.xm as xm,
p.mz as mz,
p.img as img,
...
...
@@ -67,6 +68,7 @@
DATE_FORMAT(r.time,'%Y-%m-%d %H:%i:%S') as time,
r.deviceid as deviceId,
r.bsobjectvaluetype as bsobjectvaluetype,
r.tpflag as tpFlag,
(select point.deviceName from sk_pointlocation point where point.deviceid = r.deviceid) as deviceName,
p.xm as xm,
p.mz as mz,
...
...
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsTaskMapper.xml
View file @
c3a8d0d6
<?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.SkRegionalsTaskMapper"
>
<!-- 任务查询条件 -->
<sql
id =
"taskquery_where_sql"
>
and (taskCaseId != 'test'or taskCaseId IS NULL)
and a.fsridentity = #{fsridentity}
<if
test=
"taskname != null and taskname != ''"
>
and a.taskName like concat('%', #{taskname , jdbcType=VARCHAR }, '%')
</if>
<if
test=
"tasktypeList!=null"
>
and a.taskType in
<foreach
item=
"item"
index=
"index"
collection=
"tasktypeList"
open=
"("
separator=
","
close=
" )"
>
#{item}
</foreach>
</if>
<if
test=
"kssj!= null and kssj!=''"
>
AND a.fssj
<![CDATA[>=]]>
DATE_FORMAT(#{kssj},'%Y-%m-%d %H:%i:%S')
</if>
<if
test=
"jssj!= null and jssj!=''"
>
AND a.fssj
<![CDATA[<=]]>
DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%S')
</if>
<if
test=
"state == 1"
>
AND (a.state = '1' or a.state = '2')
</if>
<if
test=
"state == 2"
>
AND a.state = '3'
</if>
<if
test=
"state == 3"
>
AND (a.state = '1' or a.state = '2' or a.state = '3')
</if>
<if
test=
"taskId != null and taskId != ''"
>
AND a.taskId = #{taskId , jdbcType=VARCHAR }
</if>
</sql>
<!--发送任务 保存-->
<insert
id=
"saveRegTask"
parameterType=
"com.founder.commonutils.model.vo.param.RegionalsTaskParams"
>
INSERT INTO sk_regionals_task (
...
...
@@ -98,35 +130,9 @@ SELECT
( SELECT count(*) FROM sk_regionals_result t WHERE t.taskId = a.taskId)end AS resultCount
FROM
sk_regionals_task a
WHERE isDeleted = '0' and (taskCaseId != 'test'or taskCaseId IS NULL)
<if
test=
"taskname != null and taskname != ''"
>
and a.taskName like concat('%', #{taskname , jdbcType=VARCHAR }, '%')
</if>
<if
test=
"tasktypeList!=null"
>
and a.taskType in
<foreach
item=
"item"
index=
"index"
collection=
"tasktypeList"
open=
"("
separator=
","
close=
" )"
>
#{item}
</foreach>
</if>
<if
test=
"kssj!= null and kssj!=''"
>
AND a.fssj
<![CDATA[>=]]>
DATE_FORMAT(#{kssj},'%Y-%m-%d %H:%i:%S')
</if>
<if
test=
"jssj!= null and jssj!=''"
>
AND a.fssj
<![CDATA[<=]]>
DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%S')
</if>
<if
test=
"state == 1"
>
AND (a.state = '1' or a.state = '2')
</if>
<if
test=
"state == 2"
>
AND a.state = '3'
</if>
<if
test=
"state == 3"
>
AND (a.state = '1' or a.state = '2' or a.state = '3')
</if>
<if
test=
"taskId != null and taskId != ''"
>
AND a.taskId = #{taskId , jdbcType=VARCHAR }
</if>
ORDER BY
WHERE isDeleted = '0'
<include
refid =
"taskquery_where_sql"
/>
ORDER BY
fssj DESC
LIMIT #{page},#{pageSize}
</select>
...
...
@@ -136,34 +142,8 @@ ORDER BY
count(*)
FROM
sk_regionals_task a
WHERE isDeleted = '0' and (taskCaseId != 'test'or taskCaseId IS NULL)
<if
test=
"taskname != null and taskname != ''"
>
and a.taskName like concat('%', #{taskname , jdbcType=VARCHAR }, '%')
</if>
<if
test=
"tasktypeList!=null"
>
and a.taskType in
<foreach
item=
"item"
index=
"index"
collection=
"tasktypeList"
open=
"("
separator=
","
close=
" )"
>
#{item}
</foreach>
</if>
<if
test=
"kssj!= null and kssj!=''"
>
AND a.fssj
<![CDATA[>=]]>
DATE_FORMAT(#{kssj},'%Y-%m-%d %H:%i:%S')
</if>
<if
test=
"jssj!= null and jssj!=''"
>
AND a.fssj
<![CDATA[<=]]>
DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%S')
</if>
<if
test=
"state == 1"
>
AND (a.state = '1' or a.state = '2')
</if>
<if
test=
"state == 2"
>
AND a.state = '3'
</if>
<if
test=
"state == 3"
>
AND (a.state = '1' or a.state = '2' or a.state = '3')
</if>
<if
test=
"taskId != null and taskId != ''"
>
AND a.taskId = #{taskId , jdbcType=VARCHAR }
</if>
WHERE isDeleted = '0'
<include
refid =
"taskquery_where_sql"
/>
</select>
<!--根据任务id查询区域信息-->
<select
id=
"queryRegionalsList"
parameterType=
"String"
resultType=
"com.founder.commonutils.model.vo.param.RegionalsParam"
>
...
...
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/TbStAsjMapper.xml
View file @
c3a8d0d6
...
...
@@ -556,4 +556,69 @@
</if>
</select>
<select
id=
"selectJqRlt"
parameterType=
"com.founder.commonutils.model.vo.param.TbXwJjcjxxParm"
resultType=
"com.founder.commonutils.model.asjEntity.TbXwJjcjxx"
>
select jq.jjbh
,jq.asjbh
,jq.jqmc
,date_format(jq.jjsj,'%Y-%m-%d %H:%i:%S') as jjsj
,jjdw_gajgmc as jjdwGajgmc
,bar_cyzj_zjhm as barCyzjZjhm
,jq.bar_xm as barXm
,jq.bar_zz as barZz
,date_format(jq.basj,'%Y-%m-%d %H:%i:%S') as basj
,asj.ASJFSDD_DQJD as x
,asj.ASJFSDD_DQWD as y
,jq.fadd_dzmc as faddDzmc
from tb_xw_jjcjxx jq, tb_st_asj asj
where jq.asjbh=asj.asjbh
and jq.xxsc_pdbz='0' and asj.xxsc_pdbz='0'
<if
test=
"startLng!=null and startLng!='' and endLng!=null and endLng!='' and startLat!=null and startLat!='' and endLat!=null and endLat!=''"
>
AND asj.ASJFSDD_DQJD BETWEEN #{startLng,jdbcType=VARCHAR} AND #{endLng,jdbcType=VARCHAR}
AND asj.ASJFSDD_DQWD BETWEEN #{startLat,jdbcType=VARCHAR} AND #{endLat,jdbcType=VARCHAR}
</if>
<if
test=
"ajlbdm!= null and ajlbdm!=''"
>
AND asj.AJLBDM like concat(#{ajlbdm , jdbcType=VARCHAR }, '%')
</if>
<if
test=
"kssj!= null and kssj!=''"
>
AND jq.jjsj
<![CDATA[>=]]>
DATE_FORMAT(#{kssj},'%Y-%m-%d %H:%i:%s')
</if>
<if
test=
"jssj!= null and jssj!=''"
>
AND jq.jjsj
<![CDATA[<=]]>
DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%s')
</if>
<if
test=
"jjbh!= null and jjbh!=''"
>
AND jq.jjbh= #{ jjbh , jdbcType=VARCHAR }
</if>
<if
test=
"jjdwGajgjgdm!= null and jjdwGajgjgdm!=''"
>
and jq.jjdw_gajgjgdm in (SELECT code FROM sys_dictitem_xz
WHERE CODE_LEV1=#{jjdwGajgjgdm, jdbcType=VARCHAR}
or CODE_LEV2 =#{jjdwGajgjgdm, jdbcType=VARCHAR} or CODE_LEV3 =#{jjdwGajgjgdm, jdbcType=VARCHAR}
or CODE_LEV4 =#{jjdwGajgjgdm, jdbcType=VARCHAR} or CODE_LEV5 =#{jjdwGajgjgdm, jdbcType=VARCHAR}
)
</if>
<if
test=
"jqmc!= null and jqmc!=''"
>
AND jq.jqmc like concat('%', #{jqmc , jdbcType=VARCHAR }, '%')
</if>
<if
test=
"jyaq!= null and jyaq!=''"
>
AND jq.jyaq LIKE concat('%', #{jyaq , jdbcType=VARCHAR }, '%')
</if>
</select>
<select
id=
"queryJqDetail"
parameterType=
"com.founder.commonutils.model.vo.param.TbXwJjcjxxParm"
resultType=
"com.founder.commonutils.model.asjEntity.TbXwJjcjxxDetail"
>
select jq.jjbh
,jq.jqmc
,jq.jyaq
,jq.asjbh
,jjdw_gajgmc as jjdwGajgmc
,bar_cyzj_zjhm as barCyzjZjhm
,date_format(jq.jjsj,'%Y-%m-%d %H:%i:%S') as jjsj
,jq.bar_xm as barXm
,jq.bar_zz as barZz
,date_format(jq.basj,'%Y-%m-%d %H:%i:%S') as basj
,date_format(jq.cjsj,'%Y-%m-%d %H:%i:%S') as cjsj
,jq.fadd_dzmc as faddDzmc
,jq.clyj
from tb_xw_jjcjxx jq
where
jq.xxsc_pdbz='0'
AND jq.jjbh= #{jjbh}
</select>
</mapper>
service/publicapi/src/main/java/com/founder/publicapi/service/TbStAsjService.java
View file @
c3a8d0d6
package
com
.
founder
.
publicapi
.
service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.founder.commonutils.model.asjEntity.CbxszAndXlaj
;
import
com.founder.commonutils.model.asjEntity.TbAsjJwdInfo
;
import
com.founder.commonutils.model.asjEntity.TbStAsj
;
import
com.founder.commonutils.model.asjEntity.TbStAsjResult
;
import
com.founder.commonutils.model.asjEntity.*
;
import
com.founder.commonutils.model.newPublicEntity.MapRestResult
;
import
com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoOrMediaResult
;
import
com.founder.commonutils.model.newPublicEntity.SysUser
;
...
...
@@ -12,6 +9,7 @@ import com.founder.commonutils.model.newPublicEntity.ZdryResult;
import
com.founder.commonutils.model.newPublicEntity.jwdjyEntity.TbAsjJwdinfo
;
import
com.founder.commonutils.model.vo.param.SkPointlocationParams
;
import
com.founder.commonutils.model.vo.param.TbStAsjParm
;
import
com.founder.commonutils.model.vo.param.TbXwJjcjxxParm
;
import
com.founder.commonutils.model.vo.param.ZdryParams
;
import
java.util.List
;
...
...
@@ -60,4 +58,8 @@ public interface TbStAsjService extends IService<TbStAsj> {
List
<
PhotoOrMediaResult
>
getVideoByAsjbh
(
String
asjbh
);
List
<
PhotoOrMediaResult
>
getPhotoByAsjbh
(
String
asjbh
);
List
<
TbXwJjcjxx
>
selectJqRlt
(
TbXwJjcjxxParm
tbXwJjcjxxParm
);
List
<
TbXwJjcjxxDetail
>
queryJqDetail
(
TbXwJjcjxxParm
tbXwJjcjxxParm
);
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/TbStAsjServiceImpl.java
View file @
c3a8d0d6
...
...
@@ -3,15 +3,13 @@ package com.founder.publicapi.service.serviceimpl;
import
com.alibaba.fastjson.JSONArray
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.founder.commonutils.model.asjEntity.CbxszAndXlaj
;
import
com.founder.commonutils.model.asjEntity.TbAsjJwdInfo
;
import
com.founder.commonutils.model.asjEntity.TbStAsj
;
import
com.founder.commonutils.model.asjEntity.TbStAsjResult
;
import
com.founder.commonutils.model.asjEntity.*
;
import
com.founder.commonutils.model.newPublicEntity.*
;
import
com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoOrMediaResult
;
import
com.founder.commonutils.model.newPublicEntity.jwdjyEntity.TbAsjJwdinfo
;
import
com.founder.commonutils.model.vo.param.SkPointlocationParams
;
import
com.founder.commonutils.model.vo.param.TbStAsjParm
;
import
com.founder.commonutils.model.vo.param.TbXwJjcjxxParm
;
import
com.founder.commonutils.model.vo.param.ZdryParams
;
import
com.founder.commonutils.util.DwUtilCommon
;
import
com.founder.commonutils.util.StringUtil
;
...
...
@@ -604,4 +602,26 @@ public class TbStAsjServiceImpl extends ServiceImpl<TbStAsjMapper, TbStAsj> impl
}
return
bqAj
;
}
@Override
public
List
<
TbXwJjcjxx
>
selectJqRlt
(
TbXwJjcjxxParm
tbXwJjcjxxParm
)
{
// 案件类别代码模糊查询
if
(
StringUtils
.
isNotEmpty
(
tbXwJjcjxxParm
.
getAjlbdm
()))
{
// 根据规则截取前三位
String
ajlbdm
=
""
;
if
(
tbXwJjcjxxParm
.
getAjlbdm
().
endsWith
(
"000"
))
{
ajlbdm
=
tbXwJjcjxxParm
.
getAjlbdm
().
substring
(
0
,
3
)
+
"*"
;
}
else
{
ajlbdm
=
tbXwJjcjxxParm
.
getAjlbdm
();
}
tbXwJjcjxxParm
.
setAjlbdm
(
ajlbdm
);
}
return
tbStAsjMapper
.
selectJqRlt
(
tbXwJjcjxxParm
);
}
@Override
public
List
<
TbXwJjcjxxDetail
>
queryJqDetail
(
TbXwJjcjxxParm
tbXwJjcjxxParm
)
{
return
tbStAsjMapper
.
queryJqDetail
(
tbXwJjcjxxParm
);
}
}
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