Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
1edc3d07
Commit
1edc3d07
authored
Oct 13, 2022
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
2b5eedb4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
SupervisionConfigureController.java
...quipmanage/controller/SupervisionConfigureController.java
+7
-3
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java
View file @
1edc3d07
...
...
@@ -333,7 +333,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
if
(
diffMinute
<=
5
)
{
time
=
true
;
}
item
.
put
(
"upTime"
,
diffMinute
);
item
.
put
(
"upTime"
,
diffMinute
);
}
}
item
.
put
(
"stateDesc"
,
Integer
.
parseInt
(
String
.
valueOf
(
item
.
get
(
"isAlarm"
)))
==
0
&&
time
?
"正常"
:
"异常"
);
...
...
@@ -369,7 +369,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
@RequestMapping
(
value
=
"/replaceVideo"
,
method
=
RequestMethod
.
POST
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"替换视频"
,
produces
=
"application/json;charset=UTF-8"
,
notes
=
"替换视频"
)
public
ResponseModel
replaceVideo
(
@RequestBody
Map
<
String
,
String
>
ids
)
{
public
ResponseModel
replaceVideo
(
@RequestBody
Map
<
String
,
String
>
ids
)
{
String
bizOrgCode
=
null
;
ReginParams
reginParams
=
getSelectedOrgInfo
();
ReginParams
.
PersonIdentity
personIdentity
=
reginParams
.
getPersonIdentity
();
...
...
@@ -391,7 +391,11 @@ public class SupervisionConfigureController extends AbstractBaseController {
ReginParams
reginParams
=
getSelectedOrgInfo
();
ReginParams
.
PersonIdentity
personIdentity
=
reginParams
.
getPersonIdentity
();
if
(!
ValidationUtil
.
isEmpty
(
personIdentity
))
{
bizOrgCode
=
personIdentity
.
getCompanyBizOrgCode
();
if
(
personIdentity
.
getCompanyBizOrgCode
()
==
null
)
{
bizOrgCode
=
personIdentity
.
getBizOrgCode
();
}
else
{
bizOrgCode
=
personIdentity
.
getCompanyBizOrgCode
();
}
if
(
bizOrgCode
==
null
)
{
return
CommonResponseUtil
.
success
(
null
);
}
...
...
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