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
bae346ee
Commit
bae346ee
authored
Nov 16, 2023
by
wang_jiaxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
app相关修改
parent
038dec3b
Hide whitespace changes
Inline
Side-by-side
Showing
34 changed files
with
406 additions
and
67 deletions
+406
-67
src/main/java/org/springblade/common/config/UserHandlerConfig.java
+20
-0
src/main/java/org/springblade/core/secure/AuthInfo.java
+3
-0
src/main/java/org/springblade/founder/ajda/controller/AjdaController.java
+1
-1
src/main/java/org/springblade/founder/asj/controller/TbStAsjController.java
+1
-1
src/main/java/org/springblade/founder/asj/entity/TbXwKyxsYy.java
+1
-1
src/main/java/org/springblade/founder/asj/mapper/TbXwKyxsSpMapper.xml
+0
-1
src/main/java/org/springblade/founder/asj/mapper/TbXwKyxsYyMapper.xml
+0
-2
src/main/java/org/springblade/founder/asj/service/impl/KyxsServiceImpl.java
+5
-5
src/main/java/org/springblade/founder/dzbl/controller/TbStAppDzblController.java
+4
-4
src/main/java/org/springblade/founder/dzbl/mapper/TbStAppDzblBshMapper.xml
+1
-1
src/main/java/org/springblade/founder/dzbl/mapper/TbStAppDzblMapper.xml
+3
-3
src/main/java/org/springblade/founder/ryythcj/controller/TbStAppRyxxController.java
+5
-5
src/main/java/org/springblade/founder/ryythcj/mapper/TbStAppRyxxMapper.xml
+3
-3
src/main/java/org/springblade/founder/ryythcj/service/impl/TbStAppRyxxServiceImpl.java
+1
-1
src/main/java/org/springblade/founder/sbgl/entity/SysAppsb.java
+161
-0
src/main/java/org/springblade/founder/sbgl/mapper/SysAppsbMapper.java
+17
-0
src/main/java/org/springblade/founder/sbgl/mapper/SysAppsbMapper.xml
+11
-0
src/main/java/org/springblade/founder/sbgl/service/SysAppsbService.java
+16
-0
src/main/java/org/springblade/founder/sbgl/service/impl/SysAppsbServiceImpl.java
+38
-0
src/main/java/org/springblade/founder/xcxt/controller/TbStAppXsController.java
+5
-5
src/main/java/org/springblade/founder/xcxt/mapper/TbStAppXsMapper.xml
+3
-3
src/main/java/org/springblade/founder/xcxx/controller/TbStAppWzxxController.java
+4
-4
src/main/java/org/springblade/founder/xcxx/controller/XcxxController.java
+7
-7
src/main/java/org/springblade/founder/xcxx/entity/TbStAppXcxxFj.java
+2
-0
src/main/java/org/springblade/founder/xcxx/mapper/XcxxFjMapper.xml
+1
-0
src/main/java/org/springblade/founder/xcxx/mapper/XcxxMapper.xml
+2
-2
src/main/java/org/springblade/founder/xcxx/service/impl/XcxxServiceImpl.java
+16
-1
src/main/java/org/springblade/founder/xxtz/mapper/XxtzMapper.xml
+6
-7
src/main/java/org/springblade/founder/ydjwhc/controller/BjHcController.java
+4
-4
src/main/java/org/springblade/founder/ydjwhc/controller/ZbxxjsController.java
+2
-2
src/main/java/org/springblade/modules/auth/controller/AuthController.java
+29
-3
src/main/java/org/springblade/modules/auth/controller/YckzController.java
+32
-0
src/main/java/org/springblade/modules/auth/granter/PasswordTokenGranter.java
+1
-1
src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
+1
-0
No files found.
src/main/java/org/springblade/common/config/UserHandlerConfig.java
View file @
bae346ee
package
org
.
springblade
.
common
.
config
;
import
org.apache.commons.lang.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springblade.core.secure.utils.SecureUtil
;
...
...
@@ -7,6 +8,8 @@ import org.springblade.core.tool.api.R;
import
org.springblade.core.tool.api.ResultCode
;
import
org.springblade.core.tool.jackson.JsonUtil
;
import
org.springblade.core.tool.utils.WebUtil
;
import
org.springblade.founder.sbgl.entity.SysAppsb
;
import
org.springblade.founder.sbgl.service.SysAppsbService
;
import
org.springblade.modules.system.entity.XzxtUser
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.redis.core.RedisTemplate
;
...
...
@@ -31,6 +34,8 @@ public class UserHandlerConfig implements HandlerInterceptor {
@Autowired
private
RedisTemplate
<
String
,
String
>
redisTemplate
;
@Autowired
private
SysAppsbService
sysAppsbService
;
private
static
final
Logger
log
=
LoggerFactory
.
getLogger
(
UserHandlerConfig
.
class
);
...
...
@@ -47,6 +52,21 @@ public class UserHandlerConfig implements HandlerInterceptor {
return
false
;
}
ops
.
set
(
key
,
"1"
,
10
,
TimeUnit
.
MINUTES
);
//存入redis并设置过期时间
String
s
=
ops
.
get
(
"sysAppsb:"
+
user
.
getIdentitycard
());
if
(
StringUtils
.
isEmpty
(
s
))
{
SysAppsb
sysAppsb
=
sysAppsbService
.
getSysAppsbBySfzh
(
user
.
getIdentitycard
());
if
(
sysAppsb
==
null
)
{
R
result
=
R
.
fail
(
ResultCode
.
REQ_REJECT
,
"账号未绑定设备!"
);
errorResult
(
response
,
JsonUtil
.
toJson
(
result
));
return
false
;
}
if
(
"1"
.
equals
(
sysAppsb
.
getSbzt
()))
{
R
result
=
R
.
fail
(
ResultCode
.
REQ_REJECT
,
"设备已挂失,无法操作!"
);
errorResult
(
response
,
JsonUtil
.
toJson
(
result
));
return
false
;
}
ops
.
set
(
"sysAppsb:"
+
user
.
getIdentitycard
(),
user
.
getIdentitycard
(),
10
,
TimeUnit
.
MINUTES
);
}
return
true
;
}
else
{
log
.
warn
(
"签名认证失败,请求接口:{},请求IP:{},请求参数:{}"
,
new
Object
[]{
request
.
getRequestURI
(),
WebUtil
.
getIP
(
request
),
JsonUtil
.
toJson
(
request
.
getParameterMap
())});
...
...
src/main/java/org/springblade/core/secure/AuthInfo.java
View file @
bae346ee
...
...
@@ -69,4 +69,7 @@ public class AuthInfo {
@ApiModelProperty
(
value
=
"是否初始密码"
)
@TableField
(
exist
=
false
)
private
String
isCsmm
;
@ApiModelProperty
(
value
=
"权限"
)
@TableField
(
exist
=
false
)
private
String
permission
;
}
src/main/java/org/springblade/founder/ajda/controller/AjdaController.java
View file @
bae346ee
...
...
@@ -39,7 +39,7 @@ public class AjdaController {
*/
@RequestMapping
(
"/queryAjdaxxs"
)
@ResponseBody
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"查询案件档案"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
5
"
,
czxxJyqk
=
"查询案件档案"
)
public
R
queryAjdaxx
(
String
asjbh
)
{
try
{
HashMap
<
String
,
Object
>
resultMap
=
new
HashMap
<>();
...
...
src/main/java/org/springblade/founder/asj/controller/TbStAsjController.java
View file @
bae346ee
...
...
@@ -36,7 +36,7 @@ public class TbStAsjController {
* @return 单条数据
*/
@PostMapping
(
"queryByXxzjbh"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"查询案件详情"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
5
"
,
czxxJyqk
=
"查询案件详情"
)
public
R
queryById
(
String
asjbh
)
{
try
{
TbStAsjQgccj
tbStAsjQgccj
=
tbStAsjService
.
queryById
(
asjbh
);
...
...
src/main/java/org/springblade/founder/asj/entity/TbXwKyxsYy.java
View file @
bae346ee
...
...
@@ -24,7 +24,7 @@ public class TbXwKyxsYy extends BaseModel {
//可疑语音内容
private
byte
[]
kyxsyyYynr
;
//可疑依据
private
String
kyxs
tx
Kyyj
;
private
String
kyxs
yy
Kyyj
;
@TableField
(
exist
=
false
)
private
List
<
String
>
qgAsjbhList
;
//全国
...
...
src/main/java/org/springblade/founder/asj/mapper/TbXwKyxsSpMapper.xml
View file @
bae346ee
...
...
@@ -29,7 +29,6 @@
select xxzjbh,
asjbh,
kyxssp_pssb,
kyxssp_spnr,
kyxssp_kyyj,
djsj,
gxsj,
...
...
src/main/java/org/springblade/founder/asj/mapper/TbXwKyxsYyMapper.xml
View file @
bae346ee
...
...
@@ -5,7 +5,6 @@
select xxzjbh,
asjbh,
kyxsyy_lywz,
kyxsyy_yynr,
kyxsyy_kyyj,
djsj,
gxsj,
...
...
@@ -29,7 +28,6 @@
select xxzjbh,
asjbh,
kyxsyy_lywz,
kyxsyy_yynr,
kyxsyy_kyyj,
djsj,
gxsj,
...
...
src/main/java/org/springblade/founder/asj/service/impl/KyxsServiceImpl.java
View file @
bae346ee
...
...
@@ -124,15 +124,15 @@ public class KyxsServiceImpl implements KyxsService {
tbXwKyxsTxMapper
.
insert
(
kyxsTx
);
break
;
case
"yy"
:
//可疑语音
if
(
file
==
null
){
return
null
;
}
//
if (file == null){
//
return null;
//
}
TbXwKyxsYy
kyxsYy
=
new
TbXwKyxsYy
();
kyxsYy
.
setXxzjbh
(
xxzjbh
);
kyxsYy
.
setAsjbh
(
asjbh
);
kyxsYy
.
setKyxsyyYynr
(
file
.
getBytes
());
kyxsYy
.
setKyxsyyYynr
(
file
==
null
?
null
:
file
.
getBytes
());
kyxsYy
.
setKyxsyyLywz
(
yywz
);
kyxsYy
.
setKyxs
tx
Kyyj
(
kyyj
);
kyxsYy
.
setKyxs
yy
Kyyj
(
kyyj
);
kyxsYy
.
setXxscPdbz
(
"0"
);
Utils
.
setUserDjxxAndCzxx
(
kyxsYy
);
tbXwKyxsYyMapper
.
insert
(
kyxsYy
);
...
...
src/main/java/org/springblade/founder/dzbl/controller/TbStAppDzblController.java
View file @
bae346ee
...
...
@@ -21,7 +21,7 @@ public class TbStAppDzblController {
private
TbStAppDzblService
tbStAppDzblService
;
@PostMapping
(
"/saveNewDzbl"
)
@LogOper
(
czxxLbdm
=
"02"
,
yymcJyqk
=
"07
01
"
,
czxxJyqk
=
"新增电子笔录"
)
@LogOper
(
czxxLbdm
=
"02"
,
yymcJyqk
=
"07
10
"
,
czxxJyqk
=
"新增电子笔录"
)
public
R
saveNewDzbl
(
TbStAppDzbl
dzbl
)
{
try
{
String
xxzjbh
=
tbStAppDzblService
.
saveNewDzbl
(
dzbl
);
...
...
@@ -33,7 +33,7 @@ public class TbStAppDzblController {
}
@PostMapping
(
"/updateDzbl"
)
@LogOper
(
czxxLbdm
=
"03"
,
yymcJyqk
=
"07
01
"
,
czxxJyqk
=
"修改电子笔录"
)
@LogOper
(
czxxLbdm
=
"03"
,
yymcJyqk
=
"07
10
"
,
czxxJyqk
=
"修改电子笔录"
)
public
R
updateDzbl
(
TbStAppDzbl
dzbl
)
{
try
{
String
xxzjbh
=
tbStAppDzblService
.
updateDzbl
(
dzbl
);
...
...
@@ -56,7 +56,7 @@ public class TbStAppDzblController {
}
@PostMapping
(
"/getDzblByXxzjbh"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"07
01
"
,
czxxJyqk
=
"查询电子笔录"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"07
10
"
,
czxxJyqk
=
"查询电子笔录"
)
public
R
getDzblByXxzjbh
(
String
xxzjbh
)
{
try
{
TbStAppDzbl
dzbl
=
tbStAppDzblService
.
getDzblByXxzjbh
(
xxzjbh
);
...
...
@@ -68,7 +68,7 @@ public class TbStAppDzblController {
}
@PostMapping
(
"/deleteDzbl"
)
@LogOper
(
czxxLbdm
=
"04"
,
yymcJyqk
=
"07
01
"
,
czxxJyqk
=
"删除电子笔录"
)
@LogOper
(
czxxLbdm
=
"04"
,
yymcJyqk
=
"07
10
"
,
czxxJyqk
=
"删除电子笔录"
)
public
R
deleteDzbl
(
String
xxzjbh
)
{
try
{
tbStAppDzblService
.
deleteDzbl
(
xxzjbh
);
...
...
src/main/java/org/springblade/founder/dzbl/mapper/TbStAppDzblBshMapper.xml
View file @
bae346ee
...
...
@@ -25,7 +25,7 @@
XXRSK_PDBZ,
XXRBK_PDBZ,
XXSC_PDBZ
FROM
TB_ST_APP_DZBL_BSH
FROM
tb_st_app_dzbl_bsh
where GLXX_XXZJBH = #{glxxXxzjbh,jdbcType=VARCHAR}
and xxsc_pdbz = '0'
</select>
...
...
src/main/java/org/springblade/founder/dzbl/mapper/TbStAppDzblMapper.xml
View file @
bae346ee
...
...
@@ -6,7 +6,7 @@
select * from (select rownum r, t.* from (
SELECT
<include
refid=
"dzblField"
/>
FROM
TB_ST_APP_DZBL
dzbl
FROM
tb_st_app_dzbl
dzbl
where dzbl.XXSC_PDBZ = '0'
<include
refid=
"dzblParam"
/>
order by dzbl.DJSJ desc
...
...
@@ -16,14 +16,14 @@
</select>
<select
id=
"selectCountByParam"
resultType=
"java.lang.Integer"
>
select count(1)
FROM
TB_ST_APP_DZBL
dzbl
FROM
tb_st_app_dzbl
dzbl
where dzbl.XXSC_PDBZ = '0'
<include
refid=
"dzblParam"
/>
</select>
<select
id=
"selectByxxzjbh"
resultType=
"org.springblade.founder.dzbl.entity.TbStAppDzbl"
>
SELECT
<include
refid=
"dzblField"
/>
FROM
TB_ST_APP_DZBL
dzbl
FROM
tb_st_app_dzbl
dzbl
where dzbl.XXSC_PDBZ = '0'
and XXZJBH = #{xxzjbh,jdbcType=VARCHAR}
</select>
...
...
src/main/java/org/springblade/founder/ryythcj/controller/TbStAppRyxxController.java
View file @
bae346ee
...
...
@@ -20,7 +20,7 @@ public class TbStAppRyxxController {
private
TbStAppRyxxService
tbStAppRyxxService
;
@PostMapping
(
"/saveNewRyxx"
)
@LogOper
(
czxxLbdm
=
"02"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"新增人员信息"
)
@LogOper
(
czxxLbdm
=
"02"
,
yymcJyqk
=
"070
9
"
,
czxxJyqk
=
"新增人员信息"
)
public
R
saveNewRyxx
(
TbStAppRyxx
ryxx
){
try
{
String
xxzjbh
=
tbStAppRyxxService
.
saveNewRyxx
(
ryxx
);
...
...
@@ -60,7 +60,7 @@ public class TbStAppRyxxController {
}
@PostMapping
(
"/getRyxxByXxzjbh"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"查询人员信息"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
9
"
,
czxxJyqk
=
"查询人员信息"
)
public
R
getYrxxByXxzjbh
(
String
xxzjbh
){
try
{
TbStAppRyxx
ryxx
=
tbStAppRyxxService
.
getYrxxByXxzjbh
(
xxzjbh
);
...
...
@@ -83,7 +83,7 @@ public class TbStAppRyxxController {
}
@PostMapping
(
"/updateRyxxByXxzjbh"
)
@LogOper
(
czxxLbdm
=
"03"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"修改人员信息"
)
@LogOper
(
czxxLbdm
=
"03"
,
yymcJyqk
=
"070
9
"
,
czxxJyqk
=
"修改人员信息"
)
public
R
updateYrxxByXxzjbh
(
TbStAppRyxx
ryxx
){
try
{
String
xxzjbh
=
tbStAppRyxxService
.
updateYrxxByXxzjbh
(
ryxx
);
...
...
@@ -106,7 +106,7 @@ public class TbStAppRyxxController {
}
@PostMapping
(
"/deleteRyxx"
)
@LogOper
(
czxxLbdm
=
"04"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"删除人员信息"
)
@LogOper
(
czxxLbdm
=
"04"
,
yymcJyqk
=
"070
9
"
,
czxxJyqk
=
"删除人员信息"
)
public
R
deleteRyxx
(
String
xxzjbh
){
try
{
tbStAppRyxxService
.
deleteRyxx
(
xxzjbh
);
...
...
@@ -118,7 +118,7 @@ public class TbStAppRyxxController {
}
@PostMapping
(
"/tqQgryxx"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"提取人员信息"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
9
"
,
czxxJyqk
=
"提取人员信息"
)
public
R
tqQgryxx
(
String
sfzh
){
try
{
TbStAppRyxx
ryxx
=
tbStAppRyxxService
.
tqQgryxx
(
sfzh
);
...
...
src/main/java/org/springblade/founder/ryythcj/mapper/TbStAppRyxxMapper.xml
View file @
bae346ee
...
...
@@ -7,7 +7,7 @@
from (
SELECT
<include
refid=
"ryxxQueryField"
/>
FROM
TB_ST_APP_RYXX
FROM
tb_st_app_ryxx
where xxsc_pdbz = '0'
<include
refid=
"ryxxQueryParam"
/>
order by djsj desc
...
...
@@ -17,14 +17,14 @@
</select>
<select
id=
"selectCountByParay"
resultType=
"java.lang.Integer"
>
select count(1)
FROM
TB_ST_APP_RYXX
FROM
tb_st_app_ryxx
where xxsc_pdbz = '0'
<include
refid=
"ryxxQueryParam"
/>
</select>
<select
id=
"selectByXxzjbh"
resultType=
"org.springblade.founder.ryythcj.entity.TbStAppRyxx"
>
SELECT
<include
refid=
"ryxxQueryField"
/>
FROM
TB_ST_APP_RYXX
FROM
tb_st_app_ryxx
where xxsc_pdbz = '0'
and XXZJBH = #{xxzjbh,jdbcType=VARCHAR}
</select>
...
...
src/main/java/org/springblade/founder/ryythcj/service/impl/TbStAppRyxxServiceImpl.java
View file @
bae346ee
...
...
@@ -69,7 +69,7 @@ public class TbStAppRyxxServiceImpl implements TbStAppRyxxService {
}
}
XzxtUser
xzxtUser
=
SecureUtil
.
getUserXzxt
();
String
xxzjbh
=
xxzjbhService
.
getZcxwYwbh
(
xzxtUser
.
getUnitcode
(),
null
,
"
TB_ST_APP_RYXX
"
,
"R"
);
String
xxzjbh
=
xxzjbhService
.
getZcxwYwbh
(
xzxtUser
.
getUnitcode
(),
null
,
"
tb_st_app_ryxx
"
,
"R"
);
ryxx
.
setXxzjbh
(
xxzjbh
);
Utils
.
setUserDjxxAndCzxx
(
ryxx
);
ryxx
.
setXmpy
(
SpellHelper
.
getEname
(
ryxx
.
getXm
()));
...
...
src/main/java/org/springblade/founder/sbgl/entity/SysAppsb.java
0 → 100644
View file @
bae346ee
package
org
.
springblade
.
founder
.
sbgl
.
entity
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
lombok.Data
;
import
org.springblade.modules.system.entity.XzxtUser
;
import
java.util.Date
;
/**
*
* @author create by lystar
* @date 2023/11/10 15:26
*/
@Data
@TableName
(
"sys_appsb"
)
public
class
SysAppsb
{
/**
* 信息主键编号
*/
@TableId
(
"xxzjbh"
)
private
String
xxzjbh
;
/**
* IP地址
*/
private
String
ip
;
/**
* MAC地址
*/
private
String
mac
;
/**
* 设备品牌
*/
private
String
sbpp
;
/**
* 设备名称
*/
private
String
sbmc
;
/**
* 设备型号
*/
private
String
sbxh
;
/**
* 绑定用户身份证
*/
private
String
bdidcard
;
/**
* 绑定姓名
*/
private
String
bdxm
;
/**
* 设备状态 0:开启,1关闭,2远程中
*/
private
String
sbzt
;
/**
* 备注
*/
private
String
bz
;
/**
* 信息删除_判断标识/1-是,0-否/CODE_IF
*/
private
String
xxscPdbz
;
/**
* 信息登记单位_公安机关机构代码/采用GA 380《全国公安机关机构代码编码规则》统一编制的代码/CODE_GXS
*/
private
String
xxdjdwGajgjgdm
;
/**
* 信息登记单位_公安机关名称
*/
private
String
xxdjdwGajgmc
;
/**
* 信息登记人员_姓名
*/
private
String
xxdjryXm
;
/**
* 信息登记人员_公民身份号码/符合GB 11643《公民身份号码》
*/
private
String
xxdjryGmsfhm
;
/**
* 信息登记人员_联系电话
*/
private
String
xxdjryLxdh
;
/**
* 登记时间
*/
private
Date
djsj
;
/**
* 信息操作单位_公安机关机构代码/采用GA 380《全国公安机关机构代码编码规则》统一编制的代码/CODE_GXS
*/
private
String
xxczdwGajgjgdm
;
/**
* 信息操作单位_公安机关名称
*/
private
String
xxczdwGajgmc
;
/**
* 信息操作人员_姓名
*/
private
String
xxczryXm
;
/**
* 信息操作人员_公民身份号码/符合GB 11643《公民身份号码》
*/
private
String
xxczryGmsfhm
;
/**
* 更新时间
*/
private
Date
gxsj
;
//分页查询开始位置
@TableField
(
exist
=
false
)
private
Integer
page
;
//分页查询结束位置
@TableField
(
exist
=
false
)
private
Integer
limit
;
public
void
setDjUser
(
XzxtUser
user
){
this
.
xxdjryXm
=
user
.
getRealname
();
this
.
xxdjdwGajgjgdm
=
user
.
getUnitcode
();
this
.
xxdjdwGajgmc
=
user
.
getUnitname
();
this
.
xxdjryGmsfhm
=
user
.
getIdentitycard
();
this
.
xxdjryLxdh
=
user
.
getPhone
();
this
.
xxczryXm
=
user
.
getRealname
();
this
.
xxczdwGajgjgdm
=
user
.
getUnitcode
();
this
.
xxczdwGajgmc
=
user
.
getUnitname
();
this
.
xxczryGmsfhm
=
user
.
getIdentitycard
();
}
// 更新人员
public
void
setUpUser
(
XzxtUser
user
){
this
.
xxczryXm
=
user
.
getRealname
();
this
.
xxczdwGajgjgdm
=
user
.
getUnitcode
();
this
.
xxczdwGajgmc
=
user
.
getUnitname
();
this
.
xxczryGmsfhm
=
user
.
getIdentitycard
();
}
}
src/main/java/org/springblade/founder/sbgl/mapper/SysAppsbMapper.java
0 → 100644
View file @
bae346ee
package
org
.
springblade
.
founder
.
sbgl
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.springblade.founder.sbgl.entity.SysAppsb
;
import
org.springframework.stereotype.Repository
;
import
java.util.List
;
/**
*
* @author create by lystar
* @date 2023/11/10 15:26
*/
@Repository
public
interface
SysAppsbMapper
extends
BaseMapper
<
SysAppsb
>
{
List
<
String
>
getSysAppsbYyBySfzh
(
String
sfzh
);
}
src/main/java/org/springblade/founder/sbgl/mapper/SysAppsbMapper.xml
0 → 100644
View file @
bae346ee
<?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=
"org.springblade.founder.sbgl.mapper.SysAppsbMapper"
>
<select
id=
"getSysAppsbYyBySfzh"
resultType=
"java.lang.String"
>
select yydm
from sys_appsb_yy
where sfzh = #{sfzh,jdbcType=VARCHAR}
and xxsc_pdbz = '0'
</select>
</mapper>
\ No newline at end of file
src/main/java/org/springblade/founder/sbgl/service/SysAppsbService.java
0 → 100644
View file @
bae346ee
package
org
.
springblade
.
founder
.
sbgl
.
service
;
import
org.springblade.founder.sbgl.entity.SysAppsb
;
import
java.util.List
;
/**
*
* @author create by lystar
* @date 2023/11/10 15:28
*/
public
interface
SysAppsbService
{
SysAppsb
getSysAppsbBySfzh
(
String
sfzh
);
List
<
String
>
getSysAppsbYyBySfzh
(
String
sfzh
);
}
src/main/java/org/springblade/founder/sbgl/service/impl/SysAppsbServiceImpl.java
0 → 100644
View file @
bae346ee
package
org
.
springblade
.
founder
.
sbgl
.
service
.
impl
;
import
com.baomidou.dynamic.datasource.annotation.DS
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
org.springblade.founder.sbgl.entity.SysAppsb
;
import
org.springblade.founder.sbgl.mapper.SysAppsbMapper
;
import
org.springblade.founder.sbgl.service.SysAppsbService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
/**
* TODO
*
* @author create by lystar
* @date 2023/11/10 15:29
*/
@Service
@DS
(
"db1"
)
public
class
SysAppsbServiceImpl
implements
SysAppsbService
{
@Autowired
private
SysAppsbMapper
sysAppsbMapper
;
@Override
public
SysAppsb
getSysAppsbBySfzh
(
String
sfzh
)
{
LambdaQueryWrapper
<
SysAppsb
>
wrapper
=
new
LambdaQueryWrapper
<>();
wrapper
.
eq
(
SysAppsb:
:
getXxscPdbz
,
"0"
);
wrapper
.
eq
(
SysAppsb:
:
getBdidcard
,
sfzh
);
wrapper
.
orderByDesc
(
SysAppsb:
:
getGxsj
);
wrapper
.
last
(
"limit 1"
);
return
sysAppsbMapper
.
selectOne
(
wrapper
);
}
@Override
public
List
<
String
>
getSysAppsbYyBySfzh
(
String
sfzh
)
{
return
sysAppsbMapper
.
getSysAppsbYyBySfzh
(
sfzh
);
}
}
src/main/java/org/springblade/founder/xcxt/controller/TbStAppXsController.java
View file @
bae346ee
...
...
@@ -20,7 +20,7 @@ public class TbStAppXsController {
private
TbStAppXsService
tbStAppXsService
;
@PostMapping
(
"/saveNewXs"
)
@LogOper
(
czxxLbdm
=
"02"
,
yymcJyqk
=
"07
01
"
,
czxxJyqk
=
"新增线索协同线索"
)
@LogOper
(
czxxLbdm
=
"02"
,
yymcJyqk
=
"07
12
"
,
czxxJyqk
=
"新增线索协同线索"
)
public
R
saveNewXs
(
TbStAppXs
xs
){
try
{
String
xxzjbh
=
tbStAppXsService
.
saveNewXs
(
xs
);
...
...
@@ -43,7 +43,7 @@ public class TbStAppXsController {
}
@PostMapping
(
"/updateXs"
)
@LogOper
(
czxxLbdm
=
"03"
,
yymcJyqk
=
"07
01
"
,
czxxJyqk
=
"修改线索协同线索"
)
@LogOper
(
czxxLbdm
=
"03"
,
yymcJyqk
=
"07
12
"
,
czxxJyqk
=
"修改线索协同线索"
)
public
R
updateXs
(
TbStAppXs
xs
){
try
{
String
xxzjbh
=
tbStAppXsService
.
updateXs
(
xs
);
...
...
@@ -55,7 +55,7 @@ public class TbStAppXsController {
}
@PostMapping
(
"/deleteXs"
)
@LogOper
(
czxxLbdm
=
"04"
,
yymcJyqk
=
"07
01
"
,
czxxJyqk
=
"删除线索协同线索"
)
@LogOper
(
czxxLbdm
=
"04"
,
yymcJyqk
=
"07
12
"
,
czxxJyqk
=
"删除线索协同线索"
)
public
R
deleteXs
(
String
xxzjbh
){
try
{
tbStAppXsService
.
deleteXs
(
xxzjbh
);
...
...
@@ -89,7 +89,7 @@ public class TbStAppXsController {
}
@PostMapping
(
"/selectXsByXxzjbh"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"07
01
"
,
czxxJyqk
=
"查询线索协同线索"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"07
12
"
,
czxxJyqk
=
"查询线索协同线索"
)
public
R
selectXsByXxzjbh
(
String
xxzjbh
){
try
{
TbStAppXs
xs
=
tbStAppXsService
.
selectXsByXxzjbh
(
xxzjbh
);
...
...
@@ -101,7 +101,7 @@ public class TbStAppXsController {
}
@PostMapping
(
"/reportToXs"
)
@LogOper
(
czxxLbdm
=
"03"
,
yymcJyqk
=
"07
01
"
,
czxxJyqk
=
"上报线索协同线索"
)
@LogOper
(
czxxLbdm
=
"03"
,
yymcJyqk
=
"07
12
"
,
czxxJyqk
=
"上报线索协同线索"
)
public
R
reportToXs
(
String
xxzjbh
){
try
{
tbStAppXsService
.
reportToXs
(
xxzjbh
);
...
...
src/main/java/org/springblade/founder/xcxt/mapper/TbStAppXsMapper.xml
View file @
bae346ee
...
...
@@ -7,7 +7,7 @@
from (
SELECT
<include
refid=
"selectXsField"
/>
FROM
TB_ST_APP_XS
FROM
tb_st_app_xs
where XXSC_PDBZ = '0'
<include
refid=
"selectXsParam"
/>
order by DJSJ desc
...
...
@@ -18,14 +18,14 @@
<select
id=
"selectCountByParam"
resultType=
"java.lang.Integer"
>
select count(1)
from
TB_ST_APP_XS
from
tb_st_app_xs
where XXSC_PDBZ = '0'
<include
refid=
"selectXsParam"
/>
</select>
<select
id=
"selectXsByXxzjbh"
resultType=
"org.springblade.founder.xcxt.entity.TbStAppXs"
>
select
<include
refid=
"selectXsField"
/>
from
TB_ST_APP_XS
from
tb_st_app_xs
where XXSC_PDBZ = '0'
and XXZJBH = #{xxzjbh,jdbcType=VARCHAR}
</select>
...
...
src/main/java/org/springblade/founder/xcxx/controller/TbStAppWzxxController.java
View file @
bae346ee
...
...
@@ -19,7 +19,7 @@ public class TbStAppWzxxController {
private
TbStAppWzxxService
tbStAppWzxxService
;
@PostMapping
(
"/saveNewWzxx"
)
@LogOper
(
czxxLbdm
=
"02"
,
yymcJyqk
=
"07
0
1"
,
czxxJyqk
=
"新增位置信息"
)
@LogOper
(
czxxLbdm
=
"02"
,
yymcJyqk
=
"07
1
1"
,
czxxJyqk
=
"新增位置信息"
)
public
R
saveNewWzxx
(
TbStAppWzxx
wzxx
){
try
{
String
xxzjbh
=
tbStAppWzxxService
.
saveNewWzxx
(
wzxx
);
...
...
@@ -34,7 +34,7 @@ public class TbStAppWzxxController {
}
@PostMapping
(
"/updateWzxx"
)
@LogOper
(
czxxLbdm
=
"03"
,
yymcJyqk
=
"07
0
1"
,
czxxJyqk
=
"更新位置信息"
)
@LogOper
(
czxxLbdm
=
"03"
,
yymcJyqk
=
"07
1
1"
,
czxxJyqk
=
"更新位置信息"
)
public
R
updateWzxx
(
TbStAppWzxx
wzxx
){
try
{
String
xxzjbh
=
tbStAppWzxxService
.
updateWzxx
(
wzxx
);
...
...
@@ -46,7 +46,7 @@ public class TbStAppWzxxController {
}
@PostMapping
(
"/deleteWzxx"
)
@LogOper
(
czxxLbdm
=
"04"
,
yymcJyqk
=
"07
0
1"
,
czxxJyqk
=
"修改位置信息"
)
@LogOper
(
czxxLbdm
=
"04"
,
yymcJyqk
=
"07
1
1"
,
czxxJyqk
=
"修改位置信息"
)
public
R
deleteWzxx
(
String
xxzjbh
){
try
{
tbStAppWzxxService
.
deleteWzxx
(
xxzjbh
);
...
...
@@ -58,7 +58,7 @@ public class TbStAppWzxxController {
}
@PostMapping
(
"/selectList"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"07
0
1"
,
czxxJyqk
=
"查询位置信息"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"07
1
1"
,
czxxJyqk
=
"查询位置信息"
)
public
R
selectList
(
TbStAppWzxx
wzxx
){
try
{
Map
<
String
,
Object
>
resultMap
=
tbStAppWzxxService
.
selectList
(
wzxx
);
...
...
src/main/java/org/springblade/founder/xcxx/controller/XcxxController.java
View file @
bae346ee
...
...
@@ -25,7 +25,7 @@ public class XcxxController {
private
XcxxService
xcxxService
;
@PostMapping
(
"/saveXcxx"
)
@LogOper
(
czxxLbdm
=
"02"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"新增app现场信息"
)
@LogOper
(
czxxLbdm
=
"02"
,
yymcJyqk
=
"070
8
"
,
czxxJyqk
=
"新增app现场信息"
)
public
R
saveXcxx
(
TbStAppXcxx
tbStAppXcxx
){
try
{
String
xcbh
=
xcxxService
.
saveXcxx
(
tbStAppXcxx
);
...
...
@@ -51,7 +51,7 @@ public class XcxxController {
}
@PostMapping
(
"/getXcxxListByParam"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"查询app现场信息列表"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
8
"
,
czxxJyqk
=
"查询app现场信息列表"
)
public
R
getXcxxListByParam
(
TbStAppXcxx
tbStAppXcxx
){
try
{
Map
<
String
,
Object
>
resultMap
=
xcxxService
.
getXcxxListByParam
(
tbStAppXcxx
);
...
...
@@ -63,7 +63,7 @@ public class XcxxController {
}
@PostMapping
(
"/getXcxxListByGlxx"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"查询关联下的现场信息"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
8
"
,
czxxJyqk
=
"查询关联下的现场信息"
)
public
R
getXcxxListByGlxx
(
String
glxxXxzjbh
,
String
glxxlx
){
try
{
Map
<
String
,
Object
>
resultMap
=
xcxxService
.
getXcxxListByAsjbh
(
glxxXxzjbh
,
glxxlx
);
...
...
@@ -75,7 +75,7 @@ public class XcxxController {
}
@PostMapping
(
"/getXcxxByXcbh"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"查询app现场信息详情"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
8
"
,
czxxJyqk
=
"查询app现场信息详情"
)
public
R
getXcxxByXcbh
(
String
xcbh
){
try
{
TbStAppXcxx
tbStAppXcxx
=
xcxxService
.
getXcxxByXcbh
(
xcbh
);
...
...
@@ -87,7 +87,7 @@ public class XcxxController {
}
@PostMapping
(
"/updateXcxx"
)
@LogOper
(
czxxLbdm
=
"03"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"修改app现场信息"
)
@LogOper
(
czxxLbdm
=
"03"
,
yymcJyqk
=
"070
8
"
,
czxxJyqk
=
"修改app现场信息"
)
public
R
updateXcxx
(
TbStAppXcxx
tbStAppXcxx
){
try
{
xcxxService
.
updateXcxx
(
tbStAppXcxx
);
...
...
@@ -99,7 +99,7 @@ public class XcxxController {
}
@PostMapping
(
"/deleteXcxx"
)
@LogOper
(
czxxLbdm
=
"04"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"删除app现场信息"
)
@LogOper
(
czxxLbdm
=
"04"
,
yymcJyqk
=
"070
8
"
,
czxxJyqk
=
"删除app现场信息"
)
public
R
deleteXcxx
(
String
xcbh
){
try
{
xcxxService
.
deleteXcxx
(
xcbh
);
...
...
@@ -122,7 +122,7 @@ public class XcxxController {
}
@RequestMapping
(
"/getFile/{xxzjbh}"
)
@LogOper
(
czxxLbdm
=
"07"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"app现场信息附件下载"
)
@LogOper
(
czxxLbdm
=
"07"
,
yymcJyqk
=
"070
8
"
,
czxxJyqk
=
"app现场信息附件下载"
)
public
R
getFile
(
@PathVariable
String
xxzjbh
){
try
{
HttpServletResponse
response
=
((
ServletRequestAttributes
)
RequestContextHolder
.
getRequestAttributes
()).
getResponse
();
...
...
src/main/java/org/springblade/founder/xcxx/entity/TbStAppXcxxFj.java
View file @
bae346ee
...
...
@@ -38,6 +38,8 @@ public class TbStAppXcxxFj extends BaseModel {
private
Long
fjDzwjdx
;
//附件位置
private
String
fjDzwjwz
;
//录音文字
private
String
fjLywz
;
@TableField
(
exist
=
false
)
private
MultipartFile
file
;
...
...
src/main/java/org/springblade/founder/xcxx/mapper/XcxxFjMapper.xml
View file @
bae346ee
...
...
@@ -9,6 +9,7 @@
FJMS as fjms,
fj_dzwjbt as fjDzwjbt,
fj_dzwjgs as fjDzwjgs,
fj_lywz as fjLywz,
fj_dzwjdx as fjDzwjdx
from tb_st_app_xcxxfj
where glxx_xxzjbh = #{xcbh}
...
...
src/main/java/org/springblade/founder/xcxx/mapper/XcxxMapper.xml
View file @
bae346ee
...
...
@@ -64,7 +64,7 @@
XXRBK_PDBZ ,
XXSC_PDBZ ,
CKSJ
FROM
TB_ST_APP_XCXX
FROM
tb_st_app_xcxx
where xxsc_pdbz = '0'
<if
test=
"tbStAppXcxx.xcmc != null and tbStAppXcxx.xcmc != ''"
>
AND (XCMC like '%' || #{tbStAppXcxx.xcmc , jdbcType=VARCHAR } || '%' or
...
...
@@ -116,7 +116,7 @@
<select
id=
"selectPageCount"
resultType=
"java.lang.Integer"
>
SELECT
count(1)
FROM
TB_ST_APP_XCXX
FROM
tb_st_app_xcxx
where xxsc_pdbz = '0'
<if
test=
"tbStAppXcxx.xcmc != null and tbStAppXcxx.xcmc != ''"
>
AND (XCMC like '%' || #{tbStAppXcxx.xcmc , jdbcType=VARCHAR } || '%' or
...
...
src/main/java/org/springblade/founder/xcxx/service/impl/XcxxServiceImpl.java
View file @
bae346ee
...
...
@@ -56,6 +56,7 @@ public class XcxxServiceImpl implements XcxxService {
XzxtUser
xzxtUser
=
SecureUtil
.
getUserXzxt
();
String
xxzjbh
=
xxzjbhService
.
getXxzjbh
(
xzxtUser
.
getUnitcode
());
tbStAppXcxx
.
setXcbh
(
xxzjbh
);
tbStAppXcxx
.
setXxscPdbz
(
"0"
);
Utils
.
setUserDjxxAndCzxx
(
tbStAppXcxx
);
xcxxMapper
.
insert
(
tbStAppXcxx
);
glfjxx
(
tbStAppXcxx
);
...
...
@@ -66,7 +67,7 @@ public class XcxxServiceImpl implements XcxxService {
public
String
saveOneFj
(
TbStAppXcxxFj
tbStAppXcxxFj
)
throws
IOException
{
XzxtUser
xzxtUser
=
SecureUtil
.
getUserXzxt
();
MultipartFile
file
=
tbStAppXcxxFj
.
getFile
();
if
(
file
!=
null
)
{
if
(
file
!=
null
&&
!
"3"
.
equals
(
tbStAppXcxxFj
.
getFjlx
())
)
{
String
xxzjbh
=
xxzjbhService
.
getXxzjbh
(
xzxtUser
.
getUnitcode
());
String
fileName
=
file
.
getOriginalFilename
();
String
suffix
=
"."
+
FilenameUtils
.
getExtension
(
fileName
);
...
...
@@ -82,6 +83,17 @@ public class XcxxServiceImpl implements XcxxService {
setOps
.
add
(
xxzjbh
);
}
return
xxzjbh
;
}
else
if
(
"3"
.
equals
(
tbStAppXcxxFj
.
getFjlx
())){
String
xxzjbh
=
xxzjbhService
.
getXxzjbh
(
xzxtUser
.
getUnitcode
());
tbStAppXcxxFj
.
setXxzjbh
(
xxzjbh
);
tbStAppXcxxFj
.
setFjDzwjbt
(
"录音文件"
);
Utils
.
setUserDjxxAndCzxx
(
tbStAppXcxxFj
);
xcxxFjMapper
.
insert
(
tbStAppXcxxFj
);
if
(
StringUtils
.
isEmpty
(
tbStAppXcxxFj
.
getGlxxXxzjbh
()))
{
BoundSetOperations
<
String
,
String
>
setOps
=
redisTemplate
.
boundSetOps
(
"xcxxfj-hc"
);
setOps
.
add
(
xxzjbh
);
}
return
xxzjbh
;
}
return
null
;
}
...
...
@@ -160,6 +172,9 @@ public class XcxxServiceImpl implements XcxxService {
TbStAppXcxx
tbStAppXcxx
=
new
TbStAppXcxx
();
tbStAppXcxx
.
setGlxxXxzjbh
(
glxxXxzjbh
);
tbStAppXcxx
.
setGlxxlx
(
glxxlx
);
tbStAppXcxx
.
setPage
(
1
);
tbStAppXcxx
.
setRows
(
100
);
Utils
.
setPageParams
(
tbStAppXcxx
);
List
<
TbStAppXcxx
>
rows
=
xcxxMapper
.
selectPageList
(
tbStAppXcxx
);
Integer
total
=
xcxxMapper
.
selectPageCount
(
tbStAppXcxx
);
HashMap
<
String
,
Object
>
resultMap
=
new
HashMap
<>();
...
...
src/main/java/org/springblade/founder/xxtz/mapper/XxtzMapper.xml
View file @
bae346ee
...
...
@@ -19,38 +19,37 @@
<select
id=
"selectHcslByDjr"
resultType=
"java.lang.Integer"
>
select count(1)
from sys_gnsyrz
where yymc_jyqk
= '0701'
where yymc_jyqk
IN ('0701', '0702', '0703', '0706')
and xxsc_pdbz = '0'
and czlxdm in ('01', '02')
and xxdjry_gmsfhm = #{zjhm,jdbcType=VARCHAR}
</select>
<select
id=
"selectXcxxCountByDjr"
resultType=
"java.lang.Integer"
>
select count(1)
from
TB_ST_APP_XCXX
from
tb_st_app_xcxx
where XXSC_PDBZ = '0'
and XXDJRY_GMSFHM = #{zjhm,jdbcType=VARCHAR}
</select>
<select
id=
"selectRyxxCountByDjr"
resultType=
"java.lang.Integer"
>
select count(1)
from
TB_ST_APP_RYXX
from
tb_st_app_ryxx
where XXSC_PDBZ = '0'
and XXDJRY_GMSFHM = #{zjhm,jdbcType=VARCHAR}
</select>
<select
id=
"selectDzblCountByDjr"
resultType=
"java.lang.Integer"
>
select count(1)
from
TB_ST_APP_DZBL
from
tb_st_app_dzbl
where XXSC_PDBZ = '0'
and XXDJRY_GMSFHM = #{zjhm,jdbcType=VARCHAR}
</select>
<select
id=
"selectXsxxCountByDjr"
resultType=
"java.lang.Integer"
>
select count(1)
from
TB_ST_APP_XS
from
tb_st_app_xs
where XXSC_PDBZ = '0'
and XXDJRY_GMSFHM = #{zjhm,jdbcType=VARCHAR}
</select>
<select
id=
"selectXssbCountByDjr"
resultType=
"java.lang.Integer"
>
select count(1)
from
TB_ST_APP_XS
from
tb_st_app_xs
where XXSC_PDBZ = '0'
and XSZT = '1'
and XXDJRY_GMSFHM = #{zjhm,jdbcType=VARCHAR}
...
...
src/main/java/org/springblade/founder/ydjwhc/controller/BjHcController.java
View file @
bae346ee
...
...
@@ -43,7 +43,7 @@ public class BjHcController {
}
@PostMapping
(
"/clsahcByCphm"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"车辆背景核查"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
3
"
,
czxxJyqk
=
"车辆背景核查"
)
public
R
clsahcByCphm
(
String
cphm
){
try
{
if
(
StringUtils
.
isEmpty
(
cphm
)){
...
...
@@ -61,7 +61,7 @@ public class BjHcController {
}
@PostMapping
(
"/znjsByHm"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"智能检索"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
6
"
,
czxxJyqk
=
"智能检索"
)
public
R
znjsByHm
(
String
hm
){
try
{
if
(
StringUtils
.
isEmpty
(
hm
)){
...
...
@@ -79,7 +79,7 @@ public class BjHcController {
}
@PostMapping
(
"/saveRxbdTask"
)
@LogOper
(
czxxLbdm
=
"02"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"人像比对"
)
@LogOper
(
czxxLbdm
=
"02"
,
yymcJyqk
=
"070
2
"
,
czxxJyqk
=
"人像比对"
)
public
R
saveRxbdTask
(
TbStAppRxhcrw
rxhcrw
){
try
{
if
(
StringUtils
.
isEmpty
(
rxhcrw
.
getTaskId
())){
...
...
@@ -109,7 +109,7 @@ public class BjHcController {
}
@PostMapping
(
"/deleteRxhcrw/{taskId}"
)
@LogOper
(
czxxLbdm
=
"04"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"删除人像比对任务"
)
@LogOper
(
czxxLbdm
=
"04"
,
yymcJyqk
=
"070
2
"
,
czxxJyqk
=
"删除人像比对任务"
)
public
R
deleteRxhcrw
(
@PathVariable
String
taskId
){
try
{
tbStAppRxhcrwService
.
deleteRxhcrw
(
taskId
);
...
...
src/main/java/org/springblade/founder/ydjwhc/controller/ZbxxjsController.java
View file @
bae346ee
...
...
@@ -20,7 +20,7 @@ public class ZbxxjsController {
private
ZbxxjsService
zbxxjsService
;
@RequestMapping
(
"/zbajjs"
)
//周边案件检索
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"周边案件检索"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
7
"
,
czxxJyqk
=
"周边案件检索"
)
public
R
getZbAjxxByJwd
(
ZbxxjsQueryParam
queryParam
)
{
try
{
if
(
queryParam
.
isEmpty
()){
...
...
@@ -35,7 +35,7 @@ public class ZbxxjsController {
}
@RequestMapping
(
"/zbryjs"
)
//周边刑侦关注人员检索
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"周边刑侦关注人员检索"
)
@LogOper
(
czxxLbdm
=
"01"
,
yymcJyqk
=
"070
7
"
,
czxxJyqk
=
"周边刑侦关注人员检索"
)
public
R
getZbRyxxByJwd
(
ZbxxjsQueryParam
queryParam
)
{
try
{
if
(
queryParam
.
isEmpty
()){
...
...
src/main/java/org/springblade/modules/auth/controller/AuthController.java
View file @
bae346ee
...
...
@@ -33,6 +33,8 @@ import org.springblade.core.tool.utils.Func;
import
org.springblade.core.tool.utils.RedisUtil
;
import
org.springblade.core.tool.utils.WebUtil
;
import
org.springblade.founder.log.LogOper
;
import
org.springblade.founder.sbgl.entity.SysAppsb
;
import
org.springblade.founder.sbgl.service.SysAppsbService
;
import
org.springblade.modules.auth.granter.ITokenGranter
;
import
org.springblade.modules.auth.granter.TokenGranterBuilder
;
import
org.springblade.modules.auth.granter.TokenParameter
;
...
...
@@ -51,6 +53,7 @@ import org.springframework.web.bind.annotation.*;
import
javax.annotation.Resource
;
import
java.net.URLDecoder
;
import
java.util.List
;
import
java.util.UUID
;
import
java.util.concurrent.TimeUnit
;
...
...
@@ -68,6 +71,8 @@ public class AuthController {
private
RedisUtil
redisUtil
;
@Autowired
private
IUserService
userService
;
@Autowired
private
SysAppsbService
sysAppsbService
;
@Value
(
"${secretKey}"
)
private
String
secretKey
;
...
...
@@ -77,7 +82,7 @@ public class AuthController {
@PostMapping
(
"token"
)
@ApiOperation
(
value
=
"获取认证token"
,
notes
=
"传入租户ID:tenantId,账号:account,密码:password"
)
@LogOper
(
czxxLbdm
=
"05"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"登陆"
)
@LogOper
(
czxxLbdm
=
"05"
,
yymcJyqk
=
"070
0
"
,
czxxJyqk
=
"登陆"
)
public
R
<
AuthInfo
>
token
(
@ApiParam
(
value
=
"授权类型"
,
required
=
true
)
@RequestParam
(
defaultValue
=
"password"
,
required
=
false
)
String
grantType
,
@ApiParam
(
value
=
"刷新令牌"
)
@RequestParam
(
required
=
false
)
String
refreshToken
,
@ApiParam
(
value
=
"租户ID"
,
required
=
true
)
@RequestParam
(
defaultValue
=
"000000"
,
required
=
false
)
String
tenantId
,
...
...
@@ -100,9 +105,18 @@ public class AuthController {
if
(
userInfo
==
null
||
userInfo
.
getUser
()
==
null
)
{
return
R
.
fail
(
TokenUtil
.
USER_NOT_FOUND
);
}
List
<
String
>
list
=
sysAppsbService
.
getSysAppsbYyBySfzh
(
userInfo
.
getUser
().
getIdentitycard
());
userInfo
.
setPermissions
(
list
);
if
(
userInfo
.
getPermissions
()
==
null
||
userInfo
.
getPermissions
().
size
()
==
0
){
return
R
.
fail
(
TokenUtil
.
USER_NOT_PERMISSIONS
);
}
SysAppsb
sysAppsb
=
sysAppsbService
.
getSysAppsbBySfzh
(
userInfo
.
getUser
().
getIdentitycard
());
if
(
sysAppsb
==
null
)
{
return
R
.
fail
(
"账号未绑定设备!"
);
}
if
(
"1"
.
equals
(
sysAppsb
.
getSbzt
()))
{
return
R
.
fail
(
"设备已挂失,无法登陆!"
);
}
redisTemplate
.
setKeySerializer
(
new
StringRedisSerializer
());
ValueOperations
<
String
,
String
>
ops
=
redisTemplate
.
opsForValue
();
String
key
=
"appUserIdleTime:"
+
userInfo
.
getUser
().
getIdentitycard
();
...
...
@@ -168,7 +182,7 @@ public class AuthController {
@PostMapping
(
"login"
)
@ApiOperation
(
value
=
"登录"
)
@LogOper
(
czxxLbdm
=
"05"
,
yymcJyqk
=
"070
1
"
,
czxxJyqk
=
"登陆"
)
@LogOper
(
czxxLbdm
=
"05"
,
yymcJyqk
=
"070
0
"
,
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
);
...
...
@@ -185,10 +199,22 @@ public class AuthController {
if
(
userInfo
==
null
||
userInfo
.
getUser
()
==
null
)
{
return
R
.
fail
(
TokenUtil
.
USER_NOT_FOUND
);
}
List
<
String
>
list
=
sysAppsbService
.
getSysAppsbYyBySfzh
(
userInfo
.
getUser
().
getIdentitycard
());
userInfo
.
setPermissions
(
list
);
if
(
userInfo
.
getPermissions
()
==
null
||
userInfo
.
getPermissions
().
size
()
==
0
){
return
R
.
fail
(
TokenUtil
.
USER_NOT_PERMISSIONS
);
}
SysAppsb
sysAppsb
=
sysAppsbService
.
getSysAppsbBySfzh
(
userInfo
.
getUser
().
getIdentitycard
());
if
(
sysAppsb
==
null
)
{
return
R
.
fail
(
"账号未绑定设备!"
);
}
if
(
"1"
.
equals
(
sysAppsb
.
getSbzt
()))
{
return
R
.
fail
(
"设备已挂失,无法登陆!"
);
}
redisTemplate
.
setKeySerializer
(
new
StringRedisSerializer
());
ValueOperations
<
String
,
String
>
ops
=
redisTemplate
.
opsForValue
();
String
key
=
"appUserIdleTime:"
+
userInfo
.
getUser
().
getIdentitycard
();
ops
.
set
(
key
,
"1"
,
10
,
TimeUnit
.
MINUTES
);
//存入redis并设置过期时间
return
R
.
data
(
TokenUtil
.
createAuthInfo
(
userInfo
));
}
}
src/main/java/org/springblade/modules/auth/controller/YckzController.java
0 → 100644
View file @
bae346ee
package
org
.
springblade
.
modules
.
auth
.
controller
;
import
org.apache.commons.lang.StringUtils
;
import
org.springblade.core.secure.utils.SecureUtil
;
import
org.springblade.founder.utils.R
;
import
org.springblade.modules.system.entity.XzxtUser
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.redis.core.RedisTemplate
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
/**
* TODO
*
* @author create by lystar
* @date 2023/11/10 15:21
*/
@RestController
@RequestMapping
(
"/yckz"
)
public
class
YckzController
{
@Autowired
private
RedisTemplate
<
String
,
String
>
redisTemplate
;
@RequestMapping
(
"/checkYckz"
)
public
R
checkYckz
()
{
XzxtUser
user
=
SecureUtil
.
getUserXzxt
();
String
s
=
redisTemplate
.
opsForValue
().
get
(
"appYckz:"
+
user
.
getIdentitycard
());
return
R
.
ok
().
data
(
"flag"
,
StringUtils
.
isEmpty
(
s
));
}
}
src/main/java/org/springblade/modules/auth/granter/PasswordTokenGranter.java
View file @
bae346ee
...
...
@@ -58,7 +58,7 @@ public class PasswordTokenGranter implements ITokenGranter {
// userInfo = userService.userInfo(tenantId, account, DigestUtil.encrypt(password));
// }
}
else
if
(
Func
.
isNoneBlank
(
zjhm
))
{
userInfo
=
userService
.
userInfoR
(
tenantId
,
account
,
DigestUtil
.
encrypt
(
password
)
,
zjhm
);
userInfo
=
userService
.
userInfoR
(
tenantId
,
account
,
null
,
zjhm
);
}
return
userInfo
;
}
...
...
src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
View file @
bae346ee
...
...
@@ -86,6 +86,7 @@ public class TokenUtil {
authInfo
.
setUserId
(
user
.
getId
());
authInfo
.
setUserName
(
user
.
getTrueName
());
authInfo
.
setAuthority
(
Func
.
join
(
userInfo
.
getRoles
()));
authInfo
.
setPermission
(
Func
.
join
(
userInfo
.
getPermissions
()));
authInfo
.
setAccessToken
(
accessToken
.
getToken
());
authInfo
.
setExpiresIn
(
accessToken
.
getExpire
());
authInfo
.
setRefreshToken
(
createRefreshToken
(
userInfo
).
getToken
());
...
...
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