From 8b3c9a420738c6863b8307ddd4a9f93ab9ab0e17 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 17 Mar 2022 16:48:44 +0800
Subject: [PATCH] 设备状态判断update
---
.gitignore | 2 +-
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 2 +-
screen.iml | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 794103a..ca503f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@
# should NOT be excluded as they contain compiler settings and other important
# information for Eclipse / Flash Builder.
/.idea/
-/screen-api/target/
+
/screen-common/target/
/screen-manage/target/
/.idea/
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 0a732d2..61acce3 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -549,7 +549,7 @@
for (int i = levels.size() - 1; i >= 0; i--) {
Double level = Double.parseDouble(levels.get(i).toString());
if (data >= level) {
- state = i + 1;
+ state = i + 2;
break;
}
}
diff --git a/screen.iml b/screen.iml
index 586fc57..873d114 100644
--- a/screen.iml
+++ b/screen.iml
@@ -5,6 +5,7 @@
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
+ <excludeFolder url="file://$MODULE_DIR$/venv" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
--
Gitblit v1.8.0