From d524949baa3b1c64da27f9b5592a1d94845849c6 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 05 Aug 2021 17:07:47 +0800
Subject: [PATCH] screen-api                  实时界面对数据进行保留小数位并且取整

---
 screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

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 8e20802..c7916b7 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
@@ -127,7 +127,7 @@
         //������������������
         HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
         StringBuilder content = new StringBuilder();
-        content.append("������������������").append(device.getName()).append("���").append("mac���").append(mac);
+        content.append("������������������").append(device.getName()).append(":").append("mac���").append(mac);
         logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
     }
 
@@ -203,7 +203,7 @@
                 Object o1 = method.invoke(oldDevice);
                 Object o2 = method.invoke(device);
                 if (o2 != null) {
-                    content.append(fieldName).append("���").append(o1).append("-->").append(o2).append("���");
+                    content.append(fieldName).append("���").append(o1).append("-->").append(o2).append(":");
                 }
 
             } catch (Exception e) {
@@ -473,7 +473,7 @@
         }
         //������������������
         UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id", device.getId()).set("state", state);
+        updateWrapper.eq("id", device.getId()).set("state", String.valueOf(state));
         deviceMapper.update(null, updateWrapper);
     }
 
@@ -483,7 +483,7 @@
         for (int i = levels.size() - 1; i >= 0; i--) {
             Double level = Double.parseDouble(levels.get(i).toString());
             if (data >= level) {
-                state = i + 2;
+                state = i + 1;
                 break;
             }
         }

--
Gitblit v1.8.0