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
e8bd3b15
Commit
e8bd3b15
authored
Jun 10, 2022
by
yangyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
任务相关对接接口
parent
60250353
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
39 additions
and
42 deletions
+39
-42
common/common_utils/src/main/java/com/founder/commonutils/model/vo/param/TbStAsjParm.java
+2
-1
common/common_utils/src/main/java/com/founder/commonutils/util/JwtUser.java
+1
-1
common/common_utils/src/main/java/com/founder/commonutils/util/PhoneUtil.java
+3
-2
common/pom.xml
+0
-9
common/service_base/src/main/java/com/founder/servicebase/controller/SkDictionaryController.java
+1
-1
service/pom.xml
+1
-9
service/publicapi/pom.xml
+1
-1
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsPersonController.java
+4
-2
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsResultController.java
+2
-2
service/publicapi/src/main/java/com/founder/publicapi/controller/SkInterface/RyxxQgInterface.java
+10
-8
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/SysDictitemMapper.java
+2
-0
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsTaskMapper.xml
+6
-3
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/TbStAsjMapper.xml
+3
-0
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkRegionalsResultServiceImpl.java
+3
-3
No files found.
common/common_utils/src/main/java/com/founder/commonutils/model/vo/param/TbStAsjParm.java
View file @
e8bd3b15
...
...
@@ -83,5 +83,6 @@ public class TbStAsjParm implements Serializable {
@ApiModelProperty
(
value
=
"破案标记"
)
private
String
pabj_pdbz
;
@ApiModelProperty
(
value
=
"立案单位公安机关代码"
)
private
String
ladwGajgjgdm
;
}
common/common_utils/src/main/java/com/founder/commonutils/util/JwtUser.java
View file @
e8bd3b15
...
...
@@ -29,7 +29,7 @@ import java.util.Map;
public
class
JwtUser
{
// @Value("${jwt.secret}")
public
String
base64Security
=
"bWFwLXBsYXRmb3JtLWRvbmdndWFuLTIwMTktMTEtNg=="
;
final
static
long
ttlMillis
=
1000
*
60
*
60
;
//过期时间,30分钟
final
static
long
ttlMillis
=
1000
*
60
*
60
*
24
;
//过期时间,24小时
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
JwtUser
.
class
);
/**
* 创建jwt
...
...
common/common_utils/src/main/java/com/founder/commonutils/util/PhoneUtil.java
View file @
e8bd3b15
...
...
@@ -123,7 +123,7 @@ public class PhoneUtil {
public
static
void
main
(
String
[]
main
){
System
.
out
.
println
(
getCarrier
(
"1
5754879533
"
,
"86"
));
System
.
out
.
println
(
getGeo
(
"1
5754879533
"
,
"86"
));
System
.
out
.
println
(
getCarrier
(
"1
3900733224
"
,
"86"
));
System
.
out
.
println
(
getGeo
(
"1
3900733224
"
,
"86"
));
}
}
\ No newline at end of file
common/pom.xml
View file @
e8bd3b15
...
...
@@ -49,15 +49,6 @@
<scope>
provided
</scope>
</dependency>
<!-- <!–swagger–>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>-->
<dependency>
<groupId>
com.github.xiaoymin
</groupId>
<artifactId>
knife4j-spring-boot-starter
</artifactId>
...
...
common/service_base/src/main/java/com/founder/servicebase/controller/SkDictionaryController.java
View file @
e8bd3b15
...
...
@@ -146,7 +146,7 @@ public class SkDictionaryController implements ExcelControllerInterface {
@OperLog
(
message
=
"查找所有代码类型"
,
operation
=
OperationType
.
QUERY
)
public
MapRestResult
queryAllDmlx
(){
QueryWrapper
queryWrapper
=
new
QueryWrapper
();
queryWrapper
.
groupBy
(
"dmlx"
);
queryWrapper
.
groupBy
(
"dmlx"
,
"dmms"
);
queryWrapper
.
eq
(
"isDeleted"
,
"0"
);
queryWrapper
.
select
(
"dmlx"
,
"dmms"
);
...
...
service/pom.xml
View file @
e8bd3b15
...
...
@@ -111,15 +111,7 @@
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-aop
</artifactId>
</dependency>
<!--swagger-->
<!-- <dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>-->
<!--swagger升级版本-->
<dependency>
<groupId>
com.github.xiaoymin
</groupId>
<artifactId>
knife4j-spring-boot-starter
</artifactId>
...
...
service/publicapi/pom.xml
View file @
e8bd3b15
...
...
@@ -11,7 +11,7 @@
<artifactId>
publicapi
</artifactId>
<build>
<finalName>
publicapi
</finalName>
<finalName>
publicapi
1003
</finalName>
<!--添加标签,防止编译时excel损坏-->
<resources>
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsPersonController.java
View file @
e8bd3b15
...
...
@@ -42,6 +42,8 @@ public class SkRegionalsPersonController extends ApiController implements ExcelC
*/
@Resource
private
SkRegionalsPersonService
skRegionalsPersonService
;
@Resource
private
RyxxQgInterface
ryxxQgInterface
;
@Value
(
"${environment}"
)
private
String
environment
;
/**
...
...
@@ -54,7 +56,7 @@ public class SkRegionalsPersonController extends ApiController implements ExcelC
SkRegionalsPerson
skRegionalsPerson
=
new
SkRegionalsPerson
();
BeanUtils
.
copyProperties
(
param
,
skRegionalsPerson
);
if
(
img
!=
null
){
skRegionalsPerson
.
setImg
(
Base64Util
.
getBase64
(
img
));
skRegionalsPerson
.
setImg
(
"data:image/jpg;base64,"
+
Base64Util
.
getBase64
(
img
));
}
skRegionalsPerson
.
setXxzjbh
(
KeyUtil
.
getUUIDKey
(
"RY"
));
boolean
save
=
skRegionalsPersonService
.
save
(
skRegionalsPerson
);
...
...
@@ -141,7 +143,7 @@ public class SkRegionalsPersonController extends ApiController implements ExcelC
IPage
page1
=
skRegionalsPersonService
.
page
(
page
,
queryWrapper
);
return
new
MapRestResult
(
200
,
"OK"
,
page1
.
getTotal
(),
page1
.
getRecords
());
}
return
R
yxxQgInterface
.
getQgckAllxxXml
(
skRegionalsDetailParam
.
getSfzhm
());
return
r
yxxQgInterface
.
getQgckAllxxXml
(
skRegionalsDetailParam
.
getSfzhm
());
}
@Override
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsResultController.java
View file @
e8bd3b15
...
...
@@ -451,7 +451,7 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
// 翻译表入库(根据结果中的车牌号或者手机号等拿到人员证件号码入库)
skRegionalsDetail
.
setXxzjbh
(
KeyUtil
.
getUUIDKey
(
"FY"
));
skRegionalsDetail
.
setResultid
(
xxzjbh
);
// 翻译表
skRegionalsDetail
.
setSfzhm
(
"4
60003198912096617
"
);
// 证件号码
skRegionalsDetail
.
setSfzhm
(
"4
30123196510265891
"
);
// 证件号码
skRegionalsDetail
.
setObjecttype
(
p
.
getObjecttype
());
// 类型
skRegionalsDetail
.
setObjecttypename
(
p
.
getObjecttypename
());
// 类型名称
skRegionalsDetail
.
setObjectvalue
(
p
.
getObjectvalue
());
// 标识号值
...
...
@@ -465,7 +465,7 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
if
(!
"skhs_rx"
.
equals
(
p
.
getObjecttype
())&&!
"qypz_rx"
.
equals
(
p
.
getObjecttype
())||!
"skph_rx"
.
equals
(
p
.
getObjecttype
())){
// 先查看身份证对应人信息是否已存在
SkRegionalsPerson
skRegionalsPerson
=
new
SkRegionalsPerson
();
skRegionalsPerson
.
setSfzhm
(
"4
60003198912096617
"
);
// 证件号码
skRegionalsPerson
.
setSfzhm
(
"4
30123196510265891
"
);
// 证件号码
skRegionalsPerson
.
setSfcheck
(
"1"
);
// 是否翻译成功
skRegionalsPerson
.
setSffzxyr
(
String
.
valueOf
(
tbStAsjMapper
.
getQkryBySfzh
(
skRegionalsPerson
.
getSfzhm
())));
// 是否犯罪嫌疑人
QueryWrapper
queryWrapper
=
new
QueryWrapper
();
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/SkInterface/RyxxQgInterface.java
View file @
e8bd3b15
...
...
@@ -10,9 +10,10 @@ import org.dom4j.Document;
import
org.dom4j.DocumentHelper
;
import
org.dom4j.Element
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
...
...
@@ -20,16 +21,16 @@ import java.util.List;
* 全国人员常口接口
*
*/
@Api
(
description
=
"全国人员常口接口"
)
@RequestMapping
(
value
=
"/ryxxqgIntegerface"
)
@Service
public
class
RyxxQgInterface
{
@Autowired
private
static
SysDictitemMapper
sysDictitemMapper
;
private
SysDictitemMapper
sysDictitemMapper
;
@ApiOperation
(
value
=
"获取全国常住人口信息"
)
@PostMapping
(
"/ryxxQg"
)
public
static
MapRestResult
getQgckAllxxXml
(
String
zjhm
){
public
MapRestResult
getQgckAllxxXml
(
String
zjhm
){
List
<
SkRegionalsPerson
>
listSkRegionalsPerson
=
new
ArrayList
<>();
SkRegionalsPerson
ryxx
=
new
SkRegionalsPerson
();
String
esbServiceReturn
=
""
;
//String url="http://10.100.17.115:8080/NmgEsbQueryService/QueryLocalPersonForOther?conditions=sfzh="+"'"+zjhm+"'";
...
...
@@ -41,11 +42,12 @@ public class RyxxQgInterface {
return
MapRestResult
.
error
(
"失败"
+
e
);
}
ryxx
=
getryJbxxxmls
(
esbServiceReturn
);
return
MapRestResult
.
build
(
200
,
"成功获取全国常口人员信息"
,
ryxx
);
listSkRegionalsPerson
.
add
(
ryxx
);
return
MapRestResult
.
build
(
200
,
"OK"
,
listSkRegionalsPerson
.
size
(),
listSkRegionalsPerson
);
}
public
static
SkRegionalsPerson
getryJbxxxmls
(
String
esb_result
){
public
SkRegionalsPerson
getryJbxxxmls
(
String
esb_result
){
SkRegionalsPerson
resulryxx
=
new
SkRegionalsPerson
();
/* esb_result = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"+
"<RBSPMessage>"+
...
...
@@ -150,7 +152,7 @@ public class RyxxQgInterface {
for
(
int
i
=
0
;
i
<
element
.
size
();
i
++){
zp64bite
=
element
.
get
(
3
).
getTextTrim
();
}
resulryxx
.
setImg
(
zp64bite
);
// 人员照片
resulryxx
.
setImg
(
"data:image/jpg;base64,"
+
zp64bite
);
// 人员照片
resulryxx
.
setXm
(
XM
);
// 姓名
// 民族转为汉字
codeMap
.
put
(
"groupid"
,
"CODE_MZ"
);
...
...
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/SysDictitemMapper.java
View file @
e8bd3b15
...
...
@@ -2,10 +2,12 @@ package com.founder.publicapi.mapper.mysqlMapper;
import
org.apache.ibatis.annotations.Mapper
;
import
org.springframework.stereotype.Component
;
import
java.util.Map
;
@Mapper
@Component
public
interface
SysDictitemMapper
{
String
getNameByCode
(
Map
<
String
,
String
>
map
);
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsTaskMapper.xml
View file @
e8bd3b15
...
...
@@ -86,10 +86,13 @@ SELECT
a.fsrxm,
a.fssj,
a.isdeleted,
( SELECT count(*) FROM sk_regionals_result t WHERE t.taskId = a.taskId) AS resultCount
CASE WHEN tasktype like CONCAT('skph_','%') then
(SELECT count(distinct(t.objectValue)) FROM sk_regionals_result t WHERE t.taskId = a.taskId)
ELSE
( 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'
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>
...
...
@@ -112,7 +115,7 @@ ORDER BY
count(*)
FROM
sk_regionals_task a
WHERE isDeleted = '0' and
taskCaseId != 'test'
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>
...
...
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/TbStAsjMapper.xml
View file @
e8bd3b15
...
...
@@ -105,6 +105,9 @@
<if
test=
"pabj_pdbz != null and pabj_pdbz == '0'"
>
and ZCJDDM not in ('0600','0700','0800')
</if>
<if
test=
"ladwGajgjgdm!= null and ladwGajgjgdm!=''"
>
AND T.ladw_Gajgjgdm = #{ladwGajgjgdm , jdbcType=VARCHAR }
</if>
</sql>
<select
id=
"getXszajbhByAsjbh"
parameterType=
"java.lang.String"
resultType=
"String"
>
select
...
...
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkRegionalsResultServiceImpl.java
View file @
e8bd3b15
...
...
@@ -460,9 +460,9 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
SkRegionalsResultSaveParam
skRegionalsResultSaveParam
=
new
SkRegionalsResultSaveParam
();
skRegionalsResultSaveParam
.
setObjectvalue
(
p
.
getDeviceId
());
// 标识号
skRegionalsResultSaveParam
.
setTime
(
createRandomDate
(
LocalDateTime
.
parse
(
sf
.
format
(
p
.
getStartTime
()),
formatter
),
LocalDateTime
.
parse
(
sf
.
format
(
p
.
getEndTime
()),
formatter
)));
// 时间在开始时间和结束时间期间取一个
Random
random
=
new
Random
(
);
String
lx
=
random
.
nextBoolean
()?
"离开区域"
:
"进入区域"
;
skRegionalsResultSaveParam
.
set
Address
(
lx
);
skRegionalsResultSaveParam
.
setAddress
(
"进入区域"
);
skRegionalsResultSaveParam
.
setX
(
p
.
getX
())
;
skRegionalsResultSaveParam
.
set
Y
(
p
.
getY
()
);
listResult
.
add
(
skRegionalsResultSaveParam
);
});
return
listResult
;
...
...
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