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
f4dd55f6
Commit
f4dd55f6
authored
Apr 20, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
a5991b89
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
7 deletions
+5
-7
ChinaMobileRestApiController.java
...um/party/web/controller/ChinaMobileRestApiController.java
+5
-7
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java
View file @
f4dd55f6
...
@@ -117,7 +117,7 @@ public class ChinaMobileRestApiController extends BaseController {
...
@@ -117,7 +117,7 @@ public class ChinaMobileRestApiController extends BaseController {
@RequiresAuthentication
//@RequiresPermissions("equitment:key")
@RequiresAuthentication
//@RequiresPermissions("equitment:key")
public
Map
<
String
,
Object
>
getBoxPrivateKey
(
@RequestParam
(
value
=
"mac"
)
String
mac
)
{
public
Map
<
String
,
Object
>
getBoxPrivateKey
(
@RequestParam
(
value
=
"mac"
)
String
mac
)
{
try
{
try
{
String
macAddress
=
mac
.
trim
().
toUpperCase
();
String
macAddress
=
mac
.
trim
().
toUpperCase
()
.
replaceAll
(
"-|_"
,
":"
)
;
final
LambdaQueryWrapper
<
TBoxOperation
>
queryWrapper
=
Wrappers
.<
TBoxOperation
>
lambdaQuery
().
eq
(
TBoxOperation:
:
getMac
,
macAddress
);
final
LambdaQueryWrapper
<
TBoxOperation
>
queryWrapper
=
Wrappers
.<
TBoxOperation
>
lambdaQuery
().
eq
(
TBoxOperation:
:
getMac
,
macAddress
);
final
TBoxOperation
tBoxOperation
=
this
.
boxOperationService
.
getOne
(
queryWrapper
);
final
TBoxOperation
tBoxOperation
=
this
.
boxOperationService
.
getOne
(
queryWrapper
);
if
(
tBoxOperation
!=
null
)
{
if
(
tBoxOperation
!=
null
)
{
...
@@ -662,14 +662,12 @@ public class ChinaMobileRestApiController extends BaseController {
...
@@ -662,14 +662,12 @@ public class ChinaMobileRestApiController extends BaseController {
Map
map
=
new
HashMap
();
Map
map
=
new
HashMap
();
if
(
StringUtils
.
isNotBlank
(
versionNo
))
{
if
(
StringUtils
.
isNotBlank
(
versionNo
))
{
map
.
put
(
"isLatest"
,
versionNo
.
equalsIgnoreCase
(
current
.
getAppVersion
()));
if
(
Long
.
parseLong
(
versionNo
)
>=
Long
.
parseLong
(
current
.
getAppVersion
()))
{
map
.
put
(
"isLatest"
,
true
);
}
}
else
{
}
else
{
map
.
put
(
"isLatest"
,
false
);
}
}
map
.
put
(
"versionNo"
,
current
.
getAppVersion
());
map
.
put
(
"versionNo"
,
current
.
getAppVersion
());
map
.
put
(
"versionUrl"
,
current
.
getApkUrl
());
map
.
put
(
"versionUrl"
,
current
.
getApkUrl
());
map
.
put
(
"updateLog"
,
current
.
getUpdateLog
());
map
.
put
(
"updateLog"
,
current
.
getUpdateLog
());
...
...
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