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
41fca5ac
authored
Dec 14, 2023
by
huangjy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix:告警记录误报查询
parent
03847593
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
0 deletions
server-service/src/main/java/com/makeit/dto/platform/alarm/PlatAlarmRecordQueryDTO.java
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
server-service/src/main/java/com/makeit/dto/platform/alarm/PlatAlarmRecordQueryDTO.java
View file @
41fca5ac
...
@@ -72,6 +72,8 @@ public class PlatAlarmRecordQueryDTO extends BaseTenantDTO {
...
@@ -72,6 +72,8 @@ public class PlatAlarmRecordQueryDTO extends BaseTenantDTO {
@ApiModelProperty
(
value
=
"微信端 0-未读 1-已读"
)
@ApiModelProperty
(
value
=
"微信端 0-未读 1-已读"
)
private
String
wechatReadFlag
;
private
String
wechatReadFlag
;
@ApiModelProperty
(
value
=
"是否误报 1 误报 0 没有误报"
)
private
String
misinformationFlag
;
...
...
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
View file @
41fca5ac
...
@@ -207,6 +207,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
...
@@ -207,6 +207,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
.
in
(
CollectionUtils
.
isNotEmpty
(
param
.
getElderIdList
()),
PlatAlarmRecord:
:
getElderIds
,
param
.
getElderIdList
())
.
in
(
CollectionUtils
.
isNotEmpty
(
param
.
getElderIdList
()),
PlatAlarmRecord:
:
getElderIds
,
param
.
getElderIdList
())
.
eq
(
StringUtils
.
isNotBlank
(
param
.
getNoticeStatus
()),
PlatAlarmRecord:
:
getNoticeStatus
,
param
.
getNoticeStatus
())
.
eq
(
StringUtils
.
isNotBlank
(
param
.
getNoticeStatus
()),
PlatAlarmRecord:
:
getNoticeStatus
,
param
.
getNoticeStatus
())
.
eq
(
StringUtils
.
isNotBlank
(
param
.
getReadFlag
()),
PlatAlarmRecord:
:
getReadFlag
,
param
.
getReadFlag
())
.
eq
(
StringUtils
.
isNotBlank
(
param
.
getReadFlag
()),
PlatAlarmRecord:
:
getReadFlag
,
param
.
getReadFlag
())
.
eq
(
StringUtils
.
isNotBlank
(
param
.
getMisinformationFlag
()),
PlatAlarmRecord:
:
getMisinformationFlag
,
param
.
getMisinformationFlag
())
.
eq
(
StringUtils
.
isNotBlank
(
param
.
getWechatReadFlag
()),
PlatAlarmRecord:
:
getWechatReadFlag
,
param
.
getWechatReadFlag
())
.
eq
(
StringUtils
.
isNotBlank
(
param
.
getWechatReadFlag
()),
PlatAlarmRecord:
:
getWechatReadFlag
,
param
.
getWechatReadFlag
())
.
orderByDesc
(
BaseEntity:
:
getCreateDate
)
.
orderByDesc
(
BaseEntity:
:
getCreateDate
)
;
;
...
...
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