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
7aeedc74
authored
Dec 19, 2023
by
汪志阳
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix:离床日志输出
parent
0e334a27
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
26 deletions
server-service/src/main/java/com/makeit/mapper/platform/alarm/PlatAlarmConfigMapper.java
server-service/src/main/java/com/makeit/service/platform/alarm/PlatAlarmConfigService.java
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/OffBedAlarm.java
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmConfigServiceImpl.java
server-service/src/main/resources/mappers/PlatAlarmConfigMapper.xml
server-service/src/main/java/com/makeit/mapper/platform/alarm/PlatAlarmConfigMapper.java
View file @
7aeedc74
...
@@ -23,5 +23,5 @@ public interface PlatAlarmConfigMapper extends BaseMapper<PlatAlarmConfig> {
...
@@ -23,5 +23,5 @@ public interface PlatAlarmConfigMapper extends BaseMapper<PlatAlarmConfig> {
*/
*/
List
<
PlatHealthConfigDTO
>
getHealthConfigList
();
List
<
PlatHealthConfigDTO
>
getHealthConfigList
();
List
<
PlatAlarmConfig
>
listOffBed
(
@Param
(
"
orgDeviceId"
)
String
orgD
eviceId
);
List
<
PlatAlarmConfig
>
listOffBed
(
@Param
(
"
deviceId"
)
String
d
eviceId
);
}
}
server-service/src/main/java/com/makeit/service/platform/alarm/PlatAlarmConfigService.java
View file @
7aeedc74
...
@@ -43,5 +43,5 @@ public interface PlatAlarmConfigService extends IService<PlatAlarmConfig> {
...
@@ -43,5 +43,5 @@ public interface PlatAlarmConfigService extends IService<PlatAlarmConfig> {
void
initData
();
void
initData
();
List
<
PlatAlarmConfig
>
listOfBed
(
String
org
Id
);
List
<
PlatAlarmConfig
>
listOfBed
(
String
device
Id
);
}
}
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/OffBedAlarm.java
View file @
7aeedc74
This diff is collapsed.
Click to expand it.
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmConfigServiceImpl.java
View file @
7aeedc74
...
@@ -262,7 +262,7 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
...
@@ -262,7 +262,7 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
@Override
@Override
@TenantIdIgnore
@TenantIdIgnore
public
List
<
PlatAlarmConfig
>
listOfBed
(
String
orgD
eviceId
)
{
public
List
<
PlatAlarmConfig
>
listOfBed
(
String
d
eviceId
)
{
return
configMapper
.
listOffBed
(
orgD
eviceId
);
return
configMapper
.
listOffBed
(
d
eviceId
);
}
}
}
}
server-service/src/main/resources/mappers/PlatAlarmConfigMapper.xml
View file @
7aeedc74
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
select *
select *
from plat_alarm_config
from plat_alarm_config
where org_id in (
where org_id in (
select org_id from plat_device where id = #{
orgD
eviceId} and del_flag = 0)
select org_id from plat_device where id = #{
d
eviceId} and del_flag = 0)
and alarm_type = 5 and tenant_id != 0
and alarm_type = 5 and tenant_id != 0
</select>
</select>
</mapper>
</mapper>
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