Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xzxt-app-report
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
Administrator
xzxt-app-report
Commits
2c6d99b4
Commit
2c6d99b4
authored
Mar 07, 2023
by
lilei
Browse files
Options
Browse Files
Download
Plain Diff
master合并到湖南分支
parents
e0adcf91
21ac0eb4
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
618 additions
and
134 deletions
+618
-134
src/main/java/org/springblade/core/secure/AuthInfo.java
+6
-0
src/main/java/org/springblade/founder/asj/entity/AsjResult.java
+161
-0
src/main/java/org/springblade/founder/asj/service/QgAsjQueryService.java
+77
-90
src/main/java/org/springblade/founder/redis/controller/DictitemController.java
+2
-0
src/main/java/org/springblade/founder/redis/mapper/DictitemMapper.xml
+1
-1
src/main/java/org/springblade/founder/utils/QgryHjUtils.java
+119
-0
src/main/java/org/springblade/founder/utils/QgryckUtils.java
+63
-14
src/main/java/org/springblade/founder/ydjwhc/controller/ZbxxjsController.java
+1
-1
src/main/java/org/springblade/founder/ydjwhc/thread/TimeControl2.java
+12
-6
src/main/java/org/springblade/modules/auth/controller/AuthController.java
+26
-0
src/main/java/org/springblade/modules/auth/granter/CaptchaTokenGranter.java
+1
-1
src/main/java/org/springblade/modules/auth/granter/PasswordTokenGranter.java
+4
-1
src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
+10
-0
src/main/java/org/springblade/modules/system/entity/SysNewUser.java
+2
-0
src/main/java/org/springblade/modules/system/mapper/SysUserMapper.java
+1
-0
src/main/java/org/springblade/modules/system/mapper/SysUserMapper.xml
+46
-1
src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+1
-0
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+48
-1
src/main/java/org/springblade/modules/system/service/IUserService.java
+1
-1
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+19
-12
src/main/resources/application-dev.yml
+16
-5
src/main/resources/application.yml
+1
-0
No files found.
src/main/java/org/springblade/core/secure/AuthInfo.java
View file @
2c6d99b4
...
...
@@ -63,4 +63,10 @@ public class AuthInfo {
@ApiModelProperty
(
value
=
"ip"
)
@TableField
(
exist
=
false
)
private
String
ip
;
@ApiModelProperty
(
value
=
"是否超时"
)
@TableField
(
exist
=
false
)
private
String
isCs
;
@ApiModelProperty
(
value
=
"是否初始密码"
)
@TableField
(
exist
=
false
)
private
String
isCsmm
;
}
src/main/java/org/springblade/founder/asj/entity/AsjResult.java
0 → 100644
View file @
2c6d99b4
package
org
.
springblade
.
founder
.
asj
.
entity
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
/**
* 案件基本信息
*
* @author szLi
* @date 2022/4/13
*/
@Data
@ApiModel
(
value
=
"案事件基本信息"
)
public
class
AsjResult
{
@ApiModelProperty
(
value
=
"案件编号"
)
private
String
asjbh
;
@ApiModelProperty
(
value
=
"案件名称"
)
private
String
ajmc
;
@ApiModelProperty
(
value
=
"案件类别代码"
)
private
String
ajlbdm
;
private
String
ajlbdmStr
;
@ApiModelProperty
(
value
=
"小案类别"
)
private
String
zatzJyqk
;
private
String
zatzJyqkStr
;
@ApiModelProperty
(
value
=
"细案类别"
)
private
String
ajxlb
;
private
String
ajxlbStr
;
@ApiModelProperty
(
value
=
"简要案情"
)
private
String
jyaq
;
@ApiModelProperty
(
value
=
"案发时间"
)
private
String
afsj
;
@ApiModelProperty
(
value
=
"案发时间开始时间"
)
private
String
afsjKssj
;
@ApiModelProperty
(
value
=
"案发时间结束时间"
)
private
String
afsjJssj
;
@ApiModelProperty
(
value
=
"案发地区划"
)
private
String
afdXzqhdm
;
private
String
afdXzqhdmStr
;
@ApiModelProperty
(
value
=
"案发地区划省份:分组使用"
)
private
String
afdXzqhdmSf
;
private
String
afdXzqhdmSfStr
;
@ApiModelProperty
(
value
=
"案发地区划地市:分组使用"
)
private
String
afdXzqhdmDs
;
private
String
afdXzqhdmDsStr
;
@ApiModelProperty
(
value
=
"案发地地址名称"
)
private
String
afddDzmc
;
@ApiModelProperty
(
value
=
"案发地详址"
)
private
String
afdDzmc
;
@ApiModelProperty
(
value
=
"案发地地域类别"
)
private
String
afdDylbdm
;
private
String
afdDylbdmStr
;
@ApiModelProperty
(
value
=
"立案单位"
)
private
String
ladwdm
;
private
String
ladwdmStr
;
@ApiModelProperty
(
value
=
"立案日期"
)
private
String
larq
;
@ApiModelProperty
(
value
=
"受理时间"
)
private
String
slsj
;
@ApiModelProperty
(
value
=
"侦查阶段"
)
private
String
zcjddm
;
private
String
zcjddmStr
;
@ApiModelProperty
(
value
=
"接警编号"
)
private
String
jjbh
;
@ApiModelProperty
(
value
=
"现场勘验编号"
)
private
String
xckybh
;
@ApiModelProperty
(
value
=
"侦查终结时间"
)
private
String
zczjsj
;
@ApiModelProperty
(
value
=
"侦查终结单位代码"
)
private
String
zczjDwdm
;
private
String
zczjDwdmStr
;
@ApiModelProperty
(
value
=
"协办人"
)
private
String
xbrXm
;
private
String
xbrZjhm
;
private
String
xbrLxdh
;
@ApiModelProperty
(
value
=
"主办人"
)
private
String
zbrXm
;
private
String
zbrZjhm
;
private
String
zbrLxdh
;
private
String
zbdwdm
;
private
String
zbdwdmStr
;
@ApiModelProperty
(
value
=
"损失价值(人民币元)"
)
private
String
ssjzrmby
;
@ApiModelProperty
(
value
=
"案事件发生地点_经度"
)
private
String
afdDqjd
;
@ApiModelProperty
(
value
=
"案事件发生地点_纬度"
)
private
String
afdDqwd
;
@ApiModelProperty
(
value
=
"现勘经度"
)
private
String
xkJd
;
@ApiModelProperty
(
value
=
"现勘纬度"
)
private
String
xkWd
;
@ApiModelProperty
(
value
=
"警情经度"
)
private
String
jqJd
;
@ApiModelProperty
(
value
=
"警情纬度"
)
private
String
jqWd
;
@ApiModelProperty
(
value
=
"校验经度"
)
private
String
jyJd
;
@ApiModelProperty
(
value
=
"校验纬度"
)
private
String
jyWd
;
@ApiModelProperty
(
value
=
"到案状态"
)
private
String
xyrDaztdmStr
;
@ApiModelProperty
(
value
=
"抓获日期"
)
private
String
zhrq
;
@ApiModelProperty
(
value
=
"抓获单位"
)
private
String
zhdwdmStr
;
@ApiModelProperty
(
value
=
"查询号码"
)
private
String
source
;
@ApiModelProperty
(
value
=
"案件分类 2-电诈;3-传统盗抢骗;4-其他"
)
private
String
ajfl
;
@ApiModelProperty
(
value
=
"破案状态,0-未破;1-已破"
)
private
String
pazt
;
@ApiModelProperty
(
value
=
"现场照片数量"
)
private
int
xctpCount
;
@ApiModelProperty
(
value
=
"信息登记时间"
)
private
String
djsj
;
@ApiModelProperty
(
value
=
"信息登记人员_姓名"
)
private
String
xxdjryXm
;
@ApiModelProperty
(
value
=
"信息操作单位_公安机关机构代码"
)
private
String
xxdjdwGajgjgdm
;
private
String
xxdjdwGajgjgdmStr
;
}
src/main/java/org/springblade/founder/asj/service/QgAsjQueryService.java
View file @
2c6d99b4
...
...
@@ -10,7 +10,11 @@ import org.apache.http.entity.StringEntity;
import
org.apache.http.impl.client.CloseableHttpClient
;
import
org.apache.http.impl.client.HttpClients
;
import
org.apache.http.util.EntityUtils
;
import
org.springblade.founder.asj.entity.AsjResult
;
import
org.springblade.founder.asj.entity.TbXszCbypQgaj
;
import
org.springblade.founder.utils.HttpUtils
;
import
org.springblade.founder.utils.QgryHjUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Service
;
...
...
@@ -18,114 +22,97 @@ import java.util.ArrayList;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.concurrent.TimeUnit
;
@Service
public
class
QgAsjQueryService
{
@Value
(
"${ssdw}"
)
private
String
ssdw
;
@Value
(
"${grade}"
)
private
String
grade
;
@Value
(
"${zhyyPath}"
)
private
String
zhyyPath
;
@Value
(
"${QGAsjApiUrl}"
)
private
String
QGAsjApiUrl
;
public
List
<
TbXszCbypQgaj
>
getQgAsjByBsh
(
String
bsh
)
{
List
tbStAsjQGList
=
null
;
try
{
String
os
=
"['{\"JYAQ\":\"%"
+
bsh
+
"%\",\"XXSC_PDBZ\":\"0\"}']"
;
Map
<
Object
,
Object
>
param
=
new
HashMap
<>();
param
.
put
(
"zylx"
,
"asj"
);
param
.
put
(
"os"
,
os
);
String
url
=
zhyyPath
+
"/getGabZyInfoByJyaqMatj.action"
;
//Map map=restTemplate.postForObject(url,param,Map.class);
//dataResult=(List)map.get("dataResult");
//http链接工具
CloseableHttpClient
httpClient
=
HttpClients
.
createDefault
();
List
<
AsjResult
>
qgajList
=
getSaxxQg
(
"jyaq"
,
bsh
,
"0"
);
ArrayList
<
TbXszCbypQgaj
>
resultList
=
new
ArrayList
<>();
for
(
AsjResult
asjResult
:
qgajList
)
{
TbXszCbypQgaj
qgaj
=
new
TbXszCbypQgaj
();
BeanUtils
.
copyProperties
(
asjResult
,
qgaj
);
qgaj
.
setAsjfsddXzqhdm
(
asjResult
.
getAfdXzqhdm
());
qgaj
.
setXzqhdmSj
(
asjResult
.
getAsjbh
().
substring
(
1
,
3
)
+
"0000"
);
qgaj
.
setLadwGajgjgdm
(
asjResult
.
getLadwdm
());
qgaj
.
setLadwGajgMc
(
asjResult
.
getLadwdmStr
());
resultList
.
add
(
qgaj
);
}
return
resultList
;
}
HttpPost
httpPost
=
new
HttpPost
(
url
);
StringEntity
entity
=
new
StringEntity
(
JSONArray
.
toJSONString
(
param
));
entity
.
setContentType
(
"application/json"
);
//发送json数据需要设置contentType
entity
.
setContentEncoding
(
"utf-8"
);
httpPost
.
setEntity
(
entity
);
public
List
<
AsjResult
>
getSaxxQg
(
String
type
,
String
gjc
,
String
qsajPdbz
)
{
JSONObject
object
=
new
JSONObject
();
object
.
put
(
"type"
,
type
);
object
.
put
(
"gjc"
,
gjc
);
object
.
put
(
"page"
,
1
);
object
.
put
(
"limit"
,
1000
);
Map
<
String
,
String
>
headers
=
new
HashMap
<>();
List
<
AsjResult
>
list
=
new
ArrayList
<>();
String
resultToken
=
""
;
try
{
headers
.
put
(
"Content-Type"
,
"application/json"
);
resultToken
=
HttpUtils
.
doPostJson
(
QGAsjApiUrl
+
"/qgAsjRy/getAsjListByGjc"
,
headers
,
object
.
toJSONString
());
CloseableHttpResponse
response
=
httpClient
.
execute
(
httpPost
);
if
(
response
.
getStatusLine
().
getStatusCode
()
==
HttpStatus
.
SC_OK
)
{
String
jsonResult
=
EntityUtils
.
toString
(
response
.
getEntity
(),
"utf-8"
);
System
.
out
.
println
(
"请求部级接口返回数据======"
+
jsonResult
);
if
(
null
!=
jsonResult
&&
!
""
.
equals
(
jsonResult
)
&&
!
"null"
.
equals
(
jsonResult
))
{
JSONObject
jsonObject
=
JSONObject
.
parseObject
(
jsonResult
);
if
(
jsonObject
.
containsKey
(
"dataResult"
))
{
tbStAsjQGList
=
(
List
)
jsonObject
.
get
(
"dataResult"
);
}
if
(
StringUtils
.
isNotEmpty
(
resultToken
))
{
//解析数据
JSONObject
obj
=
JSONObject
.
parseObject
(
resultToken
);
int
status
=
obj
.
getIntValue
(
"status"
);
if
(
200
!=
status
){
return
list
;
}
}
List
<
TbXszCbypQgaj
>
tbXszCbypQgajList
=
new
ArrayList
<>();
if
(
tbStAsjQGList
!=
null
&&
tbStAsjQGList
.
size
()
>
0
)
{
for
(
Object
date
:
tbStAsjQGList
)
{
TbXszCbypQgaj
tbXszCbypQgaj
=
new
TbXszCbypQgaj
();
Map
<
String
,
String
>
map
=
(
Map
)
date
;
for
(
String
key
:
map
.
keySet
())
{
if
(
"ASJBH"
.
equals
(
key
))
{
tbXszCbypQgaj
.
setAsjbh
(
map
.
get
(
"ASJBH"
));
// 截取案件编号前两位省级
tbXszCbypQgaj
.
setXzqhdmSj
(
map
.
get
(
"ASJBH"
).
substring
(
1
,
3
)
+
"0000"
);
}
else
if
(
"AJMC"
.
equals
(
key
))
{
tbXszCbypQgaj
.
setAjmc
(
map
.
get
(
"AJMC"
));
}
else
if
(
"AJLBDM"
.
equals
(
key
))
{
tbXszCbypQgaj
.
setAjlbdm
(
map
.
get
(
"AJLBDM"
));
}
else
if
(
"ZCJDDM"
.
equals
(
key
))
{
tbXszCbypQgaj
.
setZcjddm
(
map
.
get
(
"ZCJDDM"
));
}
else
if
(
"ASJFSSJ_ASJFSKSSJ"
.
equals
(
key
))
{
String
asjfssjAsjfskssj
=
map
.
get
(
"ASJFSSJ_ASJFSKSSJ"
);
// 是否为空
if
(
null
!=
asjfssjAsjfskssj
&&
!
""
.
equals
(
asjfssjAsjfskssj
))
{
// 年月日 时分秒中间有多个空格
String
[]
arr
=
asjfssjAsjfskssj
.
split
(
"\\s+"
);
// 有时分秒
if
(
arr
.
length
>
1
)
{
String
a
=
arr
[
1
].
substring
(
0
,
8
);
String
lastTime
=
arr
[
0
]
+
" "
+
a
;
tbXszCbypQgaj
.
setAsjfssjKssj
(
lastTime
);
String
data
=
obj
.
getString
(
"data"
);
JSONObject
objdata
=
JSONObject
.
parseObject
(
data
);
int
total
=
(
int
)
objdata
.
get
(
"total"
);
if
(
total
>
0
)
{
JSONArray
array
=
objdata
.
getJSONArray
(
"rows"
);
if
(
array
.
size
()
>
0
)
{
for
(
Object
objectp
:
array
)
{
JSONObject
jsonObj
=
(
JSONObject
)
objectp
;
AsjResult
asjxx
=
JSONObject
.
toJavaObject
(
jsonObj
,
AsjResult
.
class
);
String
asjbh
=
asjxx
.
getAsjbh
();
if
(
asjbh
!=
null
){
if
(!
"1"
.
equals
(
qsajPdbz
)){
//0-不含本省案件
if
(
asjbh
.
startsWith
(
"A"
+
ssdw
.
substring
(
0
,
2
))){
continue
;
}
}
//破案状态处理
String
zcjddm
=
asjxx
.
getZcjddm
();
if
(
"0600"
.
equals
(
zcjddm
)
||
"0700"
.
equals
(
zcjddm
)
||
"0800"
.
equals
(
zcjddm
)){
asjxx
.
setPazt
(
"1"
);
}
else
{
asjxx
.
setPazt
(
"0"
);
}
// 只有年月日
else
{
tbXszCbypQgaj
.
setAsjfssjKssj
(
asjfssjAsjfskssj
);
//案发地省份处理
String
afdqh
=
asjxx
.
getAfdXzqhdm
();
String
afdqhSf
=
""
;
String
afdqhSfStr
=
""
;
if
(
StringUtils
.
isNotEmpty
(
afdqh
)){
afdqhSf
=
afdqh
.
substring
(
0
,
2
);
}
else
{
afdqhSf
=
"00"
;
afdqhSfStr
=
"空"
;
}
asjxx
.
setAfdXzqhdmSf
(
afdqhSf
);
asjxx
.
setAfdXzqhdmSfStr
(
afdqhSfStr
);
asjxx
.
setSource
(
gjc
);
list
.
add
(
asjxx
);
}
}
else
if
(
"ASJFSDD_XZQHDM"
.
equals
(
key
))
{
// 行政区划地址为空时(先截取案件编号除去(A)前六位(区级)查询案发地)
// 不为空
tbXszCbypQgaj
.
setAsjfsddXzqhdm
(
map
.
get
(
"ASJFSDD_XZQHDM"
));
}
else
if
(
"JYAQ"
.
equals
(
key
))
{
tbXszCbypQgaj
.
setJyaq
(
map
.
get
(
"JYAQ"
));
}
else
if
(
"LADW_GAJGJGDM"
.
equals
(
key
))
{
tbXszCbypQgaj
.
setLadwGajgjgdm
(
map
.
get
(
"LADW_GAJGJGDM"
));
}
else
if
(
"LADW_GAJGMC"
.
equals
(
key
))
{
tbXszCbypQgaj
.
setLadwGajgMc
(
map
.
get
(
"LADW_GAJGMC"
));
}
}
String
asjbh
=
tbXszCbypQgaj
.
getAsjbh
();
// grade 级别为1的拿外省 2的拿本市外的
if
(
"1"
.
equals
(
grade
))
{
//去除本省的案件信息
String
tempSsdw
=
ssdw
.
substring
(
0
,
2
);
if
(
StringUtils
.
isNotEmpty
(
asjbh
)
&&
!
asjbh
.
substring
(
1
,
3
).
equals
(
tempSsdw
))
{
//外省
tbXszCbypQgajList
.
add
(
tbXszCbypQgaj
);
}
}
else
{
//去除本市的案件信息
String
tempSsdw
=
ssdw
.
substring
(
0
,
4
);
if
(
StringUtils
.
isNotEmpty
(
asjbh
)
&&
!
asjbh
.
substring
(
1
,
5
).
equals
(
tempSsdw
))
{
//去除本市
tbXszCbypQgajList
.
add
(
tbXszCbypQgaj
);
}
}
}
}
return
tbXszCbypQgajList
;
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
){
e
.
printStackTrace
();
System
.
out
.
println
(
e
.
getMessage
());
}
return
null
;
return
list
;
}
}
src/main/java/org/springblade/founder/redis/controller/DictitemController.java
View file @
2c6d99b4
...
...
@@ -4,6 +4,7 @@ package org.springblade.founder.redis.controller;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.serializer.SerializerFeature
;
import
com.baomidou.dynamic.datasource.annotation.DS
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springblade.founder.redis.service.IDicItemService
;
...
...
@@ -24,6 +25,7 @@ import java.util.*;
@Controller
@Api
(
tags
=
"字典码相关接口"
)
@DS
(
"db1"
)
public
class
DictitemController
{
@Autowired
...
...
src/main/java/org/springblade/founder/redis/mapper/DictitemMapper.xml
View file @
2c6d99b4
...
...
@@ -34,7 +34,7 @@
startcode,
endcode
from sys_dictitem
where scbz =
'0'
where scbz =
0
<if
test=
"value != null"
>
and groupid=#{value, jdbcType=VARCHAR}
</if>
...
...
src/main/java/org/springblade/founder/utils/QgryHjUtils.java
0 → 100644
View file @
2c6d99b4
package
org
.
springblade
.
founder
.
utils
;
import
org.springblade.core.secure.utils.SecureUtil
;
import
org.springblade.founder.asj.entity.AsjResult
;
import
org.springblade.founder.asj.entity.TbXszCbypQgaj
;
import
org.springblade.modules.system.entity.XzxtUser
;
import
org.springframework.beans.BeanUtils
;
import
java.io.BufferedReader
;
import
java.io.IOException
;
import
java.io.InputStreamReader
;
import
java.io.OutputStream
;
import
java.net.HttpURLConnection
;
import
java.net.URL
;
import
java.net.URLEncoder
;
import
java.nio.charset.Charset
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
/**户籍服务**/
public
class
QgryHjUtils
{
public
static
String
queryHj
(
String
zjhm
,
boolean
ifLogin
){
try
{
String
postURL
=
"http://jd.zyfwzx.ln:8585/piee/endpoint/invoke"
;
URL
obj
=
new
URL
(
postURL
);
HttpURLConnection
con
=
(
HttpURLConnection
)
obj
.
openConnection
();
con
.
setRequestMethod
(
"POST"
);
con
.
setRequestProperty
(
"Content-Type"
,
"application/json;charset=UTF-8"
);
con
.
setRequestProperty
(
"x-qqfw-senderid"
,
"C00-20000627"
);
//请求方编号
con
.
setRequestProperty
(
"x-qqfw-serviceid"
,
"S10-00000298"
);
//服务方编号
con
.
setRequestProperty
(
"x-qqfw-timeout"
,
"10"
);
//单位秒,超时后返回task_id 后续获取结果0 :立即返回 -1:系统最大值
SimpleDateFormat
df
=
new
SimpleDateFormat
(
"yyyyMMddHHmmssSSS"
);
System
.
out
.
println
(
df
.
format
(
new
Date
()));
con
.
setRequestProperty
(
"x-qqfw-qqsj"
,
df
.
format
(
new
Date
()));
//请求时间,格式:yyyyMMddHHmmssSSS
if
(
ifLogin
){
XzxtUser
user
=
SecureUtil
.
getUserXzxt
();
con
.
setRequestProperty
(
"x-qqfw-qqrxm"
,
URLEncoder
.
encode
(
user
.
getRealname
()));
//仅支持中文、间隔符输入,间隔符为:“•”
con
.
setRequestProperty
(
"x-qqfw-qqrgmsfzh"
,
user
.
getIdentitycard
());
//仅支持中文、间隔符输入,间隔符为:“•”
con
.
setRequestProperty
(
"x-qqfw-qqrjgdm"
,
user
.
getUnitcode
());
//请求人机构代码。描述:最终请求人所属机构代码,符合GA/T 380-2012标准。
con
.
setRequestProperty
(
"x-qqfw-qqrjgmc"
,
URLEncoder
.
encode
(
user
.
getUnitname
()));
//请求人机构名称。描述:最终请求人所属机构名称,符合GA/T 380-2012标准。
}
else
{
con
.
setRequestProperty
(
"x-qqfw-qqrxm"
,
URLEncoder
.
encode
(
"张军"
));
//仅支持中文、间隔符输入,间隔符为:“•”
con
.
setRequestProperty
(
"x-qqfw-qqrgmsfzh"
,
"210104197711241719"
);
//仅支持中文、间隔符输入,间隔符为:“•”
con
.
setRequestProperty
(
"x-qqfw-qqrjgdm"
,
"210000010300"
);
//请求人机构代码。描述:最终请求人所属机构代码,符合GA/T 380-2012标准。
con
.
setRequestProperty
(
"x-qqfw-qqrjgmc"
,
URLEncoder
.
encode
(
"辽宁省公安厅警务指挥部科技信息化总队"
));
//请求人机构名称。描述:最终请求人所属机构名称,符合GA/T 380-2012标准。
}
con
.
setRequestProperty
(
"x-qqfw-qqywxttxdm"
,
"022"
);
//请求业务系统条线代码。描述:最终请求业务系统所属条线代码。
con
.
setRequestProperty
(
"x-qqfw-qqywxtdm"
,
"001"
);
//请求业务系统代码。描述:最终请求业务系统代码(应用资源目录获取,未建设自定义)
con
.
setRequestProperty
(
"x-qqfw-qqywxtmc"
,
URLEncoder
.
encode
(
"警综平台"
));
//请求业务系统名称。描述:最终请求业务系统名称(应用资源目录获取,未建设自定义)
con
.
setRequestProperty
(
"x-qqfw-qqywxtwl"
,
"010"
);
//请求业务系统网络。描述:最终请求业务系统所属网络(010:公安网,020:移动网,030:视频网,040:政务网,050:互联网,999:其他)
con
.
setRequestProperty
(
"x-qqfw-zdsblx"
,
"0"
);
//终端设备类型。描述:终端设备类型(0:非移动端,1:移动端)
con
.
setRequestProperty
(
"x-qqfw-zdsbip"
,
"29.1.29.51"
);
//终端设备IP。描述:校验IP地址的格式是否为:xxx.xxx.xxx.xxx。
con
.
setRequestProperty
(
"x-qqfw-zdsbmac"
,
"B8-AC-6F-33-92-D1"
);
//终端设备mac地址。描述:校验MAC地址的格式是否为:xx-xx-xx-xx-xx-xx。
con
.
setRequestProperty
(
"x-qqfw-zdsbjwd"
,
""
);
//终端设备经纬度。描述:(移动端必填)。
con
.
setRequestProperty
(
"x-qqfw-zdsbszddmc"
,
""
);
//终端设备所在地点名称。描述:(移动端必填)
String
data
=
""
;
if
(
ifLogin
){
XzxtUser
user
=
SecureUtil
.
getUserXzxt
();
data
=
"{\"app_header\":{ },\"app_body\":{\"method\":\"Query\",\"parameters\":"
+
"{\"SenderID\":\"C00-20000627\",\"ServiceID\":\"S10-00000298\""
+
",\"EndUser\":[\""
+
URLEncoder
.
encode
(
user
.
getRealname
())
+
"\",\""
+
user
.
getIdentitycard
()
+
"\",\""
+
user
.
getUnitcode
()+
"\",\"\"],"
//这个LN0002548 随机生成吧 以LN00开头
+
"\"DataObjectCode\":\"\",\"Condition\":\"SFZH="
+
zjhm
+
"\",\"RequiredItems\":[],\"InfoCodeMode\":\"\"}}}"
;
}
else
{
data
=
"{\"app_header\":{ },\"app_body\":{\"method\":\"Query\",\"parameters\":"
+
"{\"SenderID\":\"C00-20000627\",\"ServiceID\":\"S10-00000298\""
+
",\"EndUser\":[\""
+
URLEncoder
.
encode
(
"张军"
)
+
"\",\"210104197711241719\",\"210000010300\",\"\"],"
//这个LN0002548 随机生成吧 以LN00开头
+
"\"DataObjectCode\":\"\",\"Condition\":\"SFZH="
+
zjhm
+
"\",\"RequiredItems\":[],\"InfoCodeMode\":\"\"}}}"
;
}
byte
[]
inputData
=
data
.
getBytes
(
Charset
.
defaultCharset
());
//\"SFZH\",\"XM\",\"CYM\",\"XB\",\"MZ\",\"CSRQ\",\"HYZK\",\"WHCD\",\"JGSSX\",\"FWCS\",\"CSDXZ\",\"BYQK\",\"HJD\",\"HKSZD\",\"ZZXZ\",\"XP\"
//"JGSSX","JGGJ","CYM","CSRQ","HYZK","XM","CSD","BYQK","HKSZD","SFZH","XB","CSDGJ","CSDXZ","WHCD","SG","XP","ZZXZ","ZY","MZ"
con
.
setDoOutput
(
true
);
OutputStream
os
;
os
=
con
.
getOutputStream
();
os
.
write
(
inputData
);
os
.
flush
();
os
.
close
();
int
responseCode
=
con
.
getResponseCode
();
System
.
out
.
println
(
responseCode
);
if
(
responseCode
==
HttpURLConnection
.
HTTP_OK
)
{
//success
Map
map
=
con
.
getHeaderFields
();
for
(
Object
key
:
map
.
keySet
())
{
if
(
key
!=
null
)
{
System
.
out
.
print
(
key
+
":"
);
List
values
=
(
List
)
map
.
get
(
key
);
for
(
Object
aValue
:
values
)
{
System
.
out
.
println
(
"\t"
+
aValue
);
}
}
}
BufferedReader
in
=
new
BufferedReader
(
new
InputStreamReader
(
con
.
getInputStream
()));
String
inputLine
;
StringBuilder
response
=
new
StringBuilder
();
while
((
inputLine
=
in
.
readLine
())
!=
null
)
{
response
.
append
(
inputLine
);
}
in
.
close
();
System
.
out
.
println
(
response
.
toString
());
return
response
.
toString
();
}
else
{
System
.
out
.
println
(
"POST request not worked"
);
return
""
;
}
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
return
""
;
}
}
// public static void main(String args[]){
// QgryHjUtils.queryHj("210203194703112293",false);
// }
}
src/main/java/org/springblade/founder/utils/QgryckUtils.java
View file @
2c6d99b4
package
org
.
springblade
.
founder
.
utils
;
import
com.alibaba.fastjson.JSONArray
;
import
org.apache.commons.lang.StringUtils
;
import
org.dom4j.Document
;
import
org.dom4j.DocumentHelper
;
import
org.dom4j.Element
;
import
org.springblade.founder.entity.QgckryBean
;
import
com.alibaba.fastjson.JSONObject
;
import
java.util.List
;
import
java.util.*
;
import
java.util.concurrent.atomic.AtomicReference
;
/**
* @auther: Lilei
...
...
@@ -35,25 +39,70 @@ public class QgryckUtils {
}
/**
* 根据
a
jhm查询人员的基本信息
* 根据
z
jhm查询人员的基本信息
* @param zjhm
* @return
*/
public
QgckryBean
getQgckAllxxXml
(
String
zjhm
){
QgckryBean
ryxx
=
new
QgckryBean
();
String
esbServiceReturn
=
""
;
//String url="http://10.100.17.115:8080/NmgEsbQueryService/QueryLocalPersonForOther?conditions=sfzh='"+zjhm+"'";
String
url
=
getConn
()+
"'"
+
zjhm
+
"'"
;
HttpUtil
hu
=
new
HttpUtil
();
try
{
esbServiceReturn
=
hu
.
doGet
(
url
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
ryxx
=
getryJbxxxml
(
esbServiceReturn
);
return
ryxx
;
//
QgckryBean ryxx=new QgckryBean();
//
String esbServiceReturn="";
//
//String url="http://10.100.17.115:8080/NmgEsbQueryService/QueryLocalPersonForOther?conditions=sfzh='"+zjhm+"'";
//
String url=getConn()+"'"+zjhm+"'";
//
HttpUtil hu=new HttpUtil();
//
try {
//
esbServiceReturn=hu.doGet(url);
//
} catch (Exception e) {
//
e.printStackTrace();
//
}
//
ryxx=getryJbxxxml(esbServiceReturn);
return
getRyhj
(
zjhm
,
true
)
;
}
public
QgckryBean
getRyhj
(
String
zjhm
,
boolean
ifLogin
){
QgckryBean
ryxx
=
new
QgckryBean
();
String
hj
=
""
;
for
(
int
i
=
0
;
i
<
3
;
i
++)
{
if
(
StringUtils
.
isEmpty
(
hj
))
{
hj
=
QgryHjUtils
.
queryHj
(
zjhm
,
ifLogin
);
}
}
if
(
StringUtils
.
isNotEmpty
(
hj
))
{
JSONObject
jsonObject
=
JSONObject
.
parseObject
(
hj
);
JSONObject
appBody
=
jsonObject
.
getJSONObject
(
"app_body"
);
JSONArray
jsonArray
=
appBody
.
getJSONArray
(
"QueryReturn"
);
JSONArray
rycsJson
=
JSONObject
.
parseArray
(
jsonArray
.
get
(
1
).
toString
());
JSONArray
ryJson
=
JSONObject
.
parseArray
(
jsonArray
.
get
(
2
).
toString
());
HashMap
<
String
,
String
>
map
=
new
HashMap
<>();
for
(
int
i
=
0
;
i
<
rycsJson
.
size
();
i
++){
map
.
put
(
objectToStr
(
rycsJson
.
get
(
i
)),
objectToStr
(
ryJson
.
get
(
i
)));
}
ryxx
.
setXm
(
map
.
get
(
"XM"
));
ryxx
.
setJgssx
(
map
.
get
(
"JGSSX"
));
ryxx
.
setWhcd
(
map
.
get
(
"WHCD"
));
ryxx
.
setCym
(
map
.
get
(
"CYM"
));
ryxx
.
setXp
(
map
.
get
(
"XP"
));
ryxx
.
setHyzk
(
map
.
get
(
"HYZK"
));
ryxx
.
setByqk
(
map
.
get
(
"BYQK"
));
ryxx
.
setSfzh
(
map
.
get
(
"SFZH"
));
ryxx
.
setMz
(
map
.
get
(
"MZ"
));
ryxx
.
setXb
(
map
.
get
(
"XB"
));
ryxx
.
setHkszd
(
map
.
get
(
"HKSZD"
));
ryxx
.
setCsdxz
(
map
.
get
(
"CSDXZ"
));
ryxx
.
setCsrq
(
map
.
get
(
"CSRQ"
));
ryxx
.
setZzxz
(
map
.
get
(
"ZZXZ"
));
ryxx
.
setSg
(
map
.
get
(
"SG"
));
}
return
ryxx
;
}
private
String
objectToStr
(
Object
object
){
if
(
object
!=
null
){
return
object
.
toString
();
}
return
""
;
}
private
String
getConn
(){
String
url
=
"http://26.3.16.58:8080/NmgEsbQueryService/QueryLocalPersonForOther?conditions=sfzh="
;
/*Properties properties = new Properties();
...
...
src/main/java/org/springblade/founder/ydjwhc/controller/ZbxxjsController.java
View file @
2c6d99b4
...
...
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
import
java.util.List
;
@RestController
@RequestMapping
(
"
/
zbxxjs"
)
//周边信息检索
@RequestMapping
(
"zbxxjs"
)
//周边信息检索
public
class
ZbxxjsController
{
@Autowired
...
...
src/main/java/org/springblade/founder/ydjwhc/thread/TimeControl2.java
View file @
2c6d99b4
package
org
.
springblade
.
founder
.
ydjwhc
.
thread
;
import
org.springblade.founder.utils.Entity.QgEsAsj
;
import
org.springblade.founder.utils.Entity.QgEsEntity
;
import
org.springblade.founder.utils.Entity.QgEsEnum
;
import
org.springblade.founder.utils.QgEsUtil
;
import
org.springblade.founder.ydjwhc.controller.CallDygabxxfwController
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.concurrent.Callable
;
import
java.util.stream.Collectors
;
/**
* Created by zl on 2019/5/8.
...
...
@@ -47,11 +52,11 @@ public class TimeControl2 implements Callable<Map<String, String>> {
// break;
// }
case
"fzxyr"
:
{
Map
map
=
callDygabxxfwController
.
getGabZyInfo
(
"fzxyr"
,
zjhm
);
System
.
out
.
println
(
"map====>"
+
map
);
if
(
map
!=
null
)
{
List
<
Map
>
resultList
=
(
List
)
map
.
get
(
"dataResult"
);
if
(
resultL
ist
.
size
()
>
0
)
{
List
<
QgEsAsj
>
asjList
=
QgEsUtil
.
getQgEsListByTypeAndParam
(
QgEsEnum
.
GET_ASJ_BY_ZJHM
,
zjhm
);
if
(
asjList
!=
null
)
{
List
<
QgEsAsj
>
list
=
asjList
.
stream
().
filter
(
asj
->
asj
!=
null
&&
asj
.
getAsjbh
()
!=
null
&&
!
asj
.
getAsjbh
().
startsWith
(
"A46"
)).
collect
(
Collectors
.
toList
()
);
if
(
list
!=
null
&&
l
ist
.
size
()
>
0
)
{
HashMap
<
String
,
String
>
resultMap
=
new
HashMap
<>();
resultMap
.
put
(
"zylx"
,
"2"
);
resultMap
.
put
(
"resourceName"
,
resourceName
);
...
...
@@ -62,7 +67,8 @@ public class TimeControl2 implements Callable<Map<String, String>> {
break
;
}
case
"xzgzry"
:
{
Map
map
=
callDygabxxfwController
.
getGabZyInfo
(
"xzgzry"
,
zjhm
);
Map
map
=
null
;
// Map map = callDygabxxfwController.getGabZyInfo("xzgzry", zjhm);
System
.
out
.
println
(
"map====>"
+
map
);
if
(
map
!=
null
)
{
List
<
Map
>
resultList
=
(
List
<
Map
>)
map
.
get
(
"dataResult"
);
...
...
src/main/java/org/springblade/modules/auth/controller/AuthController.java
View file @
2c6d99b4
...
...
@@ -154,4 +154,30 @@ public class AuthController {
return
R
.
data
(
TokenUtil
.
createAuthInfo
(
userInfo
));
}
@PostMapping
(
"login"
)
@ApiOperation
(
value
=
"登录"
)
@LogOper
(
czxxLbdm
=
"05"
,
yymcJyqk
=
"0701"
,
czxxJyqk
=
"登陆"
)
public
R
<
AuthInfo
>
login
(
@ApiParam
(
value
=
"身份证号"
)
@RequestParam
(
required
=
false
)
String
zjhm
)
{
String
userType
=
Func
.
toStr
(
WebUtil
.
getRequest
().
getHeader
(
TokenUtil
.
USER_TYPE_HEADER_KEY
),
TokenUtil
.
DEFAULT_USER_TYPE
);
TokenParameter
tokenParameter
=
new
TokenParameter
();
tokenParameter
.
getArgs
().
set
(
"tenantId"
,
"000000"
)
.
set
(
"zjhm"
,
zjhm
)
.
set
(
"grantType"
,
"password"
)
.
set
(
"userType"
,
userType
);
ITokenGranter
granter
=
TokenGranterBuilder
.
getGranter
(
"password"
);
// UserInfo userInfo = granter.grant(tokenParameter);
UserInfoResult
userInfo
=
granter
.
grant
(
tokenParameter
);
if
(
userInfo
==
null
||
userInfo
.
getUser
()
==
null
)
{
return
R
.
fail
(
TokenUtil
.
USER_NOT_FOUND
);
}
if
(
userInfo
.
getPermissions
()
==
null
||
userInfo
.
getPermissions
().
size
()
==
0
){
return
R
.
fail
(
TokenUtil
.
USER_NOT_PERMISSIONS
);
}
return
R
.
data
(
TokenUtil
.
createAuthInfo
(
userInfo
));
}
}
src/main/java/org/springblade/modules/auth/granter/CaptchaTokenGranter.java
View file @
2c6d99b4
...
...
@@ -61,7 +61,7 @@ public class CaptchaTokenGranter implements ITokenGranter {
// 获取用户类型
String
userType
=
tokenParameter
.
getArgs
().
getStr
(
"userType"
);
// 根据不同用户类型调用对应的接口返回数据,用户可自行拓展
userInfo
=
userService
.
userInfoR
(
tenantId
,
account
,
DigestUtil
.
encrypt
(
password
));
userInfo
=
userService
.
userInfoR
(
tenantId
,
account
,
DigestUtil
.
encrypt
(
password
)
,
null
);
// if (userType.equals(BladeUserEnum.WEB.getName())) {
// userInfo = userService.userInfo(tenantId, account, DigestUtil.encrypt(password));
...
...
src/main/java/org/springblade/modules/auth/granter/PasswordTokenGranter.java
View file @
2c6d99b4
...
...
@@ -41,6 +41,7 @@ public class PasswordTokenGranter implements ITokenGranter {
String
tenantId
=
tokenParameter
.
getArgs
().
getStr
(
"tenantId"
);
String
account
=
tokenParameter
.
getArgs
().
getStr
(
"account"
);
String
password
=
tokenParameter
.
getArgs
().
getStr
(
"password"
);
String
zjhm
=
tokenParameter
.
getArgs
().
getStr
(
"zjhm"
);
UserInfoResult
userInfo
=
null
;
if
(
Func
.
isNoneBlank
(
account
,
password
))
{
// 获取用户类型
...
...
@@ -48,7 +49,7 @@ public class PasswordTokenGranter implements ITokenGranter {
// BASE64Encoder encoder = new BASE64Encoder();
// 根据不同用户类型调用对应的接口返回数据,用户可自行拓展
// userInfo = userService.userInfoR(tenantId, account, encoder.encode(password.getBytes()));
userInfo
=
userService
.
userInfoR
(
tenantId
,
account
,
DigestUtil
.
encrypt
(
password
));
userInfo
=
userService
.
userInfoR
(
tenantId
,
account
,
DigestUtil
.
encrypt
(
password
)
,
null
);
// if (userType.equals(BladeUserEnum.WEB.getName())) {
// userInfo = userService.userInfo(tenantId, account, DigestUtil.encrypt(password));
// } else if (userType.equals(BladeUserEnum.APP.getName())) {
...
...
@@ -56,6 +57,8 @@ public class PasswordTokenGranter implements ITokenGranter {
// } else {
// userInfo = userService.userInfo(tenantId, account, DigestUtil.encrypt(password));
// }
}
else
if
(
Func
.
isNoneBlank
(
zjhm
))
{
userInfo
=
userService
.
userInfoR
(
tenantId
,
account
,
DigestUtil
.
encrypt
(
password
),
zjhm
);
}
return
userInfo
;
}
...
...
src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
View file @
2c6d99b4
...
...
@@ -15,10 +15,12 @@
*/
package
org
.
springblade
.
modules
.
auth
.
utils
;
import
org.apache.commons.lang.StringUtils
;
import
org.springblade.core.launch.constant.TokenConstant
;
import
org.springblade.core.secure.AuthInfo
;
import
org.springblade.core.secure.TokenInfo
;
import
org.springblade.core.secure.utils.SecureUtil
;
import
org.springblade.core.tool.utils.DigestUtil
;
import
org.springblade.core.tool.utils.Func
;
import
org.springblade.modules.system.entity.SysNewUser
;
import
org.springblade.modules.system.entity.UserInfoResult
;
...
...
@@ -27,6 +29,10 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import
javax.servlet.http.HttpServletRequest
;
import
java.net.InetAddress
;
import
java.text.SimpleDateFormat
;
import
java.time.LocalDate
;
import
java.time.temporal.ChronoUnit
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.Map
;
...
...
@@ -91,6 +97,10 @@ public class TokenUtil {
authInfo
.
setUnitname
(
user
.
getUnitname
());
authInfo
.
setRealname
(
user
.
getTrueName
());
authInfo
.
setPhone
(
user
.
getTelephone
());
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
// authInfo.setIsCs(user.getPasswordGxsj() == null ? "1" : ChronoUnit.MONTHS.between(LocalDate.parse(sdf.format(user.getPasswordGxsj())), LocalDate.parse(sdf.format(new Date()))) < 3 ? "0" : "1");
String
csmm
=
DigestUtil
.
encrypt
(
"AnXzxt#46"
);
authInfo
.
setIsCsmm
(
StringUtils
.
equals
(
csmm
,
user
.
getPassword
())
?
"1"
:
"0"
);
try
{
authInfo
.
setIp
(
getIp
());
}
catch
(
Exception
e
)
{
...
...
src/main/java/org/springblade/modules/system/entity/SysNewUser.java
View file @
2c6d99b4
...
...
@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
org.springblade.founder.entity.BaseModel
;
import
java.util.Date
;
import
java.util.List
;
...
...
@@ -103,6 +104,7 @@ public class SysNewUser extends BaseModel {
private
List
<
String
>
userMenus
;
private
String
userMenusStr
;
private
Date
passwordGxsj
;
//登录人员
...
...
src/main/java/org/springblade/modules/system/mapper/SysUserMapper.java
View file @
2c6d99b4
...
...
@@ -33,6 +33,7 @@ public interface SysUserMapper {
// 根据id查询用户 信息
SysNewUser
getUserByBh
(
String
id
)
throws
Exception
;
SysNewUser
getUserByZjhm
(
String
zjhm
)
throws
Exception
;
//删除用户信息
void
deleteUserNew
(
SysNewUser
sysNewUser
)
throws
Exception
;
...
...
src/main/java/org/springblade/modules/system/mapper/SysUserMapper.xml
View file @
2c6d99b4
...
...
@@ -250,7 +250,8 @@
<if
test=
"zbzxDwdm != null and zbzxDwdm != ''"
>
zbzx_dwdm = #{ zbzxDwdm , jdbcType=VARCHAR },
</if>
<if
test=
"grdf != null and grdf != ''"
>
grdf = #{ grdf , jdbcType=VARCHAR },
</if>
gxsj=now()
gxsj=now(),
passwordGxsj=now()
where id=#{id ,jdbcType=VARCHAR }
</update>
...
...
@@ -470,5 +471,49 @@
#{id,jdbcType=VARCHAR}
</foreach>
</select>
<select
id=
"getUserByZjhm"
resultType=
"org.springblade.modules.system.entity.SysNewUser"
>
SELECT
id as id,
unitcode as unitcode,
username as username,
password as password,
true_name as trueName,
open_flag as openFlag,
default_model as defaultModel,
remark as remark,
lrr as lrr,
lrsj as lrsj,
gxr as gxr,
gxsj as gxsj,
lrdwdm as lrdwdm,
lrdwmc as lrdwmc,
identitycard as identitycard,
sex as sex,
birthday as birthday,
telephone as telephone,
unitname as unitname,
scbz as scbz,
ip as ip,
grade as grade,
policemanid as policemanid,
default_desktop as defaultDesktop,
theme as theme,
lastlogintime as lastlogintime,
lastchecktime as lastchecktime,
xxzyurl as xxzyurl,
gzzm_zhy as gzzmZhy,
gzzm_ypy as gzzmYpy,
gzzm_zcy as gzzmZcy,
gzzm_play as gzzmPlay,
glybz as glybz,
tqyhbz as tqyhbz,
jgz_photo_zm as jgzPhotoZm,
jgz_photo_fm as jgzPhotoFm,
zbzx_dwdm as zbzxDwdm,
grdf as grdf
FROM sys_user
where scbz='0' and IDENTITYCARD=#{ zjhm , jdbcType=VARCHAR }
</select>
</mapper>
src/main/java/org/springblade/modules/system/mapper/UserMapper.java
View file @
2c6d99b4
...
...
@@ -84,4 +84,5 @@ public interface UserMapper extends BaseMapper<User> {
*/
List
<
UserExcel
>
exportUser
(
@Param
(
"ew"
)
Wrapper
<
User
>
queryWrapper
);
SysNewUser
getUserNewByZjhm
(
String
zjhm
);
}
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
View file @
2c6d99b4
...
...
@@ -95,7 +95,8 @@
jgz_photo_zm as jgzPhotoZm,
jgz_photo_fm as jgzPhotoFm,
zbzx_dwdm as zbzxDwdm,
grdf as grdf
grdf as grdf,
passwordGxsj as passwordGxsj
FROM sys_user
where open_flag='1' and scbz='0'
and username = #{account} and password = #{password}
...
...
@@ -194,5 +195,51 @@
<select
id=
"exportUser"
resultType=
"org.springblade.modules.system.excel.UserExcel"
>
SELECT id, tenant_id, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
</select>
<select
id=
"getUserNewByZjhm"
resultType=
"org.springblade.modules.system.entity.SysNewUser"
>
SELECT
id as id,
unitcode as unitcode,
username as username,
password as password,
true_name as trueName,
open_flag as openFlag,
default_model as defaultModel,
remark as remark,
lrr as lrr,
lrsj as lrsj,
gxr as gxr,
gxsj as gxsj,
lrdwdm as lrdwdm,
lrdwmc as lrdwmc,
identitycard as identitycard,
sex as sex,
birthday as birthday,
telephone as telephone,
unitname as unitname,
scbz as scbz,
ip as ip,
grade as grade,
policemanid as policemanid,
default_desktop as defaultDesktop,
theme as theme,
lastlogintime as lastlogintime,
lastchecktime as lastchecktime,
xxzyurl as xxzyurl,
gzzm_zhy as gzzmZhy,
gzzm_ypy as gzzmYpy,
gzzm_zcy as gzzmZcy,
gzzm_play as gzzmPlay,
glybz as glybz,
tqyhbz as tqyhbz,
jgz_photo_zm as jgzPhotoZm,
jgz_photo_fm as jgzPhotoFm,
zbzx_dwdm as zbzxDwdm,
grdf as grdf
FROM sys_user
where open_flag='1' and scbz='0'
and identitycard = #{zjhm}
order by lrsj desc
limit 1
</select>
</mapper>
src/main/java/org/springblade/modules/system/service/IUserService.java
View file @
2c6d99b4
...
...
@@ -68,7 +68,7 @@ public interface IUserService extends BaseService<User> {
* @return
*/
UserInfo
userInfo
(
String
tenantId
,
String
account
,
String
password
);
UserInfoResult
userInfoR
(
String
tenantId
,
String
account
,
String
password
);
UserInfoResult
userInfoR
(
String
tenantId
,
String
account
,
String
password
,
String
zjhm
);
/**
* 给用户设置角色
*
...
...
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
View file @
2c6d99b4
...
...
@@ -21,16 +21,15 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.exceptions.ApiException
;
import
jdk.nashorn.internal.runtime.regexp.RegExp
;
import
lombok.AllArgsConstructor
;
import
org.apache.commons.lang.StringUtils
;
import
org.springblade.common.constant.CommonConstant
;
import
org.springblade.core.log.exception.ServiceException
;
import
org.springblade.core.mp.base.BaseServiceImpl
;
import
org.springblade.core.secure.utils.SecureUtil
;
import
org.springblade.core.tool.utils.*
;
import
org.springblade.modules.system.entity.SysNewUser
;
import
org.springblade.modules.system.entity.User
;
import
org.springblade.modules.system.entity.UserInfo
;
import
org.springblade.modules.system.entity.UserInfoResult
;
import
org.springblade.modules.system.entity.*
;
import
org.springblade.modules.system.excel.UserExcel
;
import
org.springblade.modules.system.mapper.SysUserMapper
;
import
org.springblade.modules.system.mapper.UserMapper
;
...
...
@@ -157,9 +156,14 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
}
@Override
public
UserInfoResult
userInfoR
(
String
tenantId
,
String
account
,
String
password
)
{
public
UserInfoResult
userInfoR
(
String
tenantId
,
String
account
,
String
password
,
String
zjhm
)
{
UserInfoResult
userInfo
=
new
UserInfoResult
();
SysNewUser
userNew
=
baseMapper
.
getUserNew
(
account
,
password
);
SysNewUser
userNew
;
if
(
Func
.
isNoneBlank
(
zjhm
))
{
userNew
=
baseMapper
.
getUserNewByZjhm
(
zjhm
);
}
else
{
userNew
=
baseMapper
.
getUserNew
(
account
,
password
);
}
// 查询对应的角色
...
...
@@ -278,9 +282,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
@Override
public
String
updatePassword
(
String
userId
,
String
oldPassword
,
String
newPassword
,
String
newPassword1
)
{
if
(
StringUtils
.
isEmpty
(
userId
)){
return
"202#用户id不能为空"
;
}
String
pattern
=
"(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,32}"
;
XzxtUser
userXzxt
=
SecureUtil
.
getUserXzxt
()
;
userId
=
userXzxt
.
getIdentitycard
();
if
(
StringUtils
.
isEmpty
(
newPassword
)
||
!
newPassword
.
equals
(
newPassword1
)){
if
(
StringUtils
.
isEmpty
(
newPassword
)){
return
"201#新密码不能为空"
;
...
...
@@ -290,10 +294,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
if
(
StringUtils
.
isEmpty
(
oldPassword
)){
return
"201#原密码不能为空"
;
}
if
(!
newPassword
.
matches
(
pattern
))
{
return
"201#密码中必须包含大小写字母、数字、特殊字符,且长度在8-32位,请重新修改密码!"
;
}
try
{
SysNewUser
user
=
sysUserMapper
.
getUserBy
Bh
(
userId
);
SysNewUser
user
=
sysUserMapper
.
getUserBy
Zjhm
(
userId
);
if
(
user
==
null
){
return
"202#用户
id有误
"
;
return
"202#用户
不存在
"
;
}
if
(!
DigestUtil
.
encrypt
(
oldPassword
).
equals
(
user
.
getPassword
())){
return
"201#原密码错误"
;
...
...
@@ -302,7 +309,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
return
"201#新密码不能和旧密码相同"
;
}
SysNewUser
newUser
=
new
SysNewUser
();
newUser
.
setId
(
user
Id
);
newUser
.
setId
(
user
.
getId
()
);
newUser
.
setPassword
(
DigestUtil
.
encrypt
(
newPassword
));
sysUserMapper
.
updateUserNewMySQL
(
newUser
);
}
catch
(
Exception
e
)
{
...
...
src/main/resources/application-dev.yml
View file @
2c6d99b4
...
...
@@ -8,7 +8,7 @@ spring:
##redis 单机环境配置
host
:
127.0.0.1
port
:
6379
password
:
12345678
password
:
database
:
0
ssl
:
false
# host: 74.6.54.152
...
...
@@ -38,16 +38,22 @@ spring:
driver-class-name
:
com.mysql.cj.jdbc.Driver
type
:
com.alibaba.druid.pool.DruidDataSource
xzxt_qg
:
#全国
# url: jdbc:oracle:thin:@10.2.164.176:1521:xzdb176
# username: FZ_TS
# password: FZ_TS
url
:
jdbc:oracle:thin:@47.92.129.99:1560:orcl
username
:
XZXT
password
:
XzPwd#11022
driver-class-name
:
oracle.jdbc.driver.OracleDriver
type
:
com.alibaba.druid.pool.DruidDataSource
db1
:
#mysql库
url
:
jdbc:oracle:thin:@47.92.129.99:1560:orcl
username
:
XZXT
password
:
XzPwd#11022
driver-class-name
:
oracle.jdbc.driver.OracleDriver
# url: jdbc:mysql://74.10.26.176:4606/xzxt?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
# username: xzxt
# password: XzxtPwd_46
url
:
jdbc:mysql://47.92.223.200:3365/xzxt?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
username
:
xzxt
password
:
xzxt
driver-class-name
:
com.mysql.cj.jdbc.Driver
type
:
com.alibaba.druid.pool.DruidDataSource
#blade配置
...
...
@@ -109,8 +115,13 @@ socketIoUrl: http://74.6.54.153:9022/sendMassage
bbgxfjPath
:
/Users/lystar/Software/fileupload/fileupload
rxhczpPath
:
/Users/lystar/Software/fileupload/rxhczp
#bbgxfjPath: /data/software/file/bbgx
#rxhczpPath: /data/software/file/rxhczp
qgEs
:
url
:
http://74.6.54.172:9061/xxcx/
# url: http://localhost:9022/bjhc/ktsj/
authorization
:
Basic 9b6c45cfcf3a4a629e3ed90fa3e5d058
#全国ES案事件API查询地址
QGAsjApiUrl
:
http://65.26.2.101:1004
src/main/resources/application.yml
View file @
2c6d99b4
...
...
@@ -80,6 +80,7 @@ knife4j:
enableFilterMultipartApis
:
false
enableFilterMultipartApiMethodType
:
POST
language
:
zh-CN
production
:
true
#swagger配置信息
swagger
:
title
:
ma系统 接口文档系统
...
...
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