From 0ce061d9ed37a6c25fff70e4734fa8cc8747237c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 26 Jul 2023 19:45:09 +0800
Subject: [PATCH] fix: 部分提交

---
 screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index eae61a6..b9366a4 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -15,6 +15,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -40,6 +41,7 @@
     public void judgeOffLineDevice() {
         QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
         queryWrapper.ne("state", Constants.DEVICE_STATE_OFFLINE);
+        queryWrapper.eq("is_delete",Constants.NOT_DELETE);
         //������������������������
         List<Device> devices = deviceMapper.selectList(queryWrapper);
         for (Device device : devices) {
@@ -64,4 +66,13 @@
         updateWrapper.eq("id", device.getId()).set("state", device.getState());
         deviceMapper.update(null, updateWrapper);
     }
-}
+
+    @Override
+    public List<Device> getDateByOrgId(int orgId) {
+        QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
+        wrapper_device.eq("is_delete",Constants.NOT_DELETE).eq("organization_id",orgId);
+        List<Device> devices = new ArrayList<>();
+        devices = deviceMapper.selectList(wrapper_device);
+        return devices;
+    }
+}
\ No newline at end of file

--
Gitblit v1.8.0