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
3bd293b6
Commit
3bd293b6
authored
Mar 22, 2022
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
b7cd0a18
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
FailureDetailsController.java
...odule/common/biz/controller/FailureDetailsController.java
+6
-1
ConfirmAlarmServiceImpl.java
...oin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java
+1
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureDetailsController.java
View file @
3bd293b6
...
@@ -86,8 +86,13 @@ public class FailureDetailsController extends BaseController {
...
@@ -86,8 +86,13 @@ public class FailureDetailsController extends BaseController {
@GetMapping
(
value
=
"/{sequenceNbr}"
)
@GetMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据sequenceNbr查询单个"
,
notes
=
"根据sequenceNbr查询单个"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据sequenceNbr查询单个"
,
notes
=
"根据sequenceNbr查询单个"
)
public
ResponseModel
<
FailureDetailsDto
>
selectOne
(
@PathVariable
Long
sequenceNbr
)
{
public
ResponseModel
<
FailureDetailsDto
>
selectOne
(
@PathVariable
Long
sequenceNbr
)
{
FailureDetailsDto
failureDetailsDto
=
failureDetailsServiceImpl
.
queryForOne
(
sequenceNbr
);
ReginParams
selectedOrgInfo
=
getSelectedOrgInfo
();
return
ResponseHelper
.
buildResponse
(
failureDetailsServiceImpl
.
queryForOne
(
sequenceNbr
));
if
(
failureDetailsDto
.
getSubmissionPid
().
toString
().
equals
(
selectedOrgInfo
.
getUserModel
().
getUserId
()))
{
failureDetailsDto
.
setIsSubmit
(
true
);
}
return
ResponseHelper
.
buildResponse
(
failureDetailsDto
);
}
}
/**
/**
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java
View file @
3bd293b6
...
@@ -174,7 +174,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
...
@@ -174,7 +174,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
list
=
equipmentSpecificAlarmLogService
.
getIsConfirmByAlarmId
(
equipmentSpecificAlarmId
,
"0"
);
list
=
equipmentSpecificAlarmLogService
.
getIsConfirmByAlarmId
(
equipmentSpecificAlarmId
,
"0"
);
}
}
}
}
switch
(
ent
.
getType
()){
switch
(
ent
.
get
Confirm
Type
()){
case
"火警"
:
case
"火警"
:
ent
.
setType
(
"FIREALARM"
);
ent
.
setType
(
"FIREALARM"
);
break
;
break
;
...
...
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