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
e4c438db
Commit
e4c438db
authored
Aug 21, 2023
by
Guojunfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、用户表新增2字段区分是否为公共账号和是否为指挥中心公共账号
2、若用户级别是D,则直接能看所有全部侦查专项 3、部分bug调整
parent
3771a7e7
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
94 additions
and
36 deletions
+94
-36
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SysUser.java
+16
-0
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/XcrwDto.java
+6
-0
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/Zczx.java
+3
-0
common/common_utils/src/main/java/com/founder/commonutils/util/Base64Util.java
+7
-9
common/service_base/src/main/java/com/founder/servicebase/controller/SysUserController.java
+1
-1
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ApproveController.java
+18
-24
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/XcrwController.java
+16
-1
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxController.java
+18
-1
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ZczxMapper.xml
+4
-0
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/ZczxServiceImpl.java
+5
-0
No files found.
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SysUser.java
View file @
e4c438db
...
...
@@ -153,6 +153,22 @@ public class SysUser extends Model<SysUser> {
private
String
jddwname
;
/**
* 是否为网合公共账号
* 0:否
* 1:是
*/
@ApiModelProperty
(
value
=
"是否为网合公共账号"
)
private
String
whggzhFlag
;
/**
* 是否为网合指挥中心账号(33个分局指挥)
* 0:否
* 1:是
*/
@ApiModelProperty
(
value
=
"是否为网合指挥中心账号(33个分局指挥)"
)
private
String
whzhzxFlag
;
/**
* 获取主键值
*
* @return 主键值
...
...
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/XcrwDto.java
View file @
e4c438db
...
...
@@ -264,5 +264,11 @@ public class XcrwDto extends BaseDto {
@ApiModelProperty
(
value
=
"单位名称"
)
private
String
unitname
;
@ApiModelProperty
(
value
=
"联系电话"
)
private
String
telephone
;
@ApiModelProperty
(
value
=
"身份证号"
)
private
String
identitycard
;
//反馈要前端传个人信息结束-------------------------------------------
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/Zczx.java
View file @
e4c438db
...
...
@@ -134,6 +134,9 @@ public class Zczx extends Model<Zczx> {
@ApiModelProperty
(
value
=
"其他协查编号"
)
private
String
qtxcbh
;
@ApiModelProperty
(
value
=
"提醒状态"
)
private
String
txzt
;
@ApiModelProperty
(
value
=
"侦查专项角色表主键编号"
)
@TableField
(
exist
=
false
)
private
String
roleNo
;
...
...
common/common_utils/src/main/java/com/founder/commonutils/util/Base64Util.java
View file @
e4c438db
...
...
@@ -13,8 +13,6 @@ import java.net.HttpURLConnection;
import
java.net.URL
;
import
java.util.Base64
;
import
static
com
.
founder
.
commonutils
.
util
.
CodeUtils
.
addZeroForNum
;
/**
* Base64加密,解密
*/
...
...
@@ -69,16 +67,16 @@ public class Base64Util {
}
public
static
void
main
(
String
[]
args
)
{
String
str
=
"441978010400"
;
System
.
out
.
println
(
str
.
replaceAll
(
"0+$"
,
""
));
//去掉后面全部0
String
s
=
str
.
replaceAll
(
"0+$"
,
""
);
String
substring
=
s
.
substring
(
0
,
s
.
length
()
-
2
);
System
.
out
.
println
(
substring
);
//去掉最后2位
System
.
out
.
println
(
addZeroForNum
(
substring
,
12
));
//补全12位
//
String str = "441978010400";
//
System.out.println(str.replaceAll("0+$", ""));//去掉后面全部0
//
String s = str.replaceAll("0+$", "");
//
String substring = s.substring(0, s.length() - 2);
//
System.out.println(substring);//去掉最后2位
//
System.out.println(addZeroForNum(substring, 12));//补全12位
// System.out.println(Base64Util.encode("dk123456"));
// System.out.println(Base64Util.decode("ZGsxMjM0NTY
="));
System
.
out
.
println
(
Base64Util
.
decode
(
"aHkxNTI0MjM
="
));
// System.out.println(Base64Util.encode("123456"));
// System.out.println(Base64Util.decode("YmoxNTAxNDc="));
...
...
common/service_base/src/main/java/com/founder/servicebase/controller/SysUserController.java
View file @
e4c438db
...
...
@@ -116,7 +116,7 @@ public class SysUserController extends ApiController {
}
/**
* 获取一级审批用户列表
* 获取一级审批用户列表
(当前登陆用户所属的分局下有审批权限的人)
* 步骤:
* 1:获取当前登陆用户的用户信息
* 2:判断用户是否拥有一级审批权限
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ApproveController.java
View file @
e4c438db
...
...
@@ -141,7 +141,23 @@ public class ApproveController extends ApiController {
@PostMapping
(
"sp"
)
@ApiOperation
(
value
=
"审批"
)
@OperLog
(
message
=
"审批"
,
operation
=
OperationType
.
UPDATE
)
public
MapRestResult
sp
(
@RequestBody
ApproveDto
approveDto
)
throws
Exception
{
@Transactional
public
MapRestResult
sp
(
@RequestBody
ApproveDto
approveDto
){
String
targetJsrzh
=
approveDto
.
getTargetJsrzh
();
//前端传入目标接收人账号(移交、退回使用字段)
SysUser
targetUser
=
null
;
if
(
StringUtils
.
isNotBlank
(
targetJsrzh
)){
//查一下用户表的信息
QueryWrapper
<
SysUser
>
sysUserQueryWrapper
=
new
QueryWrapper
<>();
sysUserQueryWrapper
.
eq
(
"username"
,
targetJsrzh
);
sysUserQueryWrapper
.
eq
(
"scbz"
,
"0"
);
targetUser
=
this
.
sysUserService
.
getOne
(
sysUserQueryWrapper
);
if
(
targetUser
==
null
)
{
return
new
MapRestResult
(
201
,
"目标接收人账号不存在"
,
null
);
}
}
//当前登陆人的信息
ServletRequestAttributes
requestAttributes
=
(
ServletRequestAttributes
)
RequestContextHolder
.
getRequestAttributes
();
...
...
@@ -198,18 +214,6 @@ public class ApproveController extends ApiController {
//如果审批类型时"移交" 且 审批状态是 "审批通过",去子任务表(tb_wh_subtask)把接收人等字段覆盖掉
if
(
StringUtils
.
isNotBlank
(
auditType
)
&&
auditType
.
equals
(
"7"
)
&&
StringUtils
.
isNotBlank
(
auditStatus
)
&&
auditStatus
.
equals
(
"2"
))
{
String
targetJsrzh
=
approveDto
.
getTargetJsrzh
();
//前端传入目标接收人账号(移交、退回使用字段)
//查一下用户表的信息
QueryWrapper
<
SysUser
>
sysUserQueryWrapper
=
new
QueryWrapper
<>();
sysUserQueryWrapper
.
eq
(
"username"
,
targetJsrzh
);
sysUserQueryWrapper
.
eq
(
"scbz"
,
"0"
);
SysUser
targetUser
=
this
.
sysUserService
.
getOne
(
sysUserQueryWrapper
);
if
(
targetUser
==
null
)
{
//抛异常回滚
throw
new
Exception
(
"目标账号不存在"
);
// return new MapRestResult(201,"目标账号不存在!",null);
}
UpdateWrapper
<
SubTask
>
subTaskUpdateWrapper
=
new
UpdateWrapper
<>();
subTaskUpdateWrapper
.
eq
(
"id"
,
approveDto
.
getFlowNo
());
//审批编号(连接具体业务表的数据主键)
SubTask
subTask
=
new
SubTask
();
...
...
@@ -226,17 +230,7 @@ public class ApproveController extends ApiController {
}
//退回
if
(
StringUtils
.
isNotBlank
(
auditType
)
&&
auditType
.
equals
(
"8"
)
&&
StringUtils
.
isNotBlank
(
auditStatus
)
&&
auditStatus
.
equals
(
"2"
))
{
String
targetJsrzh
=
approveDto
.
getTargetJsrzh
();
//前端传入目标接收人账号(移交、退回使用字段)
//查一下用户表的信息
QueryWrapper
<
SysUser
>
sysUserQueryWrapper
=
new
QueryWrapper
<>();
sysUserQueryWrapper
.
eq
(
"username"
,
targetJsrzh
);
sysUserQueryWrapper
.
eq
(
"scbz"
,
"0"
);
SysUser
targetUser
=
this
.
sysUserService
.
getOne
(
sysUserQueryWrapper
);
if
(
targetUser
==
null
)
{
//抛异常回滚
throw
new
Exception
(
"目标账号不存在"
);
// return new MapRestResult(201,"目标账号不存在!",null);
}
UpdateWrapper
<
SubTask
>
subTaskUpdateWrapper
=
new
UpdateWrapper
<>();
subTaskUpdateWrapper
.
eq
(
"id"
,
approveDto
.
getFlowNo
());
//审批编号(连接具体业务表的数据主键)
SubTask
subTask
=
new
SubTask
();
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/XcrwController.java
View file @
e4c438db
...
...
@@ -248,6 +248,7 @@ public class XcrwController extends ApiController {
String
xcrwbh
=
xcrwDto
.
getXcrwbh
();
Xcrw
xcrw
=
this
.
xcrwService
.
getById
(
xcrwbh
);
String
zxbh
=
xcrw
.
getZxbh
();
//协查任务的专项编号,用于更新侦查专项的提醒标志
if
(
null
==
xcrw
)
{
return
new
MapRestResult
().
error
(
"协查任务不存在"
);
}
...
...
@@ -260,9 +261,9 @@ public class XcrwController extends ApiController {
return
new
MapRestResult
().
error
(
"协查任务已退回"
);
}
BeanUtil
.
copyProperties
(
xcrwDto
,
xcrw
);
//协查任务反馈,如果在公共账号,登记个人信息,由前端传过来,反馈人、更新人信息用该值
//重点:把该条子任务的接收人账号更新为当前反馈的这个人的用户名
xcrw
.
setXcrwjsrzh
(
xcrwDto
.
getUsername
());
//用户名
xcrw
.
setXcrwfkrxm
(
xcrwDto
.
getTrueName
());
//姓名
...
...
@@ -296,6 +297,11 @@ public class XcrwController extends ApiController {
xcrwFile
.
setFileType
(
"2"
);
xcrwFileService
.
save
(
xcrwFile
);
}
//找到该协查任务上面的侦查专项,把该侦查专项的提醒状态变为"1"
Zczx
zczx
=
new
Zczx
();
zczx
.
setZxbh
(
zxbh
);
zczx
.
setTxzt
(
"1"
);
this
.
zczxService
.
updateById
(
zczx
);
return
new
MapRestResult
();
}
...
...
@@ -324,6 +330,7 @@ public class XcrwController extends ApiController {
return
new
MapRestResult
().
error
(
"协查任务已退回"
);
}
BeanUtil
.
copyProperties
(
xcrwDto
,
xcrw
);
xcrw
.
setXcrwlzsj
(
new
Date
());
//更新协查任务信息(这里主要为接收人信息)
this
.
xcrwService
.
updateById
(
xcrw
);
return
new
MapRestResult
();
...
...
@@ -334,9 +341,11 @@ public class XcrwController extends ApiController {
@PostMapping
(
"sendBack"
)
@ApiOperation
(
value
=
"协查任务退回"
)
@OperLog
(
message
=
"协查任务退回"
,
operation
=
OperationType
.
UPDATE
)
@Transactional
public
MapRestResult
sendBack
(
@RequestBody
XcrwDto
xcrwDto
)
{
String
xcrwbh
=
xcrwDto
.
getXcrwbh
();
Xcrw
xcrw
=
this
.
xcrwService
.
getById
(
xcrwbh
);
String
zxbh
=
xcrw
.
getZxbh
();
//协查任务的专项编号,用于更新侦查专项的提醒标志
if
(
null
==
xcrw
)
{
return
new
MapRestResult
().
error
(
"协查任务不存在"
);
}
...
...
@@ -353,6 +362,12 @@ public class XcrwController extends ApiController {
xcrw
.
setXcrwThzt
(
"1"
);
//设置协查任务退回判断标志为1,代表已退回
//更新协查任务信息
this
.
xcrwService
.
updateById
(
xcrw
);
//找到该协查任务上面的侦查专项,把该侦查专项的提醒状态变为"1"
Zczx
zczx
=
new
Zczx
();
zczx
.
setZxbh
(
zxbh
);
zczx
.
setTxzt
(
"1"
);
this
.
zczxService
.
updateById
(
zczx
);
return
new
MapRestResult
();
}
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxController.java
View file @
e4c438db
...
...
@@ -159,7 +159,7 @@ public class ZczxController extends ApiController {
ZczxRole
zczxRole
=
list
.
get
(
i
);
String
unitcode
=
zczxRole
.
getUnitcode
();
if
(
unitcode
.
equals
(
targetUnitCode
))
{
return
new
MapRestResult
(
201
,
"该侦查专项分享至【"
+
targetUnitName
+
"】已处于待审批状态或已分享状态!"
,
null
);
return
new
MapRestResult
(
201
,
"该侦查专项分享至【"
+
targetUnitName
+
"】已处于待审批状态或已分享状态!"
,
null
);
}
}
...
...
@@ -385,5 +385,21 @@ public class ZczxController extends ApiController {
return
new
MapRestResult
();
}
//取消状态更新提醒高亮
@GetMapping
(
"cancelRemind"
)
@ApiOperation
(
value
=
"取消状态更新提醒高亮"
)
@OperLog
(
message
=
"取消状态更新提醒高亮"
,
operation
=
OperationType
.
UPDATE
)
@Transactional
public
MapRestResult
cancelRemind
(
@RequestParam
(
"zxbh"
)
String
zxbh
)
{
if
(
StringUtils
.
isBlank
(
zxbh
))
{
return
new
MapRestResult
(
201
,
"专项编号不能为空"
,
null
);
}
Zczx
zczx
=
new
Zczx
();
zczx
.
setZxbh
(
zxbh
);
zczx
.
setTxzt
(
"0"
);
this
.
zczxService
.
updateById
(
zczx
);
return
new
MapRestResult
<>();
}
}
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ZczxMapper.xml
View file @
e4c438db
...
...
@@ -32,6 +32,7 @@
z.qtxcbh,
z.jqbh,
z.asjbh,
z.txzt,
q.bjnr as jqJyqk,
j.ajmc,
j.jyaq as asjJyqk,
...
...
@@ -163,6 +164,7 @@
z.qtxcbh,
z.jqbh,
z.asjbh,
z.txzt,
q.bjnr as jqJyqk,
j.ajmc,
j.jyaq as asjJyqk,
...
...
@@ -305,6 +307,7 @@
z.qtxcbh,
z.jqbh,
z.asjbh,
z.txzt,
q.bjnr as jqJyqk,
j.ajmc,
j.jyaq as asjJyqk,
...
...
@@ -447,6 +450,7 @@
z.qtxcbh,
z.jqbh,
z.asjbh,
z.txzt,
q.bjnr as jqJyqk,
j.ajmc,
j.jyaq as asjJyqk,
...
...
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/ZczxServiceImpl.java
View file @
e4c438db
...
...
@@ -41,6 +41,7 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
SysUser
user
=
(
SysUser
)
request
.
getAttribute
(
"user"
);
String
policemanid
=
user
.
getPolicemanid
();
String
unitcode
=
user
.
getUnitcode
();
//机构代码
String
grade
=
user
.
getGrade
();
//判断当前登陆的用户是什么级别 K=科所队 D=市局 X=分局
/**
* 分组1_我参与的:警号(policemanid)、角色ID(roleId)、角色名字(roleName)、侦查专项参与状态(zczxCyzt)为一组查询
* 分组2_我收藏的:警号、侦查专项收藏状态为一组查询
...
...
@@ -153,9 +154,13 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
String
s
=
unitcode
;
//全镇街的,分享状态为0
if
(
"2"
.
equals
(
zczxDto
.
getCxlx
()))
{
if
(
grade
.
equals
(
"D"
)){
// D:市局单位
zczxDto
.
setUnitcode
(
""
);
//查全部,不需要分
}
else
{
s
=
unitcode
.
substring
(
0
,
6
);
zczxDto
.
setUnitcode
(
s
);
}
}
//我辖区的,分享状态为0
if
(
"3"
.
equals
(
zczxDto
.
getCxlx
()))
{
zczxDto
.
setUnitcode
(
s
);
...
...
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