Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
Project
Project
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
liqin
chnmuseum-party
Commits
fcad38cc
Commit
fcad38cc
authored
Apr 10, 2021
by
wzp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
641ae44d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
TBoxOperationController.java
...nmuseum/party/web/controller/TBoxOperationController.java
+11
-2
TInteractionController.java
...hnmuseum/party/web/controller/TInteractionController.java
+1
-1
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TBoxOperationController.java
View file @
fcad38cc
...
...
@@ -113,6 +113,7 @@ public class TBoxOperationController extends BaseController {
@ApiOperation
(
value
=
"修改机顶盒运维信息"
,
notes
=
"修改机顶盒运维信息"
)
@MethodLog
(
operModule
=
OperModule
.
STBOPERATION
,
operType
=
OperType
.
ACTIVATION
)
public
Map
<
String
,
Object
>
updateTBoxOperation
(
TBoxOperation
tBoxOperation
)
{
Map
<
String
,
Object
>
resultMap
=
new
LinkedHashMap
<
String
,
Object
>();
try
{
if
(
tBoxOperation
!=
null
&&
StringUtils
.
isNotBlank
(
tBoxOperation
.
getMac
()))
{
tBoxOperation
.
setMac
(
tBoxOperation
.
getMac
().
toUpperCase
());
...
...
@@ -120,11 +121,19 @@ public class TBoxOperationController extends BaseController {
if
(
2
==
tBoxOperation
.
getStatus
())
{
TBoxOperation
byId
=
tBoxOperationService
.
getById
(
tBoxOperation
.
getId
());
if
(
byId
.
getMac
()!=
null
&&!
""
.
equals
(
byId
.
getMac
())&&!
byId
.
getMac
().
equals
(
tBoxOperation
.
getMac
())){
Map
<
String
,
Object
>
resultMap
=
new
LinkedHashMap
<
String
,
Object
>();
resultMap
.
put
(
"resultCode"
,
"500"
);
resultMap
.
put
(
"message"
,
"此账号已绑定机顶盒!"
);
return
resultMap
;
}
UpdateWrapper
<
TBoxOperation
>
wrapper
=
new
UpdateWrapper
<>();
wrapper
.
eq
(
"mac"
,
tBoxOperation
.
getMac
());
TBoxOperation
one
=
tBoxOperationService
.
getOne
(
wrapper
);
if
(
one
!=
null
){
TUser
u
=
userService
.
getOne
(
new
UpdateWrapper
<
TUser
>().
eq
(
"org_id"
,
one
.
getOrganId
()).
eq
(
"type"
,
3
).
eq
(
"is_deleted"
,
false
));
resultMap
.
put
(
"resultCode"
,
"500"
);
resultMap
.
put
(
"message"
,
"此mac地址已绑定"
+
u
.
getUserName
()+
"账号!"
);
return
resultMap
;
}
final
ArrayList
<
String
>
rsaKeys
=
RSAUtils
.
createRSAKeys
();
tBoxOperation
.
setPublicKey
(
rsaKeys
.
get
(
0
));
tBoxOperation
.
setPrivateKey
(
rsaKeys
.
get
(
1
));
...
...
@@ -227,7 +236,7 @@ public class TBoxOperationController extends BaseController {
@GetMapping
(
"/getById"
)
@RequiresAuthentication
//@RequiresPermissions("/boxOperation/getById")
@MethodLog
(
operModule
=
OperModule
.
STBOPERATION
,
operType
=
OperType
.
SELECT
)
public
Map
<
String
,
Object
>
getById
(
@PathVariable
(
"id"
)
String
id
)
{
public
Map
<
String
,
Object
>
getById
(
String
id
)
{
TBoxOperation
tBoxOperation
=
null
;
try
{
tBoxOperation
=
tBoxOperationService
.
getById
(
id
);
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TInteractionController.java
View file @
fcad38cc
...
...
@@ -89,7 +89,7 @@ public class TInteractionController extends BaseController {
resultMap
.
put
(
"message"
,
"用户不是单位管理员"
);
return
resultMap
;
}
if
(
user
.
getOrgId
()!=
null
&&
user
.
getOrgId
()!=
tInteraction
.
getOrganId
(
)){
if
(
user
.
getOrgId
()!=
null
&&
!
user
.
getOrgId
().
equals
(
tInteraction
.
getOrganId
()
)){
resultMap
.
put
(
"resultCode"
,
"500"
);
resultMap
.
put
(
"message"
,
"管理员账号不是本机构的单位管理员"
);
return
resultMap
;
...
...
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