Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄嘉阳
/
iot-platform-server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
b2f6f7d7
authored
Oct 07, 2023
by
李小龙
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix: 告警记录 已读状态
parent
46a41d97
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
0 deletions
server-module/src/main/java/com/makeit/module/controller/children/alarm/PlatAlarmRecordChildrenController.java
server-service/src/main/java/com/makeit/entity/platform/alarm/PlatAlarmRecord.java
server-service/src/main/java/com/makeit/service/platform/alarm/PlatAlarmRecordService.java
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
server-service/src/main/java/com/makeit/vo/platform/alarm/PlatAlarmRecordVO.java
server-module/src/main/java/com/makeit/module/controller/children/alarm/PlatAlarmRecordChildrenController.java
View file @
b2f6f7d7
...
@@ -36,5 +36,12 @@ public class PlatAlarmRecordChildrenController {
...
@@ -36,5 +36,12 @@ public class PlatAlarmRecordChildrenController {
public
ApiResponseEntity
<
PlatAlarmRecordVO
>
view
(
@RequestBody
BaseIdDTO
dto
)
{
public
ApiResponseEntity
<
PlatAlarmRecordVO
>
view
(
@RequestBody
BaseIdDTO
dto
)
{
return
ApiResponseUtils
.
success
(
platAlarmRecordService
.
view
(
dto
.
getId
()));
return
ApiResponseUtils
.
success
(
platAlarmRecordService
.
view
(
dto
.
getId
()));
}
}
@ApiOperation
(
"已读"
)
@PostMapping
(
"read"
)
public
ApiResponseEntity
<
Void
>
read
(
@RequestBody
BaseIdDTO
dto
)
{
platAlarmRecordService
.
read
(
dto
.
getId
());
return
ApiResponseUtils
.
success
();
}
}
}
server-service/src/main/java/com/makeit/entity/platform/alarm/PlatAlarmRecord.java
View file @
b2f6f7d7
...
@@ -86,6 +86,9 @@ public class PlatAlarmRecord extends BaseBusEntity {
...
@@ -86,6 +86,9 @@ public class PlatAlarmRecord extends BaseBusEntity {
@ApiModelProperty
(
"区域名称"
)
@ApiModelProperty
(
"区域名称"
)
private
String
regionName
;
private
String
regionName
;
@ApiModelProperty
(
value
=
"0-未读 1-已读"
)
private
String
readFlag
;
}
}
...
...
server-service/src/main/java/com/makeit/service/platform/alarm/PlatAlarmRecordService.java
View file @
b2f6f7d7
...
@@ -61,4 +61,6 @@ public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> {
...
@@ -61,4 +61,6 @@ public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> {
void
getElderListByDeviceId
(
PlatAlarmCheckDTO
platAlarmCheckDTO
);
void
getElderListByDeviceId
(
PlatAlarmCheckDTO
platAlarmCheckDTO
);
void
dealAlarm
(
BaseIdDTO
dto
);
void
dealAlarm
(
BaseIdDTO
dto
);
void
read
(
String
id
);
}
}
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
View file @
b2f6f7d7
package
com
.
makeit
.
service
.
platform
.
alarm
.
impl
;
package
com
.
makeit
.
service
.
platform
.
alarm
.
impl
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.makeit.common.dto.BaseIdDTO
;
import
com.makeit.common.dto.BaseIdDTO
;
...
@@ -352,6 +354,8 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
...
@@ -352,6 +354,8 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
platAlarmRecord
.
setRemark
(
platAlarmCheckDTO
.
getRemark
());
platAlarmRecord
.
setRemark
(
platAlarmCheckDTO
.
getRemark
());
platAlarmRecord
.
setAbnormalValue
(
platAlarmCheckDTO
.
getAbnormalValue
());
platAlarmRecord
.
setAbnormalValue
(
platAlarmCheckDTO
.
getAbnormalValue
());
platAlarmRecord
.
setRegionName
(
platElder
.
getRegionName
());
platAlarmRecord
.
setRegionName
(
platElder
.
getRegionName
());
platAlarmRecord
.
setReadFlag
(
CommonEnum
.
NO
.
getValue
());
return
platAlarmRecord
;
return
platAlarmRecord
;
}
}
...
@@ -459,4 +463,13 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
...
@@ -459,4 +463,13 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
platAlarmRecord
.
setDealDate
(
LocalDateTime
.
now
());
platAlarmRecord
.
setDealDate
(
LocalDateTime
.
now
());
updateById
(
platAlarmRecord
);
updateById
(
platAlarmRecord
);
}
}
@Override
@Transactional
public
void
read
(
String
id
)
{
LambdaUpdateWrapper
<
PlatAlarmRecord
>
recordLambdaUpdateWrapper
=
Wrappers
.
lambdaUpdate
(
PlatAlarmRecord
.
class
)
.
eq
(
BaseEntity:
:
getId
,
id
)
.
set
(
PlatAlarmRecord:
:
getReadFlag
,
CommonEnum
.
YES
.
getValue
());
update
(
recordLambdaUpdateWrapper
);
}
}
}
server-service/src/main/java/com/makeit/vo/platform/alarm/PlatAlarmRecordVO.java
View file @
b2f6f7d7
...
@@ -59,5 +59,8 @@ public class PlatAlarmRecordVO extends BaseTenantDTO {
...
@@ -59,5 +59,8 @@ public class PlatAlarmRecordVO extends BaseTenantDTO {
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
createDate
;
private
LocalDateTime
createDate
;
@ApiModelProperty
(
value
=
"0-未读 1-已读"
)
private
String
readFlag
;
}
}
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