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
3be302f2
authored
Sep 15, 2023
by
李小龙
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
整理代码
parent
f6319aed
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
server-service/src/main/java/com/makeit/entity/platform/alarm/PlatAlarmRecord.java
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
server-service/src/main/java/com/makeit/entity/platform/alarm/PlatAlarmRecord.java
View file @
3be302f2
...
@@ -7,7 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
...
@@ -7,7 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
lombok.Data
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
/**
/**
* 告警记录
* 告警记录
...
@@ -28,7 +27,7 @@ public class PlatAlarmRecord extends BaseBusEntity {
...
@@ -28,7 +27,7 @@ public class PlatAlarmRecord extends BaseBusEntity {
/**
/**
* 告警时间
* 告警时间
*/
*/
private
Dat
e
alarmDate
;
private
LocalDateTim
e
alarmDate
;
/**
/**
* 状态 0 待处理 1 已处理
* 状态 0 待处理 1 已处理
...
...
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
View file @
3be302f2
...
@@ -52,7 +52,6 @@ import org.springframework.transaction.annotation.Transactional;
...
@@ -52,7 +52,6 @@ import org.springframework.transaction.annotation.Transactional;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Objects
;
import
java.util.Objects
;
import
java.util.Set
;
import
java.util.Set
;
...
@@ -327,7 +326,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
...
@@ -327,7 +326,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
PlatAlarmRecord
platAlarmRecord
=
new
PlatAlarmRecord
();
PlatAlarmRecord
platAlarmRecord
=
new
PlatAlarmRecord
();
platAlarmRecord
.
setAlarmId
(
config
.
getId
());
platAlarmRecord
.
setAlarmId
(
config
.
getId
());
platAlarmRecord
.
setAlarmType
(
config
.
getAlarmType
());
platAlarmRecord
.
setAlarmType
(
config
.
getAlarmType
());
platAlarmRecord
.
setAlarmDate
(
new
Date
());
platAlarmRecord
.
setAlarmDate
(
LocalDateTime
.
now
());
platAlarmRecord
.
setStatus
(
CommonEnum
.
NO
.
getValue
());
platAlarmRecord
.
setStatus
(
CommonEnum
.
NO
.
getValue
());
platAlarmRecord
.
setNoticeStatus
(
CommonEnum
.
NO
.
getValue
());
platAlarmRecord
.
setNoticeStatus
(
CommonEnum
.
NO
.
getValue
());
//模板信息 替换参数
//模板信息 替换参数
...
...
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