Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xzxt-qyxzpt-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
刘良浪
xzxt-qyxzpt-report
Commits
926ff29a
Commit
926ff29a
authored
Nov 20, 2023
by
liulianglang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
权限设置
parent
909b127e
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
117 additions
and
18 deletions
+117
-18
src/main/java/org/springblade/founder/utils/HMacUtil.java
+5
-0
src/main/java/org/springblade/founder/xzqq/controller/TbYwXzqqXxController.java
+6
-0
src/main/java/org/springblade/founder/xzqq/entity/TbYwXzqqXx.java
+8
-0
src/main/java/org/springblade/founder/xzqq/mapper/TbYwXzqqXxMapper.java
+4
-0
src/main/java/org/springblade/founder/xzqq/mapper/TbYwXzqqXxMapper.xml
+32
-9
src/main/java/org/springblade/founder/xzqq/service/TbYwXzqqXxService.java
+1
-1
src/main/java/org/springblade/founder/xzqq/service/impl/TbYwXzqqXxServiceImpl.java
+40
-2
src/main/java/org/springblade/modules/system/mapper/SysUserMapper.java
+2
-0
src/main/java/org/springblade/modules/system/mapper/SysUserMapper.xml
+16
-3
src/main/java/org/springblade/modules/system/service/impl/ISysUserServiceImpl.java
+3
-3
No files found.
src/main/java/org/springblade/founder/utils/HMacUtil.java
View file @
926ff29a
package
org
.
springblade
.
founder
.
utils
;
import
org.springblade.core.tool.utils.DigestUtil
;
import
javax.crypto.Mac
;
import
javax.crypto.spec.SecretKeySpec
;
public
class
HMacUtil
{
public
static
void
main
(
String
[]
args
)
{
try
{
System
.
out
.
println
(
DigestUtil
.
encrypt
(
"Admin@#123"
));
String
secret
=
HMACSHA256
(
"app_id=XZ15000000&app_key=pSFRNTQQXDJKSjzL&xz_token=2d69c3e2da6e8ecc8e977603×tamp=1591152151950"
,
"zdejRKFNCUSSAIjbvijEdRFxjnzKAI"
);
System
.
out
.
println
(
secret
);
}
catch
(
Exception
e
)
{
...
...
src/main/java/org/springblade/founder/xzqq/controller/TbYwXzqqXxController.java
View file @
926ff29a
...
...
@@ -87,8 +87,14 @@ public class TbYwXzqqXxController {
@PostMapping
(
"/shXzqqXx"
)
public
R
shXzqqXx
(
TbYwXzqqXx
tbYwXzqqXx
)
{
try
{
tbYwXzqqXxService
.
shXzqqXx
(
tbYwXzqqXx
);
return
R
.
ok
().
data
(
"xxzjbh"
,
""
);
}
catch
(
Exception
e
){
e
.
printStackTrace
();
return
R
.
error
(
e
.
getMessage
());
}
}
@PostMapping
(
"/updateXzqqXx"
)
...
...
src/main/java/org/springblade/founder/xzqq/entity/TbYwXzqqXx.java
View file @
926ff29a
...
...
@@ -148,6 +148,14 @@ public class TbYwXzqqXx implements Serializable {
private
List
<
TbYwXzqqXyrxx
>
xyrs
;
private
List
<
TbYwXzqqMjxx
>
mjxxs
;
private
String
idcardparam
;
private
String
cxdwdm
;
private
String
xzdwdm
;
private
String
xzdwmc
;
private
String
xzblnr
;
private
String
userId
;
// 更新人员
public
void
setUpUser
(
XzxtUser
user
){
...
...
src/main/java/org/springblade/founder/xzqq/mapper/TbYwXzqqXxMapper.java
View file @
926ff29a
...
...
@@ -56,6 +56,10 @@ public interface TbYwXzqqXxMapper {
int
insert
(
TbYwXzqqXx
tbYwXzqqXx
);
TbYwDzqqFj
queryFjById
(
String
xxzjbh
);
/*查询字典*/
String
queryNameByCode
(
@Param
(
value
=
"groupid"
)
String
groupid
,
@Param
(
value
=
"code"
)
String
code
);
int
insertFj
(
TbYwDzqqFj
tbYwDzqqFj
);
/**
* 批量新增数据(MyBatis原生foreach方法)
...
...
src/main/java/org/springblade/founder/xzqq/mapper/TbYwXzqqXxMapper.xml
View file @
926ff29a
...
...
@@ -9,7 +9,7 @@
xxzjbh, xzbh, badwmc, badwdm, asjbh, ajmc, ajlbdm,
(select name from sys_dictitem where groupid = 'CODE_AJLB' and code = ajlbdm)
as ajlbmc,
jayq, sqsj, spr_sfzh, spyj, spsj, xzzt,xzmc, xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj
jayq, sqsj, spr_sfzh, spyj, spsj, xzzt,xzmc,
xzdwdm,xzdwmc,xzblnr,
xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj
from tb_yw_xzqq_xx
where xxzjbh = #{xxzjbh}
</select>
...
...
@@ -44,11 +44,11 @@
<!--通过实体作为筛选条件查询-->
<select
id=
"queryAll"
resultType=
"org.springblade.founder.xzqq.entity.TbYwXzqqXx"
>
select
xxzjbh, xzbh, badwmc, badwdm, asjbh, ajmc, ajlbdm,
xxzjbh, xzbh, badwmc, badwdm, asjbh, ajmc, ajlbdm,
xzmc,xzdwdm,xzdwmc,xzblnr,
(select name from sys_dictitem where groupid = 'CODE_AJLB' and code = ajlbdm)
as ajlbmc,
jayq, sqsj, spr_sfzh, spyj, spsj, xzzt,x
zmc, x
xsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj
,(case when xzzt = '1' then '待审核' when xzzt = '2' then '协作中' when xzzt = '4' then '审核不通过' else '已完成' end) as xzztStr
jayq, sqsj, spr_sfzh, spyj, spsj, xzzt,xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj
,(case when xzzt = '
0' then '草稿' when xzzt = '
1' then '待审核' when xzzt = '2' then '协作中' when xzzt = '4' then '审核不通过' else '已完成' end) as xzztStr
from tb_yw_xzqq_xx xx
<where>
and xxsc_pdbz = '0'
...
...
@@ -64,10 +64,12 @@
<if
test=
"idcardparam != null and idcardparam != ''"
>
and (xxdjry_gmsfhm = #{idcardparam} or
#{idcardparam} in (select mjxx.identitycard from tb_yw_xzqq_mjxx mjxx where mjxx.glxxzjbh=xx.xxzjbh)
or xx.xzdwdm=#{cxdwdm}
)
</if>
<if
test=
"xzbh != null and xzbh != ''"
>
and xzbh = #{xzbh}
</if>
...
...
@@ -162,7 +164,7 @@
<if
test=
"idcardparam != null and idcardparam != ''"
>
and (xxdjry_gmsfhm = #{idcardparam} or
#{idcardparam} in (select mjxx.identitycard from tb_yw_xzqq_mjxx mjxx where mjxx.glxxzjbh=xx.xxzjbh)
or xx.xzdwdm=#{cxdwdm}
)
</if>
...
...
@@ -243,8 +245,8 @@
</select>
<!--新增所有列-->
<insert
id=
"insert"
>
insert into tb_yw_xzqq_xx(xxzjbh,xzbh,xzmc, badwmc, badwdm, asjbh, ajmc, ajlbdm, jayq, sqsj, spr_sfzh, spyj, spsj, xzzt, xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj)
values (#{xxzjbh},#{xzbh},#{xzmc}, #{badwmc}, #{badwdm}, #{asjbh}, #{ajmc}, #{ajlbdm}, #{jayq}, #{sqsj}, #{sprSfzh}, #{spyj}, #{spsj}, #{xzzt}, #{xxscPdbz}, #{xxdjdwGajgjgdm}, #{xxdjdwGajgmc}, #{xxdjryXm}, #{xxdjryGmsfhm}, #{xxdjryLxdh}, #{djsj}, #{xxczdwGajgjgdm}, #{xxczdwGajgmc}, #{xxczryXm}, #{xxczryGmsfhm}, #{gxsj})
insert into tb_yw_xzqq_xx(xxzjbh,xzbh,xzmc,
xzdwdm,xzdwmc,xzblnr,
badwmc, badwdm, asjbh, ajmc, ajlbdm, jayq, sqsj, spr_sfzh, spyj, spsj, xzzt, xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj)
values (#{xxzjbh},#{xzbh},#{xzmc},
#{xzdwdm},#{xzdwmc},#{xzblnr},
#{badwmc}, #{badwdm}, #{asjbh}, #{ajmc}, #{ajlbdm}, #{jayq}, #{sqsj}, #{sprSfzh}, #{spyj}, #{spsj}, #{xzzt}, #{xxscPdbz}, #{xxdjdwGajgjgdm}, #{xxdjdwGajgmc}, #{xxdjryXm}, #{xxdjryGmsfhm}, #{xxdjryLxdh}, #{djsj}, #{xxczdwGajgjgdm}, #{xxczdwGajgmc}, #{xxczryXm}, #{xxczryGmsfhm}, #{gxsj})
</insert>
<select
id=
"queryFjById"
resultType=
"org.springblade.founder.xzqq.entity.TbYwDzqqFj"
>
select
...
...
@@ -252,6 +254,19 @@
from xzxt.tb_yw_xzqq_fj
where xxzjbh = #{xxzjbh}
</select>
<select
id=
"queryNameByCode"
resultType=
"java.lang.String"
parameterType=
"java.lang.String"
>
SELECT name FROM sys_dictitem
WHERE scbz='0'
<if
test=
"groupid != null and groupid != ''"
>
AND groupid=#{groupid}
</if>
<if
test=
"code != null and code != ''"
>
AND code=#{code}
</if>
limit 1
</select>
<!--新增所有列-->
<insert
id=
"insertFj"
>
insert into xzxt.tb_yw_xzqq_fj(xxzjbh,dz_xxzjbh, dzwjbt, dzwjgs, dzwjwz, dzwjnr, fjlx, create_time, create_by, update_time, update_by, xxsc_pdbz)
...
...
@@ -284,7 +299,15 @@
<if
test=
"xzmc != null and xzmc != ''"
>
xzmc = #{xzmc},
</if>
<if
test=
"xzdwdm != null and xzdwdm != ''"
>
xzdwdm = #{xzdwdm},
</if>
<if
test=
"xzdwmc != null and xzdwmc != ''"
>
xzdwmc = #{xzdwmc},
</if>
<if
test=
"xzblnr != null and xzblnr != ''"
>
xzblnr = #{xzblnr},
</if>
<if
test=
"badwmc != null and badwmc != ''"
>
badwmc = #{badwmc},
</if>
...
...
src/main/java/org/springblade/founder/xzqq/service/TbYwXzqqXxService.java
View file @
926ff29a
...
...
@@ -41,7 +41,7 @@ public interface TbYwXzqqXxService {
* @return 实例对象
*/
TbYwXzqqXx
insert
(
TbYwXzqqXx
tbYwXzqqXx
,
MultipartFile
sadjbfile
,
MultipartFile
lajdsfile
,
MultipartFile
xzhfile
);
TbYwXzqqXx
shXzqqXx
(
TbYwXzqqXx
tbYwXzqqXx
);
TbYwXzqqXx
shXzqqXx
(
TbYwXzqqXx
tbYwXzqqXx
)
throws
Exception
;
TbYwXzqqXx
updateXzqqXx
(
TbYwXzqqXx
tbYwXzqqXx
,
MultipartFile
sadjbfile
,
MultipartFile
lajdsfile
,
MultipartFile
xzhfile
);
...
...
src/main/java/org/springblade/founder/xzqq/service/impl/TbYwXzqqXxServiceImpl.java
View file @
926ff29a
...
...
@@ -12,6 +12,7 @@ import org.springblade.founder.xzqq.service.TbYwXzqqMjxxService;
import
org.springblade.founder.xzqq.service.TbYwXzqqXxService
;
import
org.springblade.founder.xzqq.service.TbYwXzqqXyrxxService
;
import
org.springblade.modules.system.entity.XzxtUser
;
import
org.springblade.modules.system.mapper.SysUserMapper
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.StringUtils
;
...
...
@@ -38,7 +39,8 @@ public class TbYwXzqqXxServiceImpl implements TbYwXzqqXxService {
private
TbYwXzqqXxMapper
tbYwXzqqXxMapper
;
@Autowired
private
SysXxzjbhService
xxzjbhService
;
@Autowired
private
SysUserMapper
sysUserMapper
;
@Autowired
private
TbYwXzqqMjxxService
tbYwXzqqMjxxService
;
@Autowired
...
...
@@ -166,10 +168,23 @@ public class TbYwXzqqXxServiceImpl implements TbYwXzqqXxService {
public
List
<
TbYwXzqqXx
>
queryAll
(
TbYwXzqqXx
tbYwXzqqXx
)
{
XzxtUser
xzxtUser
=
SecureUtil
.
getUserXzxt
();
String
idcardparam
=
""
;
tbYwXzqqXx
.
setCxdwdm
(
xzxtUser
.
getUnitcode
());
System
.
out
.
println
(
"id="
+
xzxtUser
.
getTenantId
()+
"cxid"
+
tbYwXzqqXx
.
getUserId
());
int
a
=
sysUserMapper
.
getCodeNum
(
tbYwXzqqXx
.
getUserId
(),
"C1901"
);
if
(
a
>
0
){
}
else
{
if
(
"1"
.
equals
(
tbYwXzqqXx
.
getXzzt
())){
int
b
=
sysUserMapper
.
getCodeNum
(
""
+
xzxtUser
.
getUserId
(),
"C1902"
);
if
(
b
>
0
){
}
else
{
idcardparam
=
xzxtUser
.
getIdentitycard
();
tbYwXzqqXx
.
setIdcardparam
(
idcardparam
);
}
}
else
if
(
"2"
.
equals
(
tbYwXzqqXx
.
getXzzt
())){
idcardparam
=
xzxtUser
.
getIdentitycard
();
tbYwXzqqXx
.
setIdcardparam
(
idcardparam
);
}
else
if
(
"3"
.
equals
(
tbYwXzqqXx
.
getXzzt
())){
...
...
@@ -180,6 +195,8 @@ public class TbYwXzqqXxServiceImpl implements TbYwXzqqXxService {
tbYwXzqqXx
.
setIdcardparam
(
idcardparam
);
}
}
return
this
.
tbYwXzqqXxMapper
.
queryAll
(
tbYwXzqqXx
);
}
...
...
@@ -189,10 +206,22 @@ public class TbYwXzqqXxServiceImpl implements TbYwXzqqXxService {
public
int
queryAllCount
(
TbYwXzqqXx
tbYwXzqqXx
)
{
XzxtUser
xzxtUser
=
SecureUtil
.
getUserXzxt
();
String
idcardparam
=
""
;
tbYwXzqqXx
.
setCxdwdm
(
xzxtUser
.
getUnitcode
());
int
a
=
sysUserMapper
.
getCodeNum
(
tbYwXzqqXx
.
getUserId
(),
"C1901"
);
if
(
a
>
0
){
}
else
{
if
(
"1"
.
equals
(
tbYwXzqqXx
.
getXzzt
())){
int
b
=
sysUserMapper
.
getCodeNum
(
tbYwXzqqXx
.
getUserId
(),
"C1902"
);
if
(
b
>
0
){
}
else
{
idcardparam
=
xzxtUser
.
getIdentitycard
();
tbYwXzqqXx
.
setIdcardparam
(
idcardparam
);
}
}
else
if
(
"2"
.
equals
(
tbYwXzqqXx
.
getXzzt
())){
idcardparam
=
xzxtUser
.
getIdentitycard
();
tbYwXzqqXx
.
setIdcardparam
(
idcardparam
);
}
else
if
(
"3"
.
equals
(
tbYwXzqqXx
.
getXzzt
())){
...
...
@@ -202,6 +231,8 @@ public class TbYwXzqqXxServiceImpl implements TbYwXzqqXxService {
idcardparam
=
xzxtUser
.
getIdentitycard
();
tbYwXzqqXx
.
setIdcardparam
(
idcardparam
);
}
}
return
this
.
tbYwXzqqXxMapper
.
queryAllCount
(
tbYwXzqqXx
);
}
/**
...
...
@@ -217,6 +248,9 @@ public class TbYwXzqqXxServiceImpl implements TbYwXzqqXxService {
String
blxxzjbh
=
xxzjbhService
.
getXxzjbh
(
xzxtUser
.
getUnitcode
(),
null
);
//xxzjbh
tbYwXzqqXx
.
setXxzjbh
(
blxxzjbh
);
tbYwXzqqXx
.
setXzzt
(
"1"
);
if
(!
StringUtils
.
isEmpty
(
tbYwXzqqXx
.
getXzdwdm
())){
tbYwXzqqXx
.
setXzdwmc
(
tbYwXzqqXxMapper
.
queryNameByCode
(
"CODE_UNIT"
,
tbYwXzqqXx
.
getXzdwdm
()));
}
this
.
tbYwXzqqXxMapper
.
insert
(
tbYwXzqqXx
);
List
<
TbYwXzqqMjxx
>
mjxxList
=
tbYwXzqqXx
.
getMjxxs
();
...
...
@@ -284,11 +318,15 @@ public class TbYwXzqqXxServiceImpl implements TbYwXzqqXxService {
@Override
public
TbYwXzqqXx
shXzqqXx
(
TbYwXzqqXx
tbYwXzqqXx
)
{
public
TbYwXzqqXx
shXzqqXx
(
TbYwXzqqXx
tbYwXzqqXx
)
throws
Exception
{
XzxtUser
xzxtUser
=
SecureUtil
.
getUserXzxt
();
//2-协作中,3-完成,4-审核不通过
// tbYwXzqqXx.setXzzt("2");
if
(
"2"
.
equals
(
tbYwXzqqXx
.
getXzzt
())){
TbYwXzqqXx
ztxx
=
tbYwXzqqXxMapper
.
queryById
(
tbYwXzqqXx
.
getXxzjbh
());
if
(
"0"
.
equals
(
ztxx
.
getXzzt
())){
throw
new
Exception
(
"该协作信息已退回,审核失败."
);
}
tbYwXzqqXx
.
setSprSfzh
(
xzxtUser
.
getIdentitycard
());
tbYwXzqqXx
.
setSpsj
(
new
Date
());
}
...
...
src/main/java/org/springblade/modules/system/mapper/SysUserMapper.java
View file @
926ff29a
...
...
@@ -68,6 +68,8 @@ public interface SysUserMapper {
// 根据用户id查询角色名称
List
<
String
>
getUserMenuName
(
String
id
);
int
getCodeNum
(
@Param
(
value
=
"userId"
)
String
userId
,
@Param
(
value
=
"code"
)
String
code
);
SysNewUser
getPersonInfo
(
@Param
(
value
=
"id"
)
String
id
);
SysNewUser
getUserInfoByParam
(
@Param
(
"param"
)
Map
<
String
,
String
>
requestParam
);
...
...
src/main/java/org/springblade/modules/system/mapper/SysUserMapper.xml
View file @
926ff29a
...
...
@@ -706,7 +706,20 @@
and urole.user_id = #{ id , jdbcType=VARCHAR }
</select>
<!-- 查询某个菜单权限是否存在 -->
<select
id=
"getCodeNum"
parameterType=
"string"
resultType=
"int"
>
select
COUNT(1)
from
sys_user u,sys_user_role r,sys_role_menu rm,sys_menu m
where u.ID=r.USER_ID
and r.ROLE_ID=rm.ROLE_ID
and rm.MENU_ID=m.ID
and r.scbz = '0'
and m.is_deleted = '0'
and u.ID=#{userId}
and m.code=#{code}
</select>
<!--查询对应用户的菜单-->
<select
id=
"getUserMenuName"
parameterType=
"java.lang.String"
resultType=
"java.lang.String"
>
SELECT menu.code
...
...
@@ -764,7 +777,7 @@
<select
id=
"getUserShList"
parameterType=
"org.springblade.modules.system.entity.SysNewUser"
resultType=
"org.springblade.modules.system.entity.SysNewUser"
>
SELECT
us.id as id,
(select name from sys_dictitem where groupid='QGCODE_UNIT' AND code=us.unitcode)
as unitcode,
us.unitcode
as unitcode,
us.username as username,
us.password as password,
us.true_name as trueName,
...
...
@@ -781,7 +794,7 @@
us.birthday as birthday,
us.telephone as telephone,
<!--(select name from sys_dictitem where groupid='CODE_UNIT' AND code=us.unitcode) as unitname,-->
(SELECT name FROM sys_dictitem_xz WHERE code = us.unitcode)
as unitname,
us.unitname
as unitname,
us.scbz as scbz,
us.ip as ip,
us.grade as grade,
...
...
src/main/java/org/springblade/modules/system/service/impl/ISysUserServiceImpl.java
View file @
926ff29a
...
...
@@ -93,11 +93,11 @@ public class ISysUserServiceImpl implements ISysUserService {
XzxtUser
xzxtUser
=
new
XzxtUser
();
xzxtUser
.
setRealname
(
user
.
getTrueName
());
xzxtUser
.
setUnitcode
(
user
.
getUnitcode
());
String
unitName
=
sysUserMapper
.
getUnitnameByUnitcode
(
user
.
getUnitcode
());
xzxtUser
.
setUnitname
(
u
nitName
);
//
String unitName = sysUserMapper.getUnitnameByUnitcode(user.getUnitcode());
xzxtUser
.
setUnitname
(
u
ser
.
getUnitname
()
);
user
.
setUnitname
(
unitName
);
//
user.setUnitname(unitName);
String
jyxxzjbh
=
xxzjbhService
.
getXxzjbh
(
xzxtUser
.
getUnitcode
(),
null
);
//xxzjbh
...
...
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